Skip to content

The Unified and Autonomous Development Platform

Rename package from com.pmease to com.gitplex

robin shine8572e9c43f4d
diff --git a/gitplex.all/pom.xml b/gitplex.all/pom.xml
index 1104af92f1..9d4f78310e 100644
--- a/gitplex.all/pom.xml
+++ b/gitplex.all/pom.xml
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>gitplex.all</artifactId>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
@@ -19,8 +19,8 @@
</modules>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -31,7 +31,7 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
</project>
diff --git a/gitplex.core/pom.xml b/gitplex.core/pom.xml
index 0e5bf5b91e..8d55b11e58 100644
--- a/gitplex.core/pom.xml
+++ b/gitplex.core/pom.xml
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>gitplex.core</artifactId>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -31,12 +31,12 @@
</build>
<dependencies>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.loader</artifactId>
<version>1.0.34</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.git</artifactId>
<version>1.0.6</version>
</dependency>
@@ -45,54 +45,54 @@
<artifactId>xodus-entity-store</artifactId>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.git</artifactId>
<version>1.0.6</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.jetty</artifactId>
<version>1.0.34</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.loader</artifactId>
<version>1.0.34</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.schedule</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.hibernate</artifactId>
<version>1.0.33</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.shiro</artifactId>
<version>1.0.33</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.markdown</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.lang</artifactId>
<version>1.0.5</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -103,11 +103,11 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
<properties>
- <moduleClass>com.pmease.gitplex.core.CoreModule</moduleClass>
+ <moduleClass>com.gitplex.core.CoreModule</moduleClass>
</properties>
<version>1.0.37</version>
</project>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreEntityValidator.java b/gitplex.core/src/main/java/com/gitplex/core/CoreEntityValidator.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/CoreEntityValidator.java
rename to gitplex.core/src/main/java/com/gitplex/core/CoreEntityValidator.java
index 962a860454..6cf1504027 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreEntityValidator.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/CoreEntityValidator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core;
+package com.gitplex.core;
import java.util.Set;
@@ -7,9 +7,9 @@ import javax.inject.Singleton;
import javax.validation.ConstraintViolation;
import javax.validation.Validator;
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.hibernate.DefaultEntityValidator;
-import com.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
+import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.DefaultEntityValidator;
@Singleton
public class CoreEntityValidator extends DefaultEntityValidator {
diff --git a/gitplex.core/src/main/java/com/gitplex/core/CoreModule.java b/gitplex.core/src/main/java/com/gitplex/core/CoreModule.java
new file mode 100644
index 0000000000..6aa6cae3ba
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/CoreModule.java
@@ -0,0 +1,223 @@
+package com.gitplex.core;
+
+import java.util.Collection;
+import java.util.HashSet;
+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;
+import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.EntityValidator;
+import com.gitplex.commons.hibernate.ModelProvider;
+import com.gitplex.commons.hibernate.PersistManager;
+import com.gitplex.commons.hibernate.PrefixedNamingStrategy;
+import com.gitplex.commons.hibernate.migration.Migrator;
+import com.gitplex.commons.jetty.ServletConfigurator;
+import com.gitplex.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.loader.ImplementationProvider;
+import com.gitplex.commons.shiro.AbstractRealm;
+import com.gitplex.commons.util.ClassUtils;
+
+/**
+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
+ *
+ */
+public class CoreModule extends AbstractPluginModule {
+
+ @Override
+ protected void configure() {
+ super.configure();
+
+ bind(Migrator.class).to(DatabaseMigrator.class);
+
+ bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("g_"));
+
+ contribute(ModelProvider.class, new ModelProvider() {
+
+ @Override
+ public Collection<Class<? extends AbstractEntity>> getModelClasses() {
+ Collection<Class<? extends AbstractEntity>> modelClasses =
+ new HashSet<Class<? extends AbstractEntity>>();
+ modelClasses.addAll(ClassUtils.findImplementations(AbstractEntity.class, EntityLocator.class));
+ return modelClasses;
+ }
+
+ });
+
+ /*
+ * Contribute empty reservations to avoid Guice complain
+ */
+ contribute(AccountNameReservation.class, new AccountNameReservation() {
+
+ @Override
+ public Set<String> getReserved() {
+ return Sets.newHashSet();
+ }
+ });
+
+ /*
+ * Contribute empty reservations to avoid Guice complain
+ */
+ contribute(DepotNameReservation.class, new DepotNameReservation() {
+
+ @Override
+ public Set<String> getReserved() {
+ return Sets.newHashSet();
+ }
+ });
+
+ contribute(ServletConfigurator.class, CoreServletConfigurator.class);
+
+ contribute(ImplementationProvider.class, new ImplementationProvider() {
+
+ @Override
+ public Collection<Class<?>> getImplementations() {
+ Collection<Class<?>> implementations = new HashSet<Class<?>>();
+ implementations.add(SystemGit.class);
+ implementations.add(SpecifiedGit.class);
+ return implementations;
+ }
+
+ @Override
+ public Class<?> getAbstractClass() {
+ return GitConfig.class;
+ }
+ });
+
+ contribute(CommitMessageTransformer.class, PatternCommitMessageTransformer.class);
+
+ bind(GitConfig.class).toProvider(GitConfigProvider.class);
+
+ /*
+ * Declare bindings explicitly instead of using ImplementedBy annotation as
+ * HK2 to guice bridge can only search in explicit bindings in Guice
+ */
+ bind(StorageManager.class).to(DefaultStorageManager.class);
+ bind(ConfigManager.class).to(DefaultConfigManager.class);
+ bind(DataManager.class).to(DefaultDataManager.class);
+ bind(PullRequestCommentManager.class).to(DefaultPullRequestCommentManager.class);
+ bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
+ bind(PullRequestManager.class).to(DefaultPullRequestManager.class);
+ bind(PullRequestUpdateManager.class).to(DefaultPullRequestUpdateManager.class);
+ bind(DepotManager.class).to(DefaultDepotManager.class);
+ bind(AccountManager.class).to(DefaultAccountManager.class);
+ bind(PullRequestVerificationManager.class).to(DefaultPullRequestVerificationManager.class);
+ bind(PullRequestReviewInvitationManager.class).to(DefaultPullRequestReviewInvitationManager.class);
+ bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);
+ bind(MailManager.class).to(DefaultMailManager.class);
+ bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);
+ bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);
+ bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);
+ bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
+ bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);
+ bind(CodeCommentInfoManager.class).to(DefaultCodeCommentInfoManager.class);
+ bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);
+ bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
+ bind(TeamManager.class).to(DefaultTeamManager.class);
+ bind(OrganizationMembershipManager.class).to(DefaultOrganizationMembershipManager.class);
+ bind(TeamMembershipManager.class).to(DefaultTeamMembershipManager.class);
+ bind(TeamAuthorizationManager.class).to(DefaultTeamAuthorizationManager.class);
+ bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);
+ bind(PullRequestStatusChangeManager.class).to(DefaultPullRequestStatusChangeManager.class);
+ bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
+ bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
+ bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
+ bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);
+ bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);
+ bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
+
+ bind(AbstractRealm.class).to(SecurityRealm.class);
+
+ bind(EntityValidator.class).to(CoreEntityValidator.class);
+
+ if (Bootstrap.command != null
+ && Bootstrap.command.getName().equals("reset_admin_password")) {
+ bind(PersistManager.class).to(ResetAdminPasswordCommand.class);
+ }
+ }
+
+ @Override
+ protected Class<? extends AbstractPlugin> getPluginClass() {
+ return GitPlex.class;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreServletConfigurator.java b/gitplex.core/src/main/java/com/gitplex/core/CoreServletConfigurator.java
similarity index 81%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/CoreServletConfigurator.java
rename to gitplex.core/src/main/java/com/gitplex/core/CoreServletConfigurator.java
index 6d8962819c..677fca59b0 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreServletConfigurator.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/CoreServletConfigurator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core;
+package com.gitplex.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.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.gitplex.core.hookcallback.GitPostReceiveCallback;
-import com.pmease.gitplex.core.hookcallback.GitPreReceiveCallback;
+import com.gitplex.core.hookcallback.GitPostReceiveCallback;
+import com.gitplex.core.hookcallback.GitPreReceiveCallback;
+import com.gitplex.commons.jetty.ServletConfigurator;
@Singleton
public class CoreServletConfigurator implements ServletConfigurator {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/GitConfigProvider.java b/gitplex.core/src/main/java/com/gitplex/core/GitConfigProvider.java
similarity index 76%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/GitConfigProvider.java
rename to gitplex.core/src/main/java/com/gitplex/core/GitConfigProvider.java
index 8698867cf3..32cdd780ea 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/GitConfigProvider.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/GitConfigProvider.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core;
+package com.gitplex.core;
import javax.inject.Inject;
import javax.inject.Provider;
import javax.inject.Singleton;
-import com.pmease.commons.git.GitConfig;
-import com.pmease.gitplex.core.manager.ConfigManager;
+import com.gitplex.core.manager.ConfigManager;
+import com.gitplex.commons.git.GitConfig;
@Singleton
public class GitConfigProvider implements Provider<GitConfig> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/GitPlex.java b/gitplex.core/src/main/java/com/gitplex/core/GitPlex.java
similarity index 78%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/GitPlex.java
rename to gitplex.core/src/main/java/com/gitplex/core/GitPlex.java
index a695aad989..fd3ab4d250 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/GitPlex.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/GitPlex.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core;
+package com.gitplex.core;
import java.io.ObjectStreamException;
import java.io.Serializable;
@@ -15,21 +15,21 @@ import org.apache.shiro.util.ThreadContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.loader.AbstractPlugin;
-import com.pmease.commons.loader.AppLoader;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.loader.ManagedSerializedForm;
-import com.pmease.commons.util.init.InitStage;
-import com.pmease.commons.util.init.ManualConfig;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarting;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopped;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.DataManager;
-import com.pmease.gitplex.core.setting.ServerConfig;
+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;
+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;
public class GitPlex extends AbstractPlugin implements Serializable {
@@ -155,7 +155,7 @@ public class GitPlex extends AbstractPlugin implements Serializable {
}
public String getDocLink() {
- return "http://wiki.pmease.com//display/gp" + StringUtils.substringBefore(AppLoader.getProduct().getVersion(), ".");
+ return "http://wiki.gitplex.com//display/gp" + StringUtils.substringBefore(AppLoader.getProduct().getVersion(), ".");
}
}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/ResetAdminPasswordCommand.java b/gitplex.core/src/main/java/com/gitplex/core/ResetAdminPasswordCommand.java
similarity index 78%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/ResetAdminPasswordCommand.java
rename to gitplex.core/src/main/java/com/gitplex/core/ResetAdminPasswordCommand.java
index b37ba28794..b4c384d560 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/ResetAdminPasswordCommand.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/ResetAdminPasswordCommand.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core;
+package com.gitplex.core;
import java.util.Set;
@@ -11,16 +11,16 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.hibernate.DefaultPersistManager;
-import com.pmease.commons.hibernate.EntityValidator;
-import com.pmease.commons.hibernate.HibernateProperties;
-import com.pmease.commons.hibernate.IdManager;
-import com.pmease.commons.hibernate.ModelProvider;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.migration.Migrator;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
+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;
+import com.gitplex.commons.hibernate.HibernateProperties;
+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;
@Singleton
public class ResetAdminPasswordCommand extends DefaultPersistManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/AccountChoice.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/AccountChoice.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/AccountChoice.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/AccountChoice.java
index c45cf3f7cd..56d9dc7f1c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/AccountChoice.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/AccountChoice.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.annotation;
+package com.gitplex.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/BranchChoice.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchChoice.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/BranchChoice.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/BranchChoice.java
index e2f6b2a4b3..d00cb15090 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/BranchChoice.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchChoice.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface BranchChoice {
-}
+package com.gitplex.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BranchChoice {
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/BranchMatch.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchMatch.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/BranchMatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/BranchMatch.java
index b9176838ef..cf6808d7c2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/BranchMatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/BranchMatch.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface BranchMatch {
-}
+package com.gitplex.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface BranchMatch {
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/FileChoice.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/FileChoice.java
similarity index 86%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/FileChoice.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/FileChoice.java
index ad8e08441a..8486f2cf41 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/FileChoice.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/FileChoice.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.annotation;
+package com.gitplex.core.annotation;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/FullBranchMatch.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/FullBranchMatch.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/FullBranchMatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/FullBranchMatch.java
index 86e6cb7ff4..6b46a00396 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/FullBranchMatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/FullBranchMatch.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface FullBranchMatch {
-
-}
+package com.gitplex.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface FullBranchMatch {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/PathMatch.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/PathMatch.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/PathMatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/PathMatch.java
index 16e61a5aad..7554e35d98 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/PathMatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/PathMatch.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PathMatch {
-}
+package com.gitplex.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface PathMatch {
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/RefMatch.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/RefMatch.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/RefMatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/RefMatch.java
index f981166c83..9acd6db899 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/RefMatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/RefMatch.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RefMatch {
-}
+package com.gitplex.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RefMatch {
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/TeamChoice.java b/gitplex.core/src/main/java/com/gitplex/core/annotation/TeamChoice.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/TeamChoice.java
rename to gitplex.core/src/main/java/com/gitplex/core/annotation/TeamChoice.java
index f47d7f743d..0ee2bc4409 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/annotation/TeamChoice.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/annotation/TeamChoice.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-@Target(ElementType.METHOD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface TeamChoice {
- String[] excludes() default {};
-}
+package com.gitplex.core.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.METHOD)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface TeamChoice {
+ String[] excludes() default {};
+}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/CommitMessageTransformer.java b/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/CommitMessageTransformer.java
new file mode 100644
index 0000000000..81ed825e95
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/CommitMessageTransformer.java
@@ -0,0 +1,11 @@
+package com.gitplex.core.commitmessagetransform;
+
+import com.gitplex.core.entity.Depot;
+import com.gitplex.commons.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface CommitMessageTransformer {
+
+ String transform(Depot depot, String commitMessage);
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java b/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java
similarity index 71%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java
rename to gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java
index f70ad6da9b..f1faf06e5d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/commitmessagetransform/PatternCommitMessageTransformer.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.core.commitmessagetransform;
+package com.gitplex.core.commitmessagetransform;
import javax.inject.Singleton;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.CommitMessageTransformSetting;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.support.CommitMessageTransformSetting;
@Singleton
public class PatternCommitMessageTransformer implements CommitMessageTransformer {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Account.java b/gitplex.core/src/main/java/com/gitplex/core/entity/Account.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Account.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/Account.java
index 25179cd446..8e0e85a4bd 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Account.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/Account.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,23 +24,23 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.validator.constraints.Email;
import org.hibernate.validator.constraints.NotEmpty;
+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.google.common.base.Objects;
import com.google.common.collect.Sets;
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.shiro.AbstractUser;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.ExcludeValues;
-import com.pmease.commons.wicket.editable.annotation.Markdown;
-import com.pmease.commons.wicket.editable.annotation.Password;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.manager.TeamAuthorizationManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.core.security.protectedobject.AccountBelonging;
-import com.pmease.gitplex.core.security.protectedobject.ProtectedObject;
-import com.pmease.gitplex.core.util.validation.AccountName;
+import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.shiro.AbstractUser;
+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.Markdown;
+import com.gitplex.commons.wicket.editable.annotation.Password;
@Entity
@Table(indexes={
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/BranchWatch.java b/gitplex.core/src/main/java/com/gitplex/core/entity/BranchWatch.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/BranchWatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/BranchWatch.java
index 50b774059e..bd3cb6aa17 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/BranchWatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/BranchWatch.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeComment.java b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeComment.java
similarity index 90%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeComment.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/CodeComment.java
index 1bd3d01ea1..2ef455e585 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeComment.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeComment.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.entity.support.LastEvent;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentEvent;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentRelation.java b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentRelation.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentRelation.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentRelation.java
index c239584632..a9d035d83b 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentRelation.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentRelation.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -11,7 +11,7 @@ import javax.persistence.UniqueConstraint;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Table(
indexes={@Index(columnList="g_request_id"), @Index(columnList="g_comment_id")},
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentReply.java b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentReply.java
similarity index 89%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentReply.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentReply.java
index bc3300c5e9..790e895368 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentReply.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentReply.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.gitplex.core.entity.support.CodeCommentActivity;
+import com.gitplex.core.entity.support.CodeCommentActivity;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentStatusChange.java b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentStatusChange.java
similarity index 86%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentStatusChange.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentStatusChange.java
index ba8a5d487d..6897575dde 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/CodeCommentStatusChange.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/CodeCommentStatusChange.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.gitplex.core.entity.support.CodeCommentActivity;
+import com.gitplex.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/pmease/gitplex/core/entity/Config.java b/gitplex.core/src/main/java/com/gitplex/core/entity/Config.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Config.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/Config.java
index 5bf295b3ed..29520d46a6 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Config.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/Config.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.io.Serializable;
@@ -9,7 +9,7 @@ import javax.persistence.Lob;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
/**
* This entity stores object in serialized form, with one entity
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Depot.java b/gitplex.core/src/main/java/com/gitplex/core/entity/Depot.java
similarity index 94%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Depot.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/Depot.java
index 5c5ba12be2..bd682cde7f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Depot.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/Depot.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.io.File;
import java.io.IOException;
@@ -64,40 +64,40 @@ import org.hibernate.annotations.CacheConcurrencyStrategy;
import org.hibernate.annotations.DynamicUpdate;
import org.hibernate.validator.constraints.NotEmpty;
+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;
-import com.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.git.Submodule;
-import com.pmease.commons.git.exception.GitObjectNotFoundException;
-import com.pmease.commons.git.exception.NotGitFileException;
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.loader.AppLoader;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.LockUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Markdown;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.support.CommitMessageTransformSetting;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.gatekeeper.AndGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.protectedobject.AccountBelonging;
-import com.pmease.gitplex.core.security.protectedobject.ProtectedObject;
-import com.pmease.gitplex.core.util.validation.DepotName;
+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;
@Entity
@Table(
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.java
new file mode 100644
index 0000000000..21283f2be7
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/EntityLocator.java
@@ -0,0 +1,5 @@
+package com.gitplex.core.entity;
+
+public class EntityLocator {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/OrganizationMembership.java b/gitplex.core/src/main/java/com/gitplex/core/entity/OrganizationMembership.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/OrganizationMembership.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/OrganizationMembership.java
index 1ade3c9f94..d5d4deafe8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/OrganizationMembership.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/OrganizationMembership.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -8,7 +8,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequest.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequest.java
similarity index 95%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequest.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequest.java
index 685afefa2f..e860fe2310 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequest.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequest.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.io.IOException;
import java.io.Serializable;
@@ -38,31 +38,31 @@ 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.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.exception.GitObjectNotFoundException;
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.jackson.ExternalView;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.support.CloseInfo;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.core.entity.support.LastEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentEvent;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Pending;
-import com.pmease.gitplex.core.manager.CodeCommentRelationManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.security.ObjectPermission;
-import com.pmease.gitplex.core.security.SecurityUtils;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.git.exception.GitObjectNotFoundException;
+import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.UnitOfWork;
+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;
@Entity
/*
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestComment.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestComment.java
similarity index 95%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestComment.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestComment.java
index 4bee944126..a40db2ddac 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestComment.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestComment.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -15,7 +15,7 @@ import javax.persistence.Version;
import org.hibernate.annotations.DynamicUpdate;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
/*
* @DynamicUpdate annotation here along with various @OptimisticLock annotations
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReference.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReference.java
similarity index 94%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReference.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReference.java
index 783c8fcfe4..d70abc1e84 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReference.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -14,7 +14,7 @@ import javax.persistence.UniqueConstraint;
import org.hibernate.annotations.Fetch;
import org.hibernate.annotations.FetchMode;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Table(
indexes={@Index(columnList="g_referenced_id"), @Index(columnList="g_referencedBy_id"), @Index(columnList="g_user_id")},
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReview.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReview.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReview.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReview.java
index 366c8b224c..b5b20b89aa 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReview.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReview.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReviewInvitation.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReviewInvitation.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReviewInvitation.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReviewInvitation.java
index 808ee8dd31..b140a68bd2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestReviewInvitation.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestReviewInvitation.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestStatusChange.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestStatusChange.java
similarity index 96%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestStatusChange.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestStatusChange.java
index 8bc4642d88..b986a993cb 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestStatusChange.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestStatusChange.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -14,7 +14,7 @@ import javax.persistence.Version;
import org.hibernate.annotations.DynamicUpdate;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")})
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestTask.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestTask.java
similarity index 94%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestTask.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestTask.java
index 8beb879199..9575080b48 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestTask.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestTask.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestUpdate.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestUpdate.java
similarity index 97%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestUpdate.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestUpdate.java
index ce76badc5b..a4934b6990 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestUpdate.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestUpdate.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.gitplex.core.manager.impl.DefaultCodeCommentRelationManager;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="uuid"), @Index(columnList="date")})
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestVerification.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestVerification.java
similarity index 95%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestVerification.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestVerification.java
index ca9373e0bb..5427cd1255 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestVerification.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestVerification.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import java.util.Date;
@@ -11,7 +11,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestWatch.java b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestWatch.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestWatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestWatch.java
index 6600a03925..1fa45739e5 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/PullRequestWatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/PullRequestWatch.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import javax.annotation.Nullable;
import javax.persistence.Entity;
@@ -9,7 +9,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Team.java b/gitplex.core/src/main/java/com/gitplex/core/entity/Team.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Team.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/Team.java
index b145041642..62b779fdd2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/Team.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/Team.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Markdown;
-import com.pmease.gitplex.core.util.validation.DepotName;
+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;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/TeamAuthorization.java b/gitplex.core/src/main/java/com/gitplex/core/entity/TeamAuthorization.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/TeamAuthorization.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/TeamAuthorization.java
index ce2cb46845..3dc06cdbd4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/TeamAuthorization.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/TeamAuthorization.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
+import com.gitplex.core.security.privilege.DepotPrivilege;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/TeamMembership.java b/gitplex.core/src/main/java/com/gitplex/core/entity/TeamMembership.java
similarity index 90%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/TeamMembership.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/TeamMembership.java
index 91e536094d..5ab05bc083 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/TeamMembership.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/TeamMembership.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.core.entity;
import javax.persistence.Entity;
import javax.persistence.FetchType;
@@ -8,7 +8,7 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import com.pmease.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/UserAuthorization.java b/gitplex.core/src/main/java/com/gitplex/core/entity/UserAuthorization.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/UserAuthorization.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/UserAuthorization.java
index bbb13995ad..1b649b4f9a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/UserAuthorization.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/UserAuthorization.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity;
+package com.gitplex.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.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
+import com.gitplex.core.security.privilege.DepotPrivilege;
+import com.gitplex.commons.hibernate.AbstractEntity;
@Entity
@Table(
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CloseInfo.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CloseInfo.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CloseInfo.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/CloseInfo.java
index 3c6d137506..3e96f28daa 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CloseInfo.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CloseInfo.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.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.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
@Embeddable
public class CloseInfo implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CodeCommentActivity.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CodeCommentActivity.java
similarity index 86%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CodeCommentActivity.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/CodeCommentActivity.java
index edf1e3a562..f99516a272 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CodeCommentActivity.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CodeCommentActivity.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.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.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeComment.ComparingInfo;
+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;
@MappedSuperclass
public abstract class CodeCommentActivity extends AbstractEntity {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CommentPos.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommentPos.java
similarity index 98%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CommentPos.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/CommentPos.java
index fd8b3df501..98c912ffc4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CommentPos.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommentPos.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
import java.io.Serializable;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CommitMessageTransformSetting.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommitMessageTransformSetting.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CommitMessageTransformSetting.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/CommitMessageTransformSetting.java
index ff3ee3c09a..7047003282 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CommitMessageTransformSetting.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CommitMessageTransformSetting.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import com.pmease.commons.wicket.editable.annotation.Editable;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable
public class CommitMessageTransformSetting implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CompareContext.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CompareContext.java
similarity index 95%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CompareContext.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/CompareContext.java
index d94b2c53f8..1e5a2cf8e7 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/CompareContext.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/CompareContext.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
import java.io.Serializable;
@@ -9,7 +9,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.hibernate.annotations.OptimisticLock;
-import com.pmease.commons.lang.diff.WhitespaceOption;
+import com.gitplex.commons.lang.diff.WhitespaceOption;
@Embeddable
public class CompareContext implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/DepotAndBranch.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndBranch.java
similarity index 79%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/DepotAndBranch.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndBranch.java
index f50a766f85..7d49ad1555 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/DepotAndBranch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndBranch.java
@@ -1,7 +1,7 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.commons.git.GitUtils;
public class DepotAndBranch extends DepotAndRevision {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/DepotAndRevision.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndRevision.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/DepotAndRevision.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndRevision.java
index 8608626300..e845116fb4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/DepotAndRevision.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/DepotAndRevision.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
+import com.gitplex.core.GitPlex;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.manager.DepotManager;
+import com.gitplex.commons.git.GitUtils;
public class DepotAndRevision implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/IntegrationPolicy.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPolicy.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/IntegrationPolicy.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPolicy.java
index 5148c8b3e6..cca2acdf7a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/IntegrationPolicy.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPolicy.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
import java.io.Serializable;
import java.util.ArrayList;
@@ -9,18 +9,18 @@ import javax.validation.constraints.Size;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Horizontal;
-import com.pmease.gitplex.core.annotation.BranchMatch;
-import com.pmease.gitplex.core.annotation.FullBranchMatch;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchUtils;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
+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.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
+import com.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
@Editable
@Horizontal
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/IntegrationPreview.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPreview.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/IntegrationPreview.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPreview.java
index a4c7f21bc6..3961988cc8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/IntegrationPreview.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/IntegrationPreview.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
import java.io.Serializable;
@@ -8,8 +8,8 @@ import javax.persistence.Embeddable;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.PullRequest.IntegrationStrategy;
@SuppressWarnings("serial")
@Embeddable
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/LastEvent.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/LastEvent.java
similarity index 90%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/LastEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/LastEvent.java
index 88e339ca68..183c5ecff2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/LastEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/LastEvent.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.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.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
@Embeddable
public class LastEvent implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/TextRange.java b/gitplex.core/src/main/java/com/gitplex/core/entity/support/TextRange.java
similarity index 96%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/TextRange.java
rename to gitplex.core/src/main/java/com/gitplex/core/entity/support/TextRange.java
index d13bf4b9b5..25966edf2a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/support/TextRange.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/entity/support/TextRange.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.entity.support;
+package com.gitplex.core.entity.support;
import java.io.Serializable;
@@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-import com.pmease.commons.lang.extractors.TokenPosition;
+import com.gitplex.commons.lang.extractors.TokenPosition;
public class TextRange implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/MarkdownAware.java b/gitplex.core/src/main/java/com/gitplex/core/event/MarkdownAware.java
similarity index 72%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/MarkdownAware.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/MarkdownAware.java
index 1a7395b5cb..f7a3624e09 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/MarkdownAware.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/MarkdownAware.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.event;
+package com.gitplex.core.event;
import javax.annotation.Nullable;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/RefUpdated.java b/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/RefUpdated.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java
index 1756242c1e..e32bbdbe8f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/RefUpdated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/RefUpdated.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.event;
+package com.gitplex.core.event;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public class RefUpdated {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/TaskChangeEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/TaskChangeEvent.java
similarity index 67%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/TaskChangeEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/TaskChangeEvent.java
index 4b3ea1d2be..93afdd3c3a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/TaskChangeEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/TaskChangeEvent.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.core.event;
+package com.gitplex.core.event;
-import com.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
public class TaskChangeEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentActivityEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentActivityEvent.java
similarity index 69%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentActivityEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentActivityEvent.java
index 7a587a65bf..bf4e1dde93 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentActivityEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentActivityEvent.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.codecomment;
+package com.gitplex.core.event.codecomment;
import java.util.Date;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
+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;
public abstract class CodeCommentActivityEvent extends CodeCommentEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentCreated.java b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentCreated.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentCreated.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentCreated.java
index d46211ec8e..02bff3ee30 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentCreated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentCreated.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.codecomment;
+package com.gitplex.core.event.codecomment;
import java.util.Date;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="created")
public class CodeCommentCreated extends CodeCommentEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentEvent.java
similarity index 70%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentEvent.java
index 53bfb91f13..af5d03bdf2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentEvent.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.codecomment;
+package com.gitplex.core.event.codecomment;
import java.util.Date;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.event.MarkdownAware;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.core.event.MarkdownAware;
public abstract class CodeCommentEvent implements MarkdownAware {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentReplied.java b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentReplied.java
similarity index 53%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentReplied.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentReplied.java
index ce20aaf7c3..1e4d44c5dc 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentReplied.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentReplied.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.codecomment;
+package com.gitplex.core.event.codecomment;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.CodeCommentReply;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentReplied;
+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;
@Editable(name="replied")
public class CodeCommentReplied extends CodeCommentActivityEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentResolved.java b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentResolved.java
similarity index 55%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentResolved.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentResolved.java
index 148c8420de..a6597c7035 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentResolved.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentResolved.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.codecomment;
+package com.gitplex.core.event.codecomment;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentResolved;
+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;
@Editable(name="resolved")
public class CodeCommentResolved extends CodeCommentActivityEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentUnresolved.java b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentUnresolved.java
similarity index 55%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentUnresolved.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentUnresolved.java
index 6748bdc119..8ad52a95e0 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/codecomment/CodeCommentUnresolved.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/codecomment/CodeCommentUnresolved.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.codecomment;
+package com.gitplex.core.event.codecomment;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentUnresolved;
+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;
@Editable(name="unresolved")
public class CodeCommentUnresolved extends CodeCommentActivityEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotDeleted.java b/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotDeleted.java
similarity index 65%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotDeleted.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotDeleted.java
index 69e321e079..3fb8834b33 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotDeleted.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotDeleted.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.core.event.depot;
+package com.gitplex.core.event.depot;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public class DepotDeleted {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotRenamed.java b/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotRenamed.java
similarity index 76%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotRenamed.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotRenamed.java
index 62bbfd9d55..5b62c2362f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotRenamed.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotRenamed.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.core.event.depot;
+package com.gitplex.core.event.depot;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public class DepotRenamed {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotTransferred.java b/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotTransferred.java
similarity index 70%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotTransferred.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotTransferred.java
index 0832ba0664..49e5902abd 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/depot/DepotTransferred.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/depot/DepotTransferred.java
@@ -1,7 +1,7 @@
-package com.pmease.gitplex.core.event.depot;
+package com.gitplex.core.event.depot;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Depot;
public class DepotTransferred {
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.java
new file mode 100644
index 0000000000..efcb8bf911
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarted.java
@@ -0,0 +1,5 @@
+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.java
new file mode 100644
index 0000000000..f7d1cdd0ee
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStarting.java
@@ -0,0 +1,5 @@
+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.java
new file mode 100644
index 0000000000..a0c8eb5aba
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopped.java
@@ -0,0 +1,5 @@
+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.java
new file mode 100644
index 0000000000..0da9beb0d3
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/lifecycle/SystemStopping.java
@@ -0,0 +1,5 @@
+package com.gitplex.core.event.lifecycle;
+
+public class SystemStopping {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java
similarity index 69%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java
index fed08f808a..702b8a7a03 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/IntegrationPreviewCalculated.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.PullRequest;
public class IntegrationPreviewCalculated extends PullRequestChangeEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestChangeEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestChangeEvent.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestChangeEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestChangeEvent.java
index 8fcabc2db6..f57c9d2ba6 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestChangeEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestChangeEvent.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
import javax.annotation.Nullable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.PullRequest;
public abstract class PullRequestChangeEvent extends PullRequestEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
similarity index 74%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
index 564f68ffb4..3a73a8e94b 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentActivityEvent.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.support.CodeCommentActivity;
public abstract class PullRequestCodeCommentActivityEvent extends PullRequestCodeCommentEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java
similarity index 61%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java
index b59e10cecf..005b29eb6c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentCreated.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.MarkdownAware;
+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;
@Editable(name="commented code")
public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java
similarity index 62%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java
index 12cdaf6e81..35379ac88c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentEvent.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.MarkdownAware;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.core.event.MarkdownAware;
public abstract class PullRequestCodeCommentEvent extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java
similarity index 60%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java
index 22584821fb..ea3fff0f40 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentReplied.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.CodeCommentReply;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.CodeCommentReply;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="replied code comment")
public class PullRequestCodeCommentReplied extends PullRequestCodeCommentActivityEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java
similarity index 62%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java
index ec4b48b0cb..eb9647b799 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentResolved.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.CodeCommentStatusChange;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="resolved code comment")
public class PullRequestCodeCommentResolved extends PullRequestCodeCommentActivityEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
similarity index 62%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
index afb8404532..7825ce30cc 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCodeCommentUnresolved.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.CodeCommentStatusChange;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="Unresolved code comment")
public class PullRequestCodeCommentUnresolved extends PullRequestCodeCommentActivityEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCommentCreated.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCommentCreated.java
similarity index 69%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCommentCreated.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCommentCreated.java
index d2c8212f58..60dfbd8d39 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestCommentCreated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestCommentCreated.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.event.MarkdownAware;
+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;
@Editable(name="commented")
public class PullRequestCommentCreated extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestEvent.java
similarity index 68%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestEvent.java
index f2cc636393..fdc62092f8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestEvent.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.PullRequest;
public abstract class PullRequestEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestOpened.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestOpened.java
similarity index 63%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestOpened.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestOpened.java
index 48e0b043a9..3eebe53fd8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestOpened.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestOpened.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.MarkdownAware;
+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;
@Editable(name="opened")
public class PullRequestOpened extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingApproval.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingApproval.java
similarity index 57%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingApproval.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingApproval.java
index 887c838bd1..87a791dadd 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingApproval.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingApproval.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.pullrequest;
-
-import com.pmease.gitplex.core.entity.PullRequest;
-
-public class PullRequestPendingApproval extends PullRequestEvent {
-
- public PullRequestPendingApproval(PullRequest request) {
- super(request);
- }
-
-}
+package com.gitplex.core.event.pullrequest;
+
+import com.gitplex.core.entity.PullRequest;
+
+public class PullRequestPendingApproval extends PullRequestEvent {
+
+ public PullRequestPendingApproval(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java
similarity index 58%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java
index 7910d7e244..dc54800348 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingIntegration.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.pullrequest;
-
-import com.pmease.gitplex.core.entity.PullRequest;
-
-public class PullRequestPendingIntegration extends PullRequestEvent {
-
- public PullRequestPendingIntegration(PullRequest request) {
- super(request);
- }
-
-}
+package com.gitplex.core.event.pullrequest;
+
+import com.gitplex.core.entity.PullRequest;
+
+public class PullRequestPendingIntegration extends PullRequestEvent {
+
+ public PullRequestPendingIntegration(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java
similarity index 56%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java
index 46150868f7..ae18f6354a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestPendingUpdate.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.event.pullrequest;
-
-import com.pmease.gitplex.core.entity.PullRequest;
-
-public class PullRequestPendingUpdate extends PullRequestEvent {
-
- public PullRequestPendingUpdate(PullRequest request) {
- super(request);
- }
-
-}
+package com.gitplex.core.event.pullrequest;
+
+import com.gitplex.core.entity.PullRequest;
+
+public class PullRequestPendingUpdate extends PullRequestEvent {
+
+ public PullRequestPendingUpdate(PullRequest request) {
+ super(request);
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java
similarity index 73%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java
index 69574783e5..65a098deaf 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestReviewInvitationChanged.java
@@ -1,18 +1,18 @@
-package com.pmease.gitplex.core.event.pullrequest;
-
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-
-public class PullRequestReviewInvitationChanged extends PullRequestEvent {
-
- private final PullRequestReviewInvitation invitation;
-
- public PullRequestReviewInvitationChanged(PullRequestReviewInvitation invitation) {
- super(invitation.getRequest());
- this.invitation = invitation;
- }
-
- public PullRequestReviewInvitation getInvitation() {
- return invitation;
- }
-
-}
+package com.gitplex.core.event.pullrequest;
+
+import com.gitplex.core.entity.PullRequestReviewInvitation;
+
+public class PullRequestReviewInvitationChanged extends PullRequestEvent {
+
+ private final PullRequestReviewInvitation invitation;
+
+ public PullRequestReviewInvitationChanged(PullRequestReviewInvitation invitation) {
+ super(invitation.getRequest());
+ this.invitation = invitation;
+ }
+
+ public PullRequestReviewInvitation getInvitation() {
+ return invitation;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java
similarity index 75%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java
index d4e732da65..7f752d9581 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestStatusChangeEvent.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.event.MarkdownAware;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.PullRequestStatusChange;
+import com.gitplex.core.event.MarkdownAware;
public class PullRequestStatusChangeEvent extends PullRequestChangeEvent implements MarkdownAware {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestUpdated.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestUpdated.java
similarity index 68%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestUpdated.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestUpdated.java
index 0cbad19809..6d3900426b 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestUpdated.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestUpdated.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.PullRequestUpdate;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="has new commits")
public class PullRequestUpdated extends PullRequestChangeEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java
similarity index 72%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java
rename to gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java
index b5137f6bea..770f1c0bd4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/event/pullrequest/PullRequestVerificationRunning.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.event.pullrequest;
+package com.gitplex.core.event.pullrequest;
import java.util.Date;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequestVerification;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.PullRequestVerification;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="ran verification", icon="fa fa-cog")
public class PullRequestVerificationRunning extends PullRequestChangeEvent {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AbstractGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AbstractGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java
index e973179dec..073062c4e9 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AbstractGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AbstractGateKeeper.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import java.util.List;
@@ -6,15 +6,15 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Ignored;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Passed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Pending;
+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;
@Editable
public abstract class AbstractGateKeeper implements GateKeeper {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AndGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndGateKeeper.java
similarity index 70%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AndGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndGateKeeper.java
index c8da14f530..e4fe607b14 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AndGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndGateKeeper.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import java.util.ArrayList;
import java.util.List;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Horizontal;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Passed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Pending;
+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;
@Editable(name="And Composition", icon="fa-object-group", order=100,
category=GateKeeper.CATEGORY_COMPOSITION,
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AndOrGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndOrGateKeeper.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AndOrGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndOrGateKeeper.java
index 07fab78ecc..2ae2059fe8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/AndOrGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/AndOrGateKeeper.java
@@ -1,93 +1,93 @@
-package com.pmease.gitplex.core.gatekeeper;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-
-public abstract class AndOrGateKeeper extends CompositeGateKeeper {
-
- private static final long serialVersionUID = 1L;
-
- private List<GateKeeper> gateKeepers = new ArrayList<GateKeeper>();
-
- public void setGateKeepers(List<GateKeeper> gateKeepers) {
- this.gateKeepers = gateKeepers;
- }
-
- @Valid
- @NotNull
- public List<GateKeeper> getGateKeepers() {
- return gateKeepers;
- }
-
- @Override
- public void onAccountRename(String oldName, String newName) {
- for (GateKeeper gateKeeper: gateKeepers)
- gateKeeper.onAccountRename(oldName, newName);
- }
-
- @Override
- public boolean onAccountDelete(String accountName) {
- for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
- if (it.next().onAccountDelete(accountName))
- it.remove();
- }
- return gateKeepers.isEmpty();
- }
-
- @Override
- public void onDepotRename(Depot renamedDepot, String oldName) {
- for (GateKeeper gateKeeper: gateKeepers)
- gateKeeper.onDepotRename(renamedDepot, oldName);
- }
-
- @Override
- public boolean onDepotTransfer(Depot depotDefiningGateKeeper, Depot transferredDepot,
- Account originalAccount) {
- for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
- if (it.next().onDepotTransfer(depotDefiningGateKeeper, transferredDepot, originalAccount))
- it.remove();
- }
- return gateKeepers.isEmpty();
- }
-
- @Override
- public boolean onDepotDelete(Depot depot) {
- for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
- if (it.next().onDepotDelete(depot))
- it.remove();
- }
- return gateKeepers.isEmpty();
- }
-
- @Override
- public void onTeamRename(String oldName, String newName) {
- for (GateKeeper gateKeeper: gateKeepers)
- gateKeeper.onTeamRename(oldName, newName);
- }
-
- @Override
- public boolean onTeamDelete(String teamName) {
- for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
- if (it.next().onTeamDelete(teamName))
- it.remove();
- }
- return gateKeepers.isEmpty();
- }
-
- @Override
- public boolean onRefDelete(String refName) {
- for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
- if (it.next().onRefDelete(refName))
- it.remove();
- }
- return gateKeepers.isEmpty();
- }
-
-}
+package com.gitplex.core.gatekeeper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+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;
+
+public abstract class AndOrGateKeeper extends CompositeGateKeeper {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<GateKeeper> gateKeepers = new ArrayList<GateKeeper>();
+
+ public void setGateKeepers(List<GateKeeper> gateKeepers) {
+ this.gateKeepers = gateKeepers;
+ }
+
+ @Valid
+ @NotNull
+ public List<GateKeeper> getGateKeepers() {
+ return gateKeepers;
+ }
+
+ @Override
+ public void onAccountRename(String oldName, String newName) {
+ for (GateKeeper gateKeeper: gateKeepers)
+ gateKeeper.onAccountRename(oldName, newName);
+ }
+
+ @Override
+ public boolean onAccountDelete(String accountName) {
+ for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
+ if (it.next().onAccountDelete(accountName))
+ it.remove();
+ }
+ return gateKeepers.isEmpty();
+ }
+
+ @Override
+ public void onDepotRename(Depot renamedDepot, String oldName) {
+ for (GateKeeper gateKeeper: gateKeepers)
+ gateKeeper.onDepotRename(renamedDepot, oldName);
+ }
+
+ @Override
+ public boolean onDepotTransfer(Depot depotDefiningGateKeeper, Depot transferredDepot,
+ Account originalAccount) {
+ for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
+ if (it.next().onDepotTransfer(depotDefiningGateKeeper, transferredDepot, originalAccount))
+ it.remove();
+ }
+ return gateKeepers.isEmpty();
+ }
+
+ @Override
+ public boolean onDepotDelete(Depot depot) {
+ for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
+ if (it.next().onDepotDelete(depot))
+ it.remove();
+ }
+ return gateKeepers.isEmpty();
+ }
+
+ @Override
+ public void onTeamRename(String oldName, String newName) {
+ for (GateKeeper gateKeeper: gateKeepers)
+ gateKeeper.onTeamRename(oldName, newName);
+ }
+
+ @Override
+ public boolean onTeamDelete(String teamName) {
+ for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
+ if (it.next().onTeamDelete(teamName))
+ it.remove();
+ }
+ return gateKeepers.isEmpty();
+ }
+
+ @Override
+ public boolean onRefDelete(String refName) {
+ for (Iterator<GateKeeper> it = gateKeepers.iterator(); it.hasNext();) {
+ if (it.next().onRefDelete(refName))
+ it.remove();
+ }
+ return gateKeepers.isEmpty();
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
index 72af1bbb99..478b726382 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedTeam.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
index 7fb45088c8..d07a5b09cd 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ApprovedBySpecifiedUser.java
@@ -1,20 +1,20 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.annotation.AccountChoice;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.manager.AccountManager;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/CompositeGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/CompositeGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java
index b723c058da..44a574c3f6 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/CompositeGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/CompositeGateKeeper.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+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;
public abstract class CompositeGateKeeper extends AbstractGateKeeper {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ConditionalGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ConditionalGateKeeper.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ConditionalGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ConditionalGateKeeper.java
index 132cc41b22..9734935837 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/ConditionalGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/ConditionalGateKeeper.java
@@ -1,16 +1,16 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Horizontal;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Passed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Pending;
+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;
@Editable(name="Conditional Composition", order=300, icon="fa-object-group",
category=GateKeeper.CATEGORY_COMPOSITION,
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DefaultGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java
similarity index 63%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DefaultGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java
index 052e06abac..e2f114596d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DefaultGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DefaultGateKeeper.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+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;
@Editable
public class DefaultGateKeeper extends AbstractGateKeeper {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
similarity index 85%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
index e1224545b2..45c9944b61 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedTeam.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
similarity index 78%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
index c51d7c36ad..a7da861b3f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/DisapprovedBySpecifiedUser.java
@@ -1,19 +1,19 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.annotation.AccountChoice;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.manager.AccountManager;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/GateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java
similarity index 86%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/GateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java
index ea03d033a8..637920e6cb 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/GateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/GateKeeper.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import java.io.Serializable;
@@ -6,11 +6,11 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+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;
@Editable(name="Misc")
public interface GateKeeper extends Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/NotGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/NotGateKeeper.java
similarity index 81%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/NotGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/NotGateKeeper.java
index 838918f908..b36598a50c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/NotGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/NotGateKeeper.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Horizontal;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Passed;
+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;
@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/pmease/gitplex/core/gatekeeper/OrGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/OrGateKeeper.java
similarity index 70%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/OrGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/OrGateKeeper.java
index fcfdf80150..841e778acc 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/OrGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/OrGateKeeper.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import java.util.ArrayList;
import java.util.List;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Horizontal;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Passed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Pending;
+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;
@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/pmease/gitplex/core/gatekeeper/PerformSpecifiedOperations.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
index 7d675c6b67..5449d9d528 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PerformSpecifiedOperations.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.validation.ClassValidating;
-import com.pmease.commons.validation.Validatable;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.commons.validation.ClassValidating;
+import com.gitplex.commons.validation.Validatable;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
similarity index 77%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
index 170f272193..596fa67cbd 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/PushWithoutRewritingHistory.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.google.common.collect.Lists;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
index c51f64a9df..15034f7b58 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmitWithGerritStylePatch.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
similarity index 80%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
index 8c223ce51e..f337201234 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedTeam.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
similarity index 79%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
index b5633c3aae..42419f4ece 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/SubmittedBySpecifiedUser.java
@@ -1,18 +1,18 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.annotation.AccountChoice;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.manager.AccountManager;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/TargetBranchIsMerged.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java
similarity index 75%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TargetBranchIsMerged.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java
index 04ff48444d..eafc318f8a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TargetBranchIsMerged.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TargetBranchIsMerged.java
@@ -1,41 +1,41 @@
-package com.pmease.gitplex.core.gatekeeper;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.google.common.collect.Lists;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.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")
-public class TargetBranchIsMerged extends AbstractGateKeeper {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected GateCheckResult doCheckRequest(PullRequest request) {
- RevCommit requestHeadCommit = request.getHeadCommit();
- RevCommit branchHeadCommit = request.getTarget().getCommit();
- if (!GitUtils.isMergedInto(request.getTargetDepot().getRepository(), branchHeadCommit, requestHeadCommit)) {
- return failed(Lists.newArrayList("Please merge target branch into the source branch first"));
- } else {
- return passed(Lists.newArrayList("No more than one commit"));
- }
- }
-
- @Override
- protected GateCheckResult doCheckFile(Account user, Depot depot, String branch, String file) {
- return ignored();
- }
-
- @Override
- protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
- return ignored();
- }
-
-}
+package com.gitplex.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;
+
+@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")
+public class TargetBranchIsMerged extends AbstractGateKeeper {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected GateCheckResult doCheckRequest(PullRequest request) {
+ RevCommit requestHeadCommit = request.getHeadCommit();
+ RevCommit branchHeadCommit = request.getTarget().getCommit();
+ if (!GitUtils.isMergedInto(request.getTargetDepot().getRepository(), branchHeadCommit, requestHeadCommit)) {
+ return failed(Lists.newArrayList("Please merge target branch into the source branch first"));
+ } else {
+ return passed(Lists.newArrayList("No more than one commit"));
+ }
+ }
+
+ @Override
+ protected GateCheckResult doCheckFile(Account user, Depot depot, String branch, String file) {
+ return ignored();
+ }
+
+ @Override
+ protected GateCheckResult doCheckPush(Account user, Depot depot, String refName, ObjectId oldCommit, ObjectId newCommit) {
+ return ignored();
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TeamAwareGateKeeper.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TeamAwareGateKeeper.java
similarity index 73%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TeamAwareGateKeeper.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TeamAwareGateKeeper.java
index 1914d37b0e..4d802a538f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TeamAwareGateKeeper.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TeamAwareGateKeeper.java
@@ -1,64 +1,64 @@
-package com.pmease.gitplex.core.gatekeeper;
-
-import java.util.Collection;
-import java.util.HashSet;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.annotation.TeamChoice;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.TeamManager;
-
-public abstract class TeamAwareGateKeeper extends AbstractGateKeeper {
-
- private static final long serialVersionUID = 1L;
-
- private String teamName;
-
- @Editable(name="Team", order=100)
- @TeamChoice
- @NotEmpty
- public String getTeamName() {
- return teamName;
- }
-
- public void setTeamName(String teamName) {
- this.teamName = teamName;
- }
-
- @Override
- public void onTeamRename(String oldName, String newName) {
- if (teamName.equals(oldName))
- teamName = newName;
- }
-
- @Override
- public boolean onTeamDelete(String teamName) {
- return this.teamName.equals(teamName);
- }
-
- protected Team getTeam(Account organization) {
- return Preconditions.checkNotNull(GitPlex.getInstance(TeamManager.class).find(organization, teamName));
- }
-
- protected Collection<Account> getTeamMembers(Account organization) {
- Collection<Account> members = new HashSet<>();
- for (TeamMembership membership: getTeam(organization).getMemberships()) {
- members.add(membership.getUser());
- }
- return members;
- }
-
- @Override
- public boolean onDepotTransfer(Depot depotDefiningGateKeeper, Depot transferredDepot,
- Account originalAccount) {
- return depotDefiningGateKeeper.equals(transferredDepot);
- }
-
-}
+package com.gitplex.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;
+
+public abstract class TeamAwareGateKeeper extends AbstractGateKeeper {
+
+ private static final long serialVersionUID = 1L;
+
+ private String teamName;
+
+ @Editable(name="Team", order=100)
+ @TeamChoice
+ @NotEmpty
+ public String getTeamName() {
+ return teamName;
+ }
+
+ public void setTeamName(String teamName) {
+ this.teamName = teamName;
+ }
+
+ @Override
+ public void onTeamRename(String oldName, String newName) {
+ if (teamName.equals(oldName))
+ teamName = newName;
+ }
+
+ @Override
+ public boolean onTeamDelete(String teamName) {
+ return this.teamName.equals(teamName);
+ }
+
+ protected Team getTeam(Account organization) {
+ return Preconditions.checkNotNull(GitPlex.getInstance(TeamManager.class).find(organization, teamName));
+ }
+
+ protected Collection<Account> getTeamMembers(Account organization) {
+ Collection<Account> members = new HashSet<>();
+ for (TeamMembership membership: getTeam(organization).getMemberships()) {
+ members.add(membership.getUser());
+ }
+ return members;
+ }
+
+ @Override
+ public boolean onDepotTransfer(Depot depotDefiningGateKeeper, Depot transferredDepot,
+ Account originalAccount) {
+ return depotDefiningGateKeeper.equals(transferredDepot);
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TouchSpecifiedFiles.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
similarity index 80%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
index e4d0246429..8519ced01d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedFiles.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.core.gatekeeper;
import java.io.IOException;
@@ -7,18 +7,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.pmease.commons.util.match.PatternMatcher;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.annotation.PathMatch;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.util.ChildAwareMatcher;
-import com.pmease.gitplex.core.util.ParentAwareMatcher;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
+import com.gitplex.commons.util.match.PatternMatcher;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/TouchSpecifiedRefs.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
similarity index 75%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
index 4ff0a8eb1e..9ebd30dc01 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/TouchSpecifiedRefs.java
@@ -1,21 +1,21 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.util.match.PatternMatcher;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.annotation.RefMatch;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.util.ChildAwareMatcher;
-import com.pmease.gitplex.core.util.ParentAwareMatcher;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
+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;
@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/pmease/gitplex/core/gatekeeper/VerifiedByBuilds.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java
similarity index 85%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/VerifiedByBuilds.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java
index 58733294c0..5826f84bce 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/VerifiedByBuilds.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/VerifiedByBuilds.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper;
+package com.gitplex.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.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestVerification;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.manager.PullRequestVerificationManager;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@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/pmease/gitplex/core/gatekeeper/checkresult/Failed.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Failed.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Failed.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Failed.java
index cee6979970..8b2c076cc2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Failed.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Failed.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper.checkresult;
+package com.gitplex.core.gatekeeper.checkresult;
import java.util.List;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/GateCheckResult.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/GateCheckResult.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/GateCheckResult.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/GateCheckResult.java
index 6cf3eeaaa3..9b243075f3 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/GateCheckResult.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/GateCheckResult.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper.checkresult;
+package com.gitplex.core.gatekeeper.checkresult;
import java.io.Serializable;
import java.util.List;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Ignored.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Ignored.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Ignored.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Ignored.java
index be07aa32f0..0b019ad3db 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Ignored.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Ignored.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper.checkresult;
+package com.gitplex.core.gatekeeper.checkresult;
import java.util.ArrayList;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Passed.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Passed.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Passed.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Passed.java
index 6c8308358d..2b2b18da9f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Passed.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Passed.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper.checkresult;
+package com.gitplex.core.gatekeeper.checkresult;
import java.util.List;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Pending.java b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Pending.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Pending.java
rename to gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Pending.java
index ae1ed76cbf..592c3fea74 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/gatekeeper/checkresult/Pending.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/gatekeeper/checkresult/Pending.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.gatekeeper.checkresult;
+package com.gitplex.core.gatekeeper.checkresult;
import java.util.List;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/GitPostReceiveCallback.java b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/GitPostReceiveCallback.java
rename to gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java
index 767975f34e..6499bd81ca 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/GitPostReceiveCallback.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPostReceiveCallback.java
@@ -1,133 +1,133 @@
-package com.pmease.gitplex.core.hookcallback;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.shiro.util.ThreadContext;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.manager.DepotManager;
-
-@SuppressWarnings("serial")
-@Singleton
-public class GitPostReceiveCallback extends HttpServlet {
-
- private static final Logger logger = LoggerFactory.getLogger(GitPostReceiveCallback.class);
-
- public static final String PATH = "/git-postreceive-callback";
-
- private final DepotManager depotManager;
-
- private final ListenerRegistry listenerRegistry;
-
- private final UnitOfWork unitOfWork;
-
- @Inject
- public GitPostReceiveCallback(DepotManager depotManager, UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {
- this.depotManager = depotManager;
- this.unitOfWork = unitOfWork;
- this.listenerRegistry = listenerRegistry;
- }
-
- @Override
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String clientIp = request.getHeader("X-Forwarded-For");
- if (clientIp == null) clientIp = request.getRemoteAddr();
-
- if (!InetAddress.getByName(clientIp).isLoopbackAddress()) {
- response.sendError(HttpServletResponse.SC_FORBIDDEN,
- "Git hook callbacks can only be accessed from localhost.");
- return;
- }
-
- List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
- Preconditions.checkState(fields.size() == 2);
-
- Long depotId = Long.valueOf(fields.get(0));
- Long userId = Long.valueOf(fields.get(1));
-
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- IOUtils.copy(request.getInputStream(), baos);
-
- /*
- * If multiple refs are updated, the hook stdin will put each ref update info into
- * a separate line, however the line breaks is omitted when forward the hook stdin
- * to curl via "@-", below logic is used to parse these info correctly even
- * without line breaks.
- */
- String callbackData = new String(baos.toByteArray());
- callbackData = StringUtils.reverse(StringUtils.remove(callbackData, '\n'));
-
- fields.clear();
- fields.addAll(StringUtils.splitAndTrim(callbackData, " "));
-
- unitOfWork.doAsync(new Runnable() {
-
- @Override
- public void run() {
- ThreadContext.bind(Account.asSubject(userId));
- try {
- Depot depot = depotManager.load(depotId);
-
- int pos = 0;
- while (true) {
- String refName = StringUtils.reverse(fields.get(pos));
- pos++;
- ObjectId newCommit = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
- pos++;
- String field = fields.get(pos);
- ObjectId oldCommit = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
-
- if (!newCommit.equals(ObjectId.zeroId())) {
- depot.cacheObjectId(refName, newCommit);
- } else {
- newCommit = ObjectId.zeroId();
- depot.cacheObjectId(refName, null);
- }
-
- String branch = GitUtils.ref2branch(refName);
- if (branch != null && depot.getDefaultBranch() == null) {
- RefUpdate refUpdate = depot.updateRef("HEAD");
- GitUtils.linkRef(refUpdate, refName);
- }
-
- listenerRegistry.post(new RefUpdated(depot, refName, oldCommit, newCommit));
-
- field = field.substring(40);
- if (field.length() == 0)
- break;
- else
- fields.set(pos, field);
- }
- } catch (Exception e) {
- logger.error("Error executing post-receive callback", e);
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- });
- }
-
-}
+package com.gitplex.core.hookcallback;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.shiro.util.ThreadContext;
+import org.eclipse.jgit.lib.ObjectId;
+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;
+
+@SuppressWarnings("serial")
+@Singleton
+public class GitPostReceiveCallback extends HttpServlet {
+
+ private static final Logger logger = LoggerFactory.getLogger(GitPostReceiveCallback.class);
+
+ public static final String PATH = "/git-postreceive-callback";
+
+ private final DepotManager depotManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final UnitOfWork unitOfWork;
+
+ @Inject
+ public GitPostReceiveCallback(DepotManager depotManager, UnitOfWork unitOfWork, ListenerRegistry listenerRegistry) {
+ this.depotManager = depotManager;
+ this.unitOfWork = unitOfWork;
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ String clientIp = request.getHeader("X-Forwarded-For");
+ if (clientIp == null) clientIp = request.getRemoteAddr();
+
+ if (!InetAddress.getByName(clientIp).isLoopbackAddress()) {
+ response.sendError(HttpServletResponse.SC_FORBIDDEN,
+ "Git hook callbacks can only be accessed from localhost.");
+ return;
+ }
+
+ List<String> fields = StringUtils.splitAndTrim(request.getPathInfo(), "/");
+ Preconditions.checkState(fields.size() == 2);
+
+ Long depotId = Long.valueOf(fields.get(0));
+ Long userId = Long.valueOf(fields.get(1));
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ IOUtils.copy(request.getInputStream(), baos);
+
+ /*
+ * If multiple refs are updated, the hook stdin will put each ref update info into
+ * a separate line, however the line breaks is omitted when forward the hook stdin
+ * to curl via "@-", below logic is used to parse these info correctly even
+ * without line breaks.
+ */
+ String callbackData = new String(baos.toByteArray());
+ callbackData = StringUtils.reverse(StringUtils.remove(callbackData, '\n'));
+
+ fields.clear();
+ fields.addAll(StringUtils.splitAndTrim(callbackData, " "));
+
+ unitOfWork.doAsync(new Runnable() {
+
+ @Override
+ public void run() {
+ ThreadContext.bind(Account.asSubject(userId));
+ try {
+ Depot depot = depotManager.load(depotId);
+
+ int pos = 0;
+ while (true) {
+ String refName = StringUtils.reverse(fields.get(pos));
+ pos++;
+ ObjectId newCommit = ObjectId.fromString(StringUtils.reverse(fields.get(pos)));
+ pos++;
+ String field = fields.get(pos);
+ ObjectId oldCommit = ObjectId.fromString(StringUtils.reverse(field.substring(0, 40)));
+
+ if (!newCommit.equals(ObjectId.zeroId())) {
+ depot.cacheObjectId(refName, newCommit);
+ } else {
+ newCommit = ObjectId.zeroId();
+ depot.cacheObjectId(refName, null);
+ }
+
+ String branch = GitUtils.ref2branch(refName);
+ if (branch != null && depot.getDefaultBranch() == null) {
+ RefUpdate refUpdate = depot.updateRef("HEAD");
+ GitUtils.linkRef(refUpdate, refName);
+ }
+
+ listenerRegistry.post(new RefUpdated(depot, refName, oldCommit, newCommit));
+
+ field = field.substring(40);
+ if (field.length() == 0)
+ break;
+ else
+ fields.set(pos, field);
+ }
+ } catch (Exception e) {
+ logger.error("Error executing post-receive callback", e);
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/GitPreReceiveCallback.java b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/GitPreReceiveCallback.java
rename to gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java
index 7d5fec9adf..4c3e9eab4e 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/GitPreReceiveCallback.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/GitPreReceiveCallback.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.hookcallback;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.ObjectPermission;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.hibernate.Transactional;
+import com.gitplex.commons.util.StringUtils;
@SuppressWarnings("serial")
@Singleton
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/Output.java b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/Output.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/Output.java
rename to gitplex.core/src/main/java/com/gitplex/core/hookcallback/Output.java
index 6945bf8a49..83cb56b71d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/hookcallback/Output.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/hookcallback/Output.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.hookcallback;
+package com.gitplex.core.hookcallback;
import java.io.IOException;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/AccountManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/AccountManager.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/AccountManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/AccountManager.java
index 4ffd606d67..aa014d8ec8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/AccountManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/AccountManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.List;
@@ -6,8 +6,8 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.PersonIdent;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface AccountManager extends EntityManager<Account> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/AttachmentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/AttachmentManager.java
similarity index 80%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/AttachmentManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/AttachmentManager.java
index 1864913d1f..ed1561bfca 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/AttachmentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/AttachmentManager.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.io.File;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public interface AttachmentManager {
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/BatchWorkManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/BatchWorkManager.java
new file mode 100644
index 0000000000..193dce612a
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/BatchWorkManager.java
@@ -0,0 +1,10 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.manager.support.BatchWorker;
+import com.gitplex.commons.util.concurrent.Prioritized;
+
+public interface BatchWorkManager {
+
+ void submit(BatchWorker worker, Prioritized work);
+
+}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/BranchWatchManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/BranchWatchManager.java
new file mode 100644
index 0000000000..a48f74d72c
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/BranchWatchManager.java
@@ -0,0 +1,16 @@
+package com.gitplex.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;
+
+public interface BranchWatchManager extends EntityManager<BranchWatch> {
+
+ Collection<BranchWatch> find(Account user, Depot depot);
+
+ Collection<BranchWatch> find(Depot depot, String branch);
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentInfoManager.java
similarity index 76%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentInfoManager.java
index dd9cd165f2..dfb9dc4019 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentInfoManager.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.List;
import java.util.Map;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.CompareContext;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.support.CompareContext;
public interface CodeCommentInfoManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentManager.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentManager.java
index ace0333adb..feffab7a53 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.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.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentEvent;
+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;
public interface CodeCommentManager extends EntityManager<CodeComment> {
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentRelationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentRelationManager.java
new file mode 100644
index 0000000000..dd65a95780
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentRelationManager.java
@@ -0,0 +1,17 @@
+package com.gitplex.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;
+
+public interface CodeCommentRelationManager extends EntityManager<CodeCommentRelation> {
+
+ /**
+ * Get code comments related to specified pull request, ordered by id descendantly
+ */
+ List<CodeComment> findCodeComments(PullRequest request);
+
+}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentReplyManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentReplyManager.java
new file mode 100644
index 0000000000..3383df1ed4
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentReplyManager.java
@@ -0,0 +1,10 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.entity.CodeCommentReply;
+import com.gitplex.commons.hibernate.dao.EntityManager;
+
+public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {
+
+ void save(CodeCommentReply reply, boolean callListeners);
+
+}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentStatusChangeManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentStatusChangeManager.java
new file mode 100644
index 0000000000..fd0444848a
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/CodeCommentStatusChangeManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.entity.CodeCommentStatusChange;
+import com.gitplex.commons.hibernate.dao.EntityManager;
+
+public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CommitInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/CommitInfoManager.java
similarity index 89%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CommitInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/CommitInfoManager.java
index c01c3b2b33..d9f0d92fba 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CommitInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/CommitInfoManager.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.List;
import java.util.Set;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.git.NameAndEmail;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.commons.git.NameAndEmail;
public interface CommitInfoManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/ConfigManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/ConfigManager.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/ConfigManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/ConfigManager.java
index 7dcbd9553f..76702e969c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/ConfigManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/ConfigManager.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import javax.annotation.Nullable;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Config;
-import com.pmease.gitplex.core.setting.BackupSetting;
-import com.pmease.gitplex.core.setting.MailSetting;
-import com.pmease.gitplex.core.setting.SecuritySetting;
-import com.pmease.gitplex.core.setting.SystemSetting;
+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;
public interface ConfigManager extends EntityManager<Config> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/DataManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/DataManager.java
similarity index 56%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/DataManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/DataManager.java
index 7edb5ccc8e..10627e2610 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/DataManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/DataManager.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.List;
import javax.annotation.Nullable;
-import com.pmease.commons.util.init.ManualConfig;
-import com.pmease.gitplex.core.setting.BackupSetting;
+import com.gitplex.core.setting.BackupSetting;
+import com.gitplex.commons.util.init.ManualConfig;
public interface DataManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/DepotManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/DepotManager.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/DepotManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/DepotManager.java
index 35e1cdff13..8218865d1d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/DepotManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/DepotManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
@@ -6,9 +6,9 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.Repository;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface DepotManager extends EntityManager<Depot> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/MailManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java
similarity index 69%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/MailManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java
index 8ed9b527cc..2f11592f1f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/MailManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/MailManager.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.setting.MailSetting;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.setting.MailSetting;
public interface MailManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/OrganizationMembershipManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/OrganizationMembershipManager.java
similarity index 70%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/OrganizationMembershipManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/OrganizationMembershipManager.java
index 802bc2f73b..22e5edb417 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/OrganizationMembershipManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/OrganizationMembershipManager.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
import javax.annotation.Nullable;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.TeamMembership;
+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;
public interface OrganizationMembershipManager extends EntityManager<OrganizationMembership> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestCommentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestCommentManager.java
similarity index 50%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestCommentManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestCommentManager.java
index bd2dd6dfb3..55de1295f3 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestCommentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestCommentManager.java
@@ -1,7 +1,7 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.PullRequestComment;
+import com.gitplex.core.entity.PullRequestComment;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface PullRequestCommentManager extends EntityManager<PullRequestComment> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestInfoManager.java
similarity index 77%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestInfoManager.java
index e0f0c09998..efc8a822c0 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestInfoManager.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public interface PullRequestInfoManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestManager.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestManager.java
index 09185b9a8b..2b18d8fe5e 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestManager.java
@@ -1,17 +1,17 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
import java.util.List;
import javax.annotation.Nullable;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
+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;
public interface PullRequestManager extends EntityManager<PullRequest> {
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReferenceManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReferenceManager.java
new file mode 100644
index 0000000000..a85adc3ac9
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReferenceManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.entity.PullRequestReference;
+import com.gitplex.commons.hibernate.dao.EntityManager;
+
+public interface PullRequestReferenceManager extends EntityManager<PullRequestReference> {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReviewInvitationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewInvitationManager.java
similarity index 53%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReviewInvitationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewInvitationManager.java
index 86769fc51d..c749d9ff59 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReviewInvitationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewInvitationManager.java
@@ -1,17 +1,17 @@
-package com.pmease.gitplex.core.manager;
-
-import java.util.Collection;
-import java.util.Date;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-
-public interface PullRequestReviewInvitationManager extends EntityManager<PullRequestReviewInvitation> {
-
- PullRequestReviewInvitation find(Account reviewer, PullRequest request);
-
- void update(Collection<PullRequestReviewInvitation> invitations, Date since);
-
-}
+package com.gitplex.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;
+
+public interface PullRequestReviewInvitationManager extends EntityManager<PullRequestReviewInvitation> {
+
+ PullRequestReviewInvitation find(Account reviewer, PullRequest request);
+
+ void update(Collection<PullRequestReviewInvitation> invitations, Date since);
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReviewManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewManager.java
similarity index 64%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReviewManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewManager.java
index 2c9def94e9..e53ceee119 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReviewManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestReviewManager.java
@@ -1,31 +1,31 @@
-package com.pmease.gitplex.core.manager;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-
-public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {
-
- PullRequestReview find(Account user, PullRequestUpdate update);
-
- void review(PullRequest request, PullRequestReview.Result result, @Nullable String note);
-
- /**
- * Find list of reviews ordered by review date for specified pull request.
- *
- * @param request
- * pull request to find review for
- * @return
- * list of reviews ordered by review date
- */
- List<PullRequestReview> findAll(PullRequest request);
-
- void deleteAll(Account user, PullRequest request);
-
-}
+package com.gitplex.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;
+
+public interface PullRequestReviewManager extends EntityManager<PullRequestReview> {
+
+ PullRequestReview find(Account user, PullRequestUpdate update);
+
+ void review(PullRequest request, PullRequestReview.Result result, @Nullable String note);
+
+ /**
+ * Find list of reviews ordered by review date for specified pull request.
+ *
+ * @param request
+ * pull request to find review for
+ * @return
+ * list of reviews ordered by review date
+ */
+ List<PullRequestReview> findAll(PullRequest request);
+
+ void deleteAll(Account user, PullRequest request);
+
+}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestStatusChangeManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestStatusChangeManager.java
new file mode 100644
index 0000000000..548403c3fa
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestStatusChangeManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.entity.PullRequestStatusChange;
+import com.gitplex.commons.hibernate.dao.EntityManager;
+
+public interface PullRequestStatusChangeManager extends EntityManager<PullRequestStatusChange> {
+
+}
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestTaskManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestTaskManager.java
new file mode 100644
index 0000000000..4cb3bafd08
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestTaskManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.entity.PullRequestTask;
+import com.gitplex.commons.hibernate.dao.EntityManager;
+
+public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestUpdateManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestUpdateManager.java
similarity index 74%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestUpdateManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestUpdateManager.java
index 230d15ca40..f021d439e5 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestUpdateManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestUpdateManager.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.List;
import javax.annotation.Nullable;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.PullRequestUpdate;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface PullRequestUpdateManager extends EntityManager<PullRequestUpdate> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestVerificationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestVerificationManager.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestVerificationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestVerificationManager.java
index cd729689dd..6c9691a275 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestVerificationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestVerificationManager.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestVerification;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.PullRequestVerification;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface PullRequestVerificationManager extends EntityManager<PullRequestVerification> {
diff --git a/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestWatchManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestWatchManager.java
new file mode 100644
index 0000000000..5cb7c3696a
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/PullRequestWatchManager.java
@@ -0,0 +1,8 @@
+package com.gitplex.core.manager;
+
+import com.gitplex.core.entity.PullRequestWatch;
+import com.gitplex.commons.hibernate.dao.EntityManager;
+
+public interface PullRequestWatchManager extends EntityManager<PullRequestWatch> {
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/StorageManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/StorageManager.java
similarity index 92%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/StorageManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/StorageManager.java
index daae7f9f10..7970025d3b 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/StorageManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/StorageManager.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.io.File;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public interface StorageManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamAuthorizationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/TeamAuthorizationManager.java
similarity index 54%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamAuthorizationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/TeamAuthorizationManager.java
index 0a9a77f7dd..40bcd40506 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamAuthorizationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/TeamAuthorizationManager.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.TeamAuthorization;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface TeamAuthorizationManager extends EntityManager<TeamAuthorization> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/TeamManager.java
similarity index 75%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/TeamManager.java
index 30f82a4498..57e724f776 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/TeamManager.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import javax.annotation.Nullable;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Team;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface TeamManager extends EntityManager<Team> {
/**
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamMembershipManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/TeamMembershipManager.java
similarity index 60%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamMembershipManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/TeamMembershipManager.java
index a75264dc9b..9e5e0debb5 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/TeamMembershipManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/TeamMembershipManager.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.TeamMembership;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.TeamMembership;
+import com.gitplex.commons.hibernate.dao.EntityManager;
public interface TeamMembershipManager extends EntityManager<TeamMembership> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/UrlManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/UrlManager.java
similarity index 50%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/UrlManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/UrlManager.java
index af645e68f6..e96715012a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/UrlManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/UrlManager.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import javax.annotation.Nullable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
+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;
public interface UrlManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/UserAuthorizationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/UserAuthorizationManager.java
similarity index 57%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/UserAuthorizationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/UserAuthorizationManager.java
index bff5758437..318bde71e9 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/UserAuthorizationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/UserAuthorizationManager.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
import javax.annotation.Nullable;
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.UserAuthorization;
+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;
public interface UserAuthorizationManager extends EntityManager<UserAuthorization> {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/VisitInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/VisitInfoManager.java
similarity index 65%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/VisitInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/VisitInfoManager.java
index 2f3a5dae0d..14308f73aa 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/VisitInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/VisitInfoManager.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Date;
import javax.annotation.Nullable;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.PullRequest;
public interface VisitInfoManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/WorkExecutor.java b/gitplex.core/src/main/java/com/gitplex/core/manager/WorkExecutor.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/WorkExecutor.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/WorkExecutor.java
index 2a0940a32c..b6045605ef 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/WorkExecutor.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/WorkExecutor.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager;
+package com.gitplex.core.manager;
import java.util.Collection;
import java.util.List;
@@ -7,8 +7,8 @@ import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import com.pmease.commons.util.concurrent.PrioritizedCallable;
-import com.pmease.commons.util.concurrent.PrioritizedRunnable;
+import com.gitplex.commons.util.concurrent.PrioritizedCallable;
+import com.gitplex.commons.util.concurrent.PrioritizedRunnable;
/**
* This executor is intended to run resource intensive long running tasks
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultAccountManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAccountManager.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultAccountManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAccountManager.java
index e22743cb3d..7cf03b4f01 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultAccountManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAccountManager.java
@@ -1,251 +1,251 @@
-package com.pmease.gitplex.core.manager.impl;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.concurrent.locks.ReadWriteLock;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.PersonIdent;
-import org.hibernate.Query;
-import org.hibernate.ReplicationMode;
-import org.hibernate.criterion.Restrictions;
-
-import com.google.common.collect.BiMap;
-import com.google.common.collect.HashBiMap;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.Listen;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarting;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-
-@Singleton
-public class DefaultAccountManager extends AbstractEntityManager<Account> implements AccountManager {
-
- private final DepotManager depotManager;
-
- private final PullRequestManager pullRequestManager;
-
- private final ReadWriteLock idLock = new ReentrantReadWriteLock();
-
- private final BiMap<String, Long> emailToId = HashBiMap.create();
-
- private final BiMap<String, Long> nameToId = HashBiMap.create();
-
- @Inject
- public DefaultAccountManager(Dao dao, DepotManager depotManager, PullRequestManager pullRequestManager) {
- super(dao);
-
- this.depotManager = depotManager;
- this.pullRequestManager = pullRequestManager;
- }
-
- @Transactional
- @Override
- public void save(Account account, String oldName) {
- if (account.isAdministrator()) {
- getSession().replicate(account, ReplicationMode.OVERWRITE);
- } else {
- dao.persist(account);
- }
-
- if (oldName != null && !oldName.equals(account.getName())) {
- for (Depot depot: dao.findAll(Depot.class)) {
- for (IntegrationPolicy integrationPolicy: depot.getIntegrationPolicies()) {
- integrationPolicy.onAccountRename(oldName, account.getName());
- }
- depot.getGateKeeper().onAccountRename(oldName, account.getName());
- }
- }
-
- doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- idLock.writeLock().lock();
- try {
- nameToId.inverse().put(account.getId(), account.getName());
- if (account.getEmail() != null)
- emailToId.inverse().put(account.getId(), account.getEmail());
- } finally {
- idLock.writeLock().unlock();
- }
- }
-
- });
- }
-
- @Sessional
- @Override
- public Account getRoot() {
- return load(Account.ADMINISTRATOR_ID);
- }
-
- @Transactional
- @Override
- public void delete(Account account) {
- Query query = getSession().createQuery("update PullRequest set lastEvent.user=null where lastEvent.user=:lastEventUser");
- query.setParameter("lastEventUser", account);
- query.executeUpdate();
-
- query = getSession().createQuery("from PullRequest where assignee=:assignee");
- query.setParameter("assignee", account);
-
- for (Object each: query.list()) {
- PullRequest request = (PullRequest) each;
- request.setAssignee(request.getTargetDepot().getAccount());
- pullRequestManager.save(request);
- }
-
- query = getSession().createQuery("update PullRequest set closeInfo.closedBy=null where closeInfo.closedBy=:closedBy");
- query.setParameter("closedBy", account);
- query.executeUpdate();
-
- query = getSession().createQuery("from PullRequest where submitter=:submitter");
- query.setParameter("submitter", account);
-
- for (Object each: query.list()) {
- PullRequest request = (PullRequest) each;
- pullRequestManager.delete(request);
- }
-
- query = getSession().createQuery("update CodeComment set lastEvent.user=null where lastEvent.user=:user");
- query.setParameter("user", account);
- query.executeUpdate();
-
- for (Depot depot: account.getDepots())
- depotManager.delete(depot);
-
- dao.remove(account);
-
- for (Depot depot: dao.findAll(Depot.class)) {
- for (Iterator<IntegrationPolicy> it = depot.getIntegrationPolicies().iterator(); it.hasNext();) {
- if (it.next().onAccountDelete(account.getName()))
- it.remove();
- }
- depot.getGateKeeper().onAccountDelete(account.getName());
- }
-
- doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- idLock.writeLock().lock();
- try {
- emailToId.inverse().remove(account.getId());
- nameToId.inverse().remove(account.getId());
- } finally {
- idLock.writeLock().unlock();
- }
- }
-
- });
- }
-
- @Sessional
- @Override
- public Account findByName(String userName) {
- idLock.readLock().lock();
- try {
- Long id = nameToId.get(userName);
- if (id != null)
- return load(id);
- else
- return null;
- } finally {
- idLock.readLock().unlock();
- }
- }
-
- @Sessional
- @Override
- public Account findByEmail(String email) {
- idLock.readLock().lock();
- try {
- Long id = emailToId.get(email);
- if (id != null)
- return load(id);
- else
- return null;
- } finally {
- idLock.readLock().unlock();
- }
- }
-
- @Sessional
- @Override
- public Account find(PersonIdent person) {
- idLock.readLock().lock();
- try {
- Long id = emailToId.get(person.getEmailAddress());
- if (id != null)
- return load(id);
- else
- return null;
- } finally {
- idLock.readLock().unlock();
- }
- }
-
- @Override
- public Account getCurrent() {
- Long userId = Account.getCurrentId();
- if (userId != 0L) {
- Account user = get(userId);
- if (user != null)
- return user;
- }
- return null;
- }
-
- @Sessional
- @Listen
- public void on(SystemStarting event) {
- for (Account user: findAll()) {
- if (user.getEmail() != null)
- emailToId.inverse().put(user.getId(), user.getEmail());
- nameToId.inverse().put(user.getId(), user.getName());
- }
- }
-
- @Sessional
- @Override
- public List<Account> findAllUsers() {
- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);
- criteria.add(Restrictions.eq("organization", false));
- return findRange(criteria, 0, 0);
- }
-
- @Sessional
- @Override
- public List<Account> findAllOrganizations() {
- EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);
- criteria.add(Restrictions.eq("organization", true));
- return findRange(criteria, 0, 0);
- }
-
- @Transactional
- @Listen
- public void on(PullRequestStatusChangeEvent event) {
- if (event.getStatusChange().getType() == PullRequestStatusChange.Type.APPROVED
- || event.getStatusChange().getType() == PullRequestStatusChange.Type.DISAPPROVED) {
- Account user = event.getStatusChange().getUser();
- user.setReviewEffort(user.getReviewEffort()+1);
- save(user);
- }
- }
-
+package com.gitplex.core.manager.impl;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jgit.lib.PersonIdent;
+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;
+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;
+
+@Singleton
+public class DefaultAccountManager extends AbstractEntityManager<Account> implements AccountManager {
+
+ private final DepotManager depotManager;
+
+ private final PullRequestManager pullRequestManager;
+
+ private final ReadWriteLock idLock = new ReentrantReadWriteLock();
+
+ private final BiMap<String, Long> emailToId = HashBiMap.create();
+
+ private final BiMap<String, Long> nameToId = HashBiMap.create();
+
+ @Inject
+ public DefaultAccountManager(Dao dao, DepotManager depotManager, PullRequestManager pullRequestManager) {
+ super(dao);
+
+ this.depotManager = depotManager;
+ this.pullRequestManager = pullRequestManager;
+ }
+
+ @Transactional
+ @Override
+ public void save(Account account, String oldName) {
+ if (account.isAdministrator()) {
+ getSession().replicate(account, ReplicationMode.OVERWRITE);
+ } else {
+ dao.persist(account);
+ }
+
+ if (oldName != null && !oldName.equals(account.getName())) {
+ for (Depot depot: dao.findAll(Depot.class)) {
+ for (IntegrationPolicy integrationPolicy: depot.getIntegrationPolicies()) {
+ integrationPolicy.onAccountRename(oldName, account.getName());
+ }
+ depot.getGateKeeper().onAccountRename(oldName, account.getName());
+ }
+ }
+
+ doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ idLock.writeLock().lock();
+ try {
+ nameToId.inverse().put(account.getId(), account.getName());
+ if (account.getEmail() != null)
+ emailToId.inverse().put(account.getId(), account.getEmail());
+ } finally {
+ idLock.writeLock().unlock();
+ }
+ }
+
+ });
+ }
+
+ @Sessional
+ @Override
+ public Account getRoot() {
+ return load(Account.ADMINISTRATOR_ID);
+ }
+
+ @Transactional
+ @Override
+ public void delete(Account account) {
+ Query query = getSession().createQuery("update PullRequest set lastEvent.user=null where lastEvent.user=:lastEventUser");
+ query.setParameter("lastEventUser", account);
+ query.executeUpdate();
+
+ query = getSession().createQuery("from PullRequest where assignee=:assignee");
+ query.setParameter("assignee", account);
+
+ for (Object each: query.list()) {
+ PullRequest request = (PullRequest) each;
+ request.setAssignee(request.getTargetDepot().getAccount());
+ pullRequestManager.save(request);
+ }
+
+ query = getSession().createQuery("update PullRequest set closeInfo.closedBy=null where closeInfo.closedBy=:closedBy");
+ query.setParameter("closedBy", account);
+ query.executeUpdate();
+
+ query = getSession().createQuery("from PullRequest where submitter=:submitter");
+ query.setParameter("submitter", account);
+
+ for (Object each: query.list()) {
+ PullRequest request = (PullRequest) each;
+ pullRequestManager.delete(request);
+ }
+
+ query = getSession().createQuery("update CodeComment set lastEvent.user=null where lastEvent.user=:user");
+ query.setParameter("user", account);
+ query.executeUpdate();
+
+ for (Depot depot: account.getDepots())
+ depotManager.delete(depot);
+
+ dao.remove(account);
+
+ for (Depot depot: dao.findAll(Depot.class)) {
+ for (Iterator<IntegrationPolicy> it = depot.getIntegrationPolicies().iterator(); it.hasNext();) {
+ if (it.next().onAccountDelete(account.getName()))
+ it.remove();
+ }
+ depot.getGateKeeper().onAccountDelete(account.getName());
+ }
+
+ doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ idLock.writeLock().lock();
+ try {
+ emailToId.inverse().remove(account.getId());
+ nameToId.inverse().remove(account.getId());
+ } finally {
+ idLock.writeLock().unlock();
+ }
+ }
+
+ });
+ }
+
+ @Sessional
+ @Override
+ public Account findByName(String userName) {
+ idLock.readLock().lock();
+ try {
+ Long id = nameToId.get(userName);
+ if (id != null)
+ return load(id);
+ else
+ return null;
+ } finally {
+ idLock.readLock().unlock();
+ }
+ }
+
+ @Sessional
+ @Override
+ public Account findByEmail(String email) {
+ idLock.readLock().lock();
+ try {
+ Long id = emailToId.get(email);
+ if (id != null)
+ return load(id);
+ else
+ return null;
+ } finally {
+ idLock.readLock().unlock();
+ }
+ }
+
+ @Sessional
+ @Override
+ public Account find(PersonIdent person) {
+ idLock.readLock().lock();
+ try {
+ Long id = emailToId.get(person.getEmailAddress());
+ if (id != null)
+ return load(id);
+ else
+ return null;
+ } finally {
+ idLock.readLock().unlock();
+ }
+ }
+
+ @Override
+ public Account getCurrent() {
+ Long userId = Account.getCurrentId();
+ if (userId != 0L) {
+ Account user = get(userId);
+ if (user != null)
+ return user;
+ }
+ return null;
+ }
+
+ @Sessional
+ @Listen
+ public void on(SystemStarting event) {
+ for (Account user: findAll()) {
+ if (user.getEmail() != null)
+ emailToId.inverse().put(user.getId(), user.getEmail());
+ nameToId.inverse().put(user.getId(), user.getName());
+ }
+ }
+
+ @Sessional
+ @Override
+ public List<Account> findAllUsers() {
+ EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);
+ criteria.add(Restrictions.eq("organization", false));
+ return findRange(criteria, 0, 0);
+ }
+
+ @Sessional
+ @Override
+ public List<Account> findAllOrganizations() {
+ EntityCriteria<Account> criteria = EntityCriteria.of(Account.class);
+ criteria.add(Restrictions.eq("organization", true));
+ return findRange(criteria, 0, 0);
+ }
+
+ @Transactional
+ @Listen
+ public void on(PullRequestStatusChangeEvent event) {
+ if (event.getStatusChange().getType() == PullRequestStatusChange.Type.APPROVED
+ || event.getStatusChange().getType() == PullRequestStatusChange.Type.DISAPPROVED) {
+ Account user = event.getStatusChange().getUser();
+ user.setReviewEffort(user.getReviewEffort()+1);
+ save(user);
+ }
+ }
+
}
\ No newline at end of file
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultAttachmentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAttachmentManager.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultAttachmentManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAttachmentManager.java
index db2b82ebd1..9e299d100f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultAttachmentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultAttachmentManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -11,21 +11,21 @@ import org.quartz.ScheduleBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityPersisted;
-import com.pmease.commons.hibernate.dao.EntityRemoved;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.schedule.SchedulableTask;
-import com.pmease.commons.schedule.TaskScheduler;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.AttachmentManager;
-import com.pmease.gitplex.core.manager.StorageManager;
+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;
+import com.gitplex.commons.hibernate.dao.EntityRemoved;
+import com.gitplex.commons.loader.Listen;
+import com.gitplex.commons.schedule.SchedulableTask;
+import com.gitplex.commons.schedule.TaskScheduler;
+import com.gitplex.commons.util.FileUtils;
@Singleton
public class DefaultAttachmentManager implements AttachmentManager, SchedulableTask {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultBatchWorkManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBatchWorkManager.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultBatchWorkManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBatchWorkManager.java
index 9799d19919..cda89f9a20 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultBatchWorkManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBatchWorkManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.loader.Listen;
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.commons.util.concurrent.PrioritizedRunnable;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.WorkExecutor;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
+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;
@Singleton
public class DefaultBatchWorkManager implements BatchWorkManager, Runnable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultBranchWatchManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBranchWatchManager.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultBranchWatchManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBranchWatchManager.java
index 5eb2856bc6..f569a4e0b4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultBranchWatchManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultBranchWatchManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Collection;
@@ -7,14 +7,14 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.BranchWatch;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.BranchWatchManager;
+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;
@Singleton
public class DefaultBranchWatchManager extends AbstractEntityManager<BranchWatch> implements BranchWatchManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java
similarity index 90%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java
index 56fd42031e..afebd7f8da 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentInfoManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentCreated;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.CodeCommentInfoManager;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
+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 jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java
similarity index 79%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java
index 23a996b06e..86cf762ec5 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.ArrayList;
import java.util.Collection;
@@ -15,35 +15,35 @@ 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.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.markdown.MarkdownManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentRelation;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentActivityEvent;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentCreated;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentEvent;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentResolved;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentUnresolved;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.CodeCommentStatusChangeManager;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.UrlManager;
-import com.pmease.gitplex.core.util.markdown.MentionParser;
+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.Listen;
+import com.gitplex.commons.loader.ListenerRegistry;
+import com.gitplex.commons.markdown.MarkdownManager;
@Singleton
public class DefaultCodeCommentManager extends AbstractEntityManager<CodeComment> implements CodeCommentManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java
index 2898a16b10..3dcb338fab 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentRelationManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentRelation;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentCreated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentCreated;
-import com.pmease.gitplex.core.manager.CodeCommentInfoManager;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.CodeCommentRelationManager;
-import com.pmease.gitplex.core.manager.PullRequestInfoManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
+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;
@Singleton
public class DefaultCodeCommentRelationManager extends AbstractEntityManager<CodeCommentRelation>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java
similarity index 67%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java
index b0b5561ab3..6a1aaf4498 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentReplyManager.java
@@ -1,16 +1,16 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.gitplex.core.entity.CodeCommentReply;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentReplied;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.CodeCommentReplyManager;
+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;
@Singleton
public class DefaultCodeCommentReplyManager extends AbstractEntityManager<CodeCommentReply>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
similarity index 52%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
index 0a1e111d45..6a323f44c4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCodeCommentStatusChangeManager.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.manager.CodeCommentStatusChangeManager;
+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;
@Singleton
public class DefaultCodeCommentStatusChangeManager extends AbstractEntityManager<CodeCommentStatusChange>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCommitInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java
similarity index 95%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCommitInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java
index 97fbebf1c8..792d17cda2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultCommitInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultCommitInfoManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -33,22 +33,22 @@ import org.eclipse.jgit.treewalk.TreeWalk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.NameAndEmail;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
+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;
+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 jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultConfigManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultConfigManager.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultConfigManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultConfigManager.java
index c4276eb1da..32d4a11b54 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultConfigManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultConfigManager.java
@@ -1,24 +1,24 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Config;
-import com.pmease.gitplex.core.entity.Config.Key;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.DataManager;
-import com.pmease.gitplex.core.setting.BackupSetting;
-import com.pmease.gitplex.core.setting.MailSetting;
-import com.pmease.gitplex.core.setting.SecuritySetting;
-import com.pmease.gitplex.core.setting.SystemSetting;
+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;
@Singleton
public class DefaultConfigManager extends AbstractEntityManager<Config> implements ConfigManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultDataManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultDataManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java
index 8c4e9125c5..96ea3dc882 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultDataManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDataManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.io.File;
import java.io.ObjectStreamException;
@@ -15,35 +15,35 @@ 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;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.bootstrap.BootstrapUtils;
-import com.pmease.commons.hibernate.IdManager;
-import com.pmease.commons.hibernate.PersistManager;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ManagedSerializedForm;
-import com.pmease.commons.schedule.SchedulableTask;
-import com.pmease.commons.schedule.TaskScheduler;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.init.ManualConfig;
-import com.pmease.commons.util.init.Skippable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Config;
-import com.pmease.gitplex.core.entity.Config.Key;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarting;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.DataManager;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.core.setting.BackupSetting;
-import com.pmease.gitplex.core.setting.MailSetting;
-import com.pmease.gitplex.core.setting.SecuritySetting;
-import com.pmease.gitplex.core.setting.SystemSetting;
+import com.gitplex.commons.bootstrap.Bootstrap;
+import com.gitplex.commons.bootstrap.BootstrapUtils;
+import com.gitplex.commons.hibernate.IdManager;
+import com.gitplex.commons.hibernate.PersistManager;
+import com.gitplex.commons.hibernate.Sessional;
+import com.gitplex.commons.hibernate.Transactional;
+import com.gitplex.commons.loader.Listen;
+import com.gitplex.commons.loader.ManagedSerializedForm;
+import com.gitplex.commons.schedule.SchedulableTask;
+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;
@Singleton
public class DefaultDataManager implements DataManager, Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultDepotManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultDepotManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java
index 013f25e49c..970dd33431 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultDepotManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultDepotManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -25,42 +25,42 @@ 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;
import com.google.common.collect.HashBiMap;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.command.CloneCommand;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.Pair;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.depot.DepotRenamed;
-import com.pmease.gitplex.core.event.depot.DepotTransferred;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarting;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.CodeCommentInfoManager;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.PullRequestInfoManager;
-import com.pmease.gitplex.core.manager.TeamAuthorizationManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.git.command.CloneCommand;
+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.loader.Listen;
+import com.gitplex.commons.loader.ListenerRegistry;
+import com.gitplex.commons.util.FileUtils;
+import com.gitplex.commons.util.Pair;
+import com.gitplex.commons.util.StringUtils;
@Singleton
public class DefaultDepotManager extends AbstractEntityManager<Depot> implements DepotManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultMailManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java
similarity index 90%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultMailManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java
index 7b9345f14b..306d579a78 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultMailManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultMailManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -16,13 +16,13 @@ import org.hibernate.resource.transaction.spi.TransactionStatus;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.core.setting.MailSetting;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.manager.ConfigManager;
+import com.gitplex.core.manager.MailManager;
+import com.gitplex.core.setting.MailSetting;
+import com.gitplex.commons.bootstrap.Bootstrap;
+import com.gitplex.commons.hibernate.Sessional;
+import com.gitplex.commons.hibernate.dao.Dao;
@Singleton
public class DefaultMailManager implements MailManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java
similarity index 81%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java
index 9ee92d8b5e..eaae6ba955 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultOrganizationMembershipManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Collection;
@@ -7,17 +7,17 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
+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;
@Singleton
public class DefaultOrganizationMembershipManager extends AbstractEntityManager<OrganizationMembership>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java
index 91fba540ff..6b59d3e520 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestCommentManager.java
@@ -1,18 +1,18 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.entity.support.LastEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCommentCreated;
-import com.pmease.gitplex.core.manager.PullRequestCommentManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
+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;
@Singleton
public class DefaultPullRequestCommentManager extends AbstractEntityManager<PullRequestComment>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java
similarity index 89%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java
index a347af25f9..86ef73b603 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestInfoManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.io.File;
import java.io.IOException;
@@ -23,24 +23,24 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityPersisted;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.PullRequestInfoManager;
-import com.pmease.gitplex.core.manager.PullRequestUpdateManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
+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;
+import com.gitplex.commons.hibernate.dao.Dao;
+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 jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestManager.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestManager.java
index 6e3c62c751..5542dd5e79 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestManager.java
@@ -1,779 +1,779 @@
-package com.pmease.gitplex.core.manager.impl;
-
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofOpen;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofSource;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofSourceDepot;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofSubmitter;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofTarget;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofTargetDepot;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.shiro.subject.Subject;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.eclipse.jgit.api.errors.GitAPIException;
-import org.eclipse.jgit.lib.CommitBuilder;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.transport.RefSpec;
-import org.hibernate.Query;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-import org.hibernate.resource.transaction.spi.TransactionStatus;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-import com.google.common.base.Throwables;
-import com.google.common.collect.Lists;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.markdown.MarkdownManager;
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.commons.util.match.PatternMatcher;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange.Type;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.CloseInfo;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.pullrequest.IntegrationPreviewCalculated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestOpened;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestPendingApproval;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestPendingIntegration;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestPendingUpdate;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Failed;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.gatekeeper.checkresult.Pending;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewInvitationManager;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
-import com.pmease.gitplex.core.manager.PullRequestUpdateManager;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.util.ChildAwareMatcher;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchUtils;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
-
-@Singleton
-public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);
-
- private static final int UI_PREVIEW_PRIORITY = 10;
-
- private static final int BACKEND_PREVIEW_PRIORITY = 50;
-
- private static final PatternMatcher BRANCH_MATCHER = new ChildAwareMatcher();
-
- private final PullRequestUpdateManager pullRequestUpdateManager;
-
- private final AccountManager accountManager;
-
- private final UnitOfWork unitOfWork;
-
- private final ListenerRegistry listenerRegistry;
-
- private final PullRequestReviewInvitationManager reviewInvitationManager;
-
- private final BatchWorkManager batchWorkManager;
-
- private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
-
- private final Map<String, AtomicLong> nextNumbers = new HashMap<>();
-
- @Inject
- public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,
- PullRequestReviewInvitationManager reviewInvitationManager, AccountManager accountManager,
- MarkdownManager markdownManager, BatchWorkManager batchWorkManager,
- ListenerRegistry listenerRegistry, UnitOfWork unitOfWork,
- PullRequestStatusChangeManager pullRequestStatusChangeManager) {
- super(dao);
-
- this.pullRequestUpdateManager = pullRequestUpdateManager;
- this.reviewInvitationManager = reviewInvitationManager;
- this.accountManager = accountManager;
- this.batchWorkManager = batchWorkManager;
- this.unitOfWork = unitOfWork;
- this.listenerRegistry = listenerRegistry;
- this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
- }
-
- @Transactional
- @Override
- public void delete(PullRequest request) {
- deleteRefs(request);
- dao.remove(request);
- }
-
- @Sessional
- @Override
- public void deleteRefs(PullRequest request) {
- for (PullRequestUpdate update : request.getUpdates())
- update.deleteRefs();
-
- request.deleteRefs();
- }
-
- @Transactional
- @Override
- public void restoreSourceBranch(PullRequest request, String note) {
- Preconditions.checkState(!request.isOpen() && request.getSourceDepot() != null);
- if (request.getSource().getObjectName(false) == null) {
- RevCommit latestCommit = request.getHeadCommit();
- try {
- request.getSourceDepot().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();
- } catch (Exception e) {
- Throwables.propagate(e);
- }
- request.getSourceDepot().cacheObjectId(request.getSourceBranch(), latestCommit.copy());
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setNote(note);
- statusChange.setRequest(request);
- statusChange.setType(Type.SOURCE_BRANCH_RESTORED);
- statusChange.setUser(accountManager.getCurrent());
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- save(request);
- }
- }
-
- @Transactional
- @Override
- public void deleteSourceBranch(PullRequest request, String note) {
- Preconditions.checkState(!request.isOpen() && request.getSourceDepot() != null);
-
- if (request.getSource().getObjectName(false) != null) {
- request.getSource().delete();
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setNote(note);
- statusChange.setRequest(request);
- statusChange.setType(Type.SOURCE_BRANCH_DELETED);
- statusChange.setUser(accountManager.getCurrent());
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- save(request);
- }
- }
-
- @Transactional
- @Override
- public void reopen(PullRequest request, String note) {
- Account user = accountManager.getCurrent();
- request.setCloseInfo(null);
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setNote(note);
- statusChange.setRequest(request);
- statusChange.setType(Type.REOPENED);
- statusChange.setUser(user);
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- save(request);
- checkAsync(request);
- }
-
- @Transactional
- @Override
- public void discard(PullRequest request, String note) {
- Account user = accountManager.getCurrent();
- Date date = new Date();
-
- CloseInfo closeInfo = new CloseInfo();
- closeInfo.setCloseDate(date);
- closeInfo.setClosedBy(user);
- closeInfo.setCloseStatus(CloseInfo.Status.DISCARDED);
- request.setCloseInfo(closeInfo);
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(date);
- statusChange.setNote(note);
- statusChange.setRequest(request);
- statusChange.setType(Type.DISCARDED);
- statusChange.setUser(user);
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- save(request);
- }
-
- @Transactional
- @Override
- public void integrate(PullRequest request, String note) {
- IntegrationPreview preview = request.getIntegrationPreview();
- if (preview == null)
- throw new IllegalStateException("Integration preview has not been calculated yet.");
-
- String integrated = preview.getIntegrated();
- if (integrated == null)
- throw new IllegalStateException("There are integration conflicts.");
-
- Account user = accountManager.getCurrent();
-
- ObjectId integratedId = ObjectId.fromString(integrated);
- RevCommit integratedCommit = request.getTargetDepot().getRevCommit(integratedId);
-
- Depot targetDepot = request.getTargetDepot();
- IntegrationStrategy strategy = request.getIntegrationStrategy();
- if ((strategy == MERGE_ALWAYS || strategy == MERGE_IF_NECESSARY || strategy == MERGE_WITH_SQUASH)
- && !preview.getIntegrated().equals(preview.getRequestHead())
- && !integratedCommit.getFullMessage().equals(request.getCommitMessage())) {
- try ( RevWalk revWalk = new RevWalk(targetDepot.getRepository());
- ObjectInserter inserter = targetDepot.getRepository().newObjectInserter()) {
- CommitBuilder newCommit = new CommitBuilder();
- newCommit.setAuthor(integratedCommit.getAuthorIdent());
- newCommit.setCommitter(user.asPerson());
- newCommit.setMessage(request.getCommitMessage());
- newCommit.setTreeId(integratedCommit.getTree());
- newCommit.setParentIds(integratedCommit.getParents());
- integratedId = inserter.insert(newCommit);
- integrated = integratedId.name();
- inserter.flush();
- } catch (Exception e) {
- Throwables.propagate(e);
- }
- preview = new IntegrationPreview(preview.getTargetHead(), preview.getRequestHead(),
- preview.getIntegrationStrategy(), integrated);
- request.setLastIntegrationPreview(preview);
- RefUpdate refUpdate = targetDepot.updateRef(request.getIntegrateRef());
- refUpdate.setNewObjectId(integratedId);
- GitUtils.updateRef(refUpdate);
- }
-
- closeAsIntegrated(request, false, note);
-
- if (strategy == REBASE_SOURCE_ONTO_TARGET || strategy == MERGE_WITH_SQUASH) {
- Depot sourceDepot = request.getSourceDepot();
- if (!sourceDepot.equals(targetDepot)) {
- try {
- sourceDepot.git().fetch()
- .setRemote(targetDepot.getDirectory().getAbsolutePath())
- .setRefSpecs(new RefSpec(request.getIntegrateRef()))
- .call();
- } catch (GitAPIException e) {
- throw new RuntimeException(e);
- }
- }
- RefUpdate refUpdate = sourceDepot.updateRef(request.getSourceRef());
- refUpdate.setNewObjectId(integratedId);
- ObjectId requestHeadId = ObjectId.fromString(preview.getRequestHead());
- refUpdate.setExpectedOldObjectId(requestHeadId);
- refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);
- GitUtils.updateRef(refUpdate);
-
- checkUpdate(request, false);
-
- Long requestId = request.getId();
- ObjectId newSourceHeadId = integratedId;
- Subject subject = SecurityUtils.getSubject();
- doUnitOfWorkAsyncAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- ThreadContext.bind(subject);
- try {
- PullRequest request = load(requestId);
- request.getSourceDepot().cacheObjectId(request.getSourceRef(), newSourceHeadId);
- listenerRegistry.post(new RefUpdated(
- request.getSourceDepot(), request.getSourceRef(), requestHeadId, newSourceHeadId));
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- });
- }
-
- String targetRef = request.getTargetRef();
- ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());
- RefUpdate refUpdate = targetDepot.updateRef(targetRef);
- refUpdate.setRefLogIdent(user.asPerson());
- refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);
- refUpdate.setExpectedOldObjectId(targetHeadId);
- refUpdate.setNewObjectId(integratedId);
- GitUtils.updateRef(refUpdate);
-
- Long requestId = request.getId();
- Subject subject = SecurityUtils.getSubject();
- ObjectId newTargetHeadId = integratedId;
- doUnitOfWorkAsyncAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- ThreadContext.bind(subject);
- try {
- PullRequest request = load(requestId);
- request.getTargetDepot().cacheObjectId(request.getTargetRef(), newTargetHeadId);
- listenerRegistry.post(new RefUpdated(request.getTargetDepot(), targetRef,
- targetHeadId, newTargetHeadId));
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- });
- }
-
- private long getNextNumber(Depot depot) {
- AtomicLong nextNumber;
- synchronized (nextNumbers) {
- nextNumber = nextNumbers.get(depot.getUUID());
- }
- if (nextNumber == null) {
- long maxNumber;
- Query query = getSession().createQuery("select max(number) from PullRequest where targetDepot=:depot");
- query.setParameter("depot", depot);
- Object result = query.uniqueResult();
- if (result != null) {
- maxNumber = (Long)result;
- } else {
- maxNumber = 0;
- }
-
- /*
- * do not put the whole method in synchronized block to avoid possible deadlocks
- * if there are limited connections.
- */
- synchronized (nextNumbers) {
- nextNumber = nextNumbers.get(depot.getUUID());
- if (nextNumber == null) {
- nextNumber = new AtomicLong(maxNumber+1);
- nextNumbers.put(depot.getUUID(), nextNumber);
- }
- }
- }
- return nextNumber.getAndIncrement();
- }
-
- @Transactional
- @Override
- public void open(PullRequest request) {
- request.setNumber(getNextNumber(request.getTargetDepot()));
- dao.persist(request);
-
- RefUpdate refUpdate = request.getTargetDepot().updateRef(request.getBaseRef());
- refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));
- GitUtils.updateRef(refUpdate);
-
- for (PullRequestUpdate update: request.getUpdates()) {
- pullRequestUpdateManager.save(update, false);
- }
-
- for (PullRequestReviewInvitation invitation: request.getReviewInvitations())
- reviewInvitationManager.save(invitation);
-
- checkAsync(request);
-
- listenerRegistry.post(new PullRequestOpened(request));
- }
-
- @Override
- public List<IntegrationStrategy> getApplicableIntegrationStrategies(PullRequest request) {
- List<IntegrationStrategy> strategies = null;
- for (IntegrationPolicy policy: request.getTargetDepot().getIntegrationPolicies()) {
- if (IncludeExcludeUtils.getIncludeExclude(policy.getTargetBranchMatch()).matches(BRANCH_MATCHER, request.getTargetBranch())
- && FullBranchMatchUtils.matches(policy.getSourceBranchMatch(), request.getTargetDepot(), request.getSource())) {
- strategies = policy.getIntegrationStrategies();
- break;
- }
- }
- if (strategies == null)
- strategies = Lists.newArrayList(IntegrationStrategy.MERGE_ALWAYS);
- return strategies;
- }
-
- @Transactional
- @Override
- public void changeAssignee(PullRequest request) {
- if (request.isOpen()) {
- String note = request.getAssignee().getDisplayName() + " is expected to integrate the pull request";
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setNote(note);
- statusChange.setRequest(request);
- statusChange.setType(Type.ASSIGNED);
- statusChange.setUser(accountManager.getCurrent());
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- }
- save(request);
- }
-
- private void closeAsIntegrated(PullRequest request, boolean dueToMerged, String note) {
- Account user = accountManager.getCurrent();
- Date date = new Date();
-
- if (dueToMerged)
- request.setLastIntegrationPreview(null);
-
- CloseInfo closeInfo = new CloseInfo();
- closeInfo.setCloseDate(date);
- closeInfo.setClosedBy(user);
- closeInfo.setCloseStatus(CloseInfo.Status.INTEGRATED);
- request.setCloseInfo(closeInfo);
-
- if (dueToMerged)
- note = "Source branch is already merged to target branch by some one";
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(date);
- statusChange.setNote(note);
- statusChange.setRequest(request);
- statusChange.setType(Type.INTEGRATED);
- statusChange.setUser(user);
- pullRequestStatusChangeManager.save(statusChange);
- request.setLastEvent(statusChange);
-
- save(request);
- }
-
- private void checkUpdate(PullRequest request, boolean independent) {
- if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {
- PullRequestUpdate update = new PullRequestUpdate();
- update.setRequest(request);
- update.setHeadCommitHash(request.getSource().getObjectName());
- ObjectId mergeBase = GitUtils.getMergeBase(
- request.getTargetDepot().getRepository(), request.getTarget().getObjectId(),
- request.getSourceDepot().getRepository(), request.getSource().getObjectId(),
- GitUtils.branch2ref(request.getSourceBranch()));
- update.setMergeCommitHash(mergeBase.name());
- request.addUpdate(update);
- pullRequestUpdateManager.save(update, independent);
- }
- }
-
- @Transactional
- @Override
- public void check(PullRequest request) {
- if (request.isOpen()) {
- if (request.getSourceDepot() == null) {
- discard(request, "Source repository no longer exists");
- } else if (request.getSource().getObjectId(false) == null) {
- discard(request, "Source branch no longer exists");
- } else if (request.getTarget().getObjectId(false) == null) {
- discard(request, "Target branch no longer exists");
- } else {
- checkUpdate(request, true);
- if (request.isMerged()) {
- closeAsIntegrated(request, true, null);
- } else {
- IntegrationPreview integrationPreview = request.getIntegrationPreview();
- Date timeBeforeCheck = new Date();
- GateCheckResult result = request.checkGates(false);
- if (result instanceof Pending) {
- for (PullRequestReviewInvitation invitation: request.getReviewInvitations()) {
- if (invitation.getDate().getTime()>=timeBeforeCheck.getTime())
- reviewInvitationManager.save(invitation);
- }
- listenerRegistry.post(new PullRequestPendingApproval(request));
- } else if (result instanceof Failed) {
- listenerRegistry.post(new PullRequestPendingUpdate(request));
- } else if (integrationPreview != null
- && integrationPreview.getIntegrated() != null
- && request.getAssignee() == null) {
- integrate(request, "Integrated automatically by GitPlex");
- } else {
- listenerRegistry.post(new PullRequestPendingIntegration(request));
- }
- }
- }
- }
- }
-
- @Override
- public IntegrationPreview previewIntegration(PullRequest request) {
- IntegrationPreview preview = request.getLastIntegrationPreview();
- if (request.isOpen() && !request.isMerged() && (preview == null || preview.isObsolete(request))) {
- int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;
- if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- doAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- batchWorkManager.submit(getIntegrationPreviewer(request), new Prioritized(priority));
- }
-
- });
- } else {
- batchWorkManager.submit(getIntegrationPreviewer(request), new Prioritized(priority));
- }
- return null;
- } else {
- return preview;
- }
- }
-
- private BatchWorker getIntegrationPreviewer(PullRequest request) {
- Long requestId = request.getId();
- return new BatchWorker("request-" + requestId + "-previewIntegration", 1) {
-
- @Override
- public void doWork(Collection<Prioritized> works) {
- Preconditions.checkState(works.size() == 1);
- unitOfWork.call(new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- PullRequest request = load(requestId);
- try {
- IntegrationPreview preview = request.getLastIntegrationPreview();
- if (request.isOpen() && !request.isMerged() && (preview == null || preview.isObsolete(request))) {
- logger.info("Calculating integration preview of pull request #{} in repository '{}'...",
- request.getNumber(), request.getTargetDepot());
- String requestHead = request.getHeadCommitHash();
- String targetHead = request.getTarget().getObjectName();
- Depot targetDepot = request.getTargetDepot();
- preview = new IntegrationPreview(targetHead, requestHead, request.getIntegrationStrategy(), null);
- request.setLastIntegrationPreview(preview);
- String integrateRef = request.getIntegrateRef();
- ObjectId requestHeadId = ObjectId.fromString(requestHead);
- ObjectId targetHeadId = ObjectId.fromString(targetHead);
- if (preview.getIntegrationStrategy() == MERGE_IF_NECESSARY
- && GitUtils.isMergedInto(targetDepot.getRepository(), targetHeadId, requestHeadId)) {
- preview.setIntegrated(requestHead);
- RefUpdate refUpdate = targetDepot.updateRef(integrateRef);
- refUpdate.setNewObjectId(ObjectId.fromString(requestHead));
- GitUtils.updateRef(refUpdate);
- } else {
- PersonIdent user = accountManager.getRoot().asPerson();
- ObjectId integrated;
- if (preview.getIntegrationStrategy() == REBASE_TARGET_ONTO_SOURCE) {
- integrated = GitUtils.rebase(targetDepot.getRepository(), targetHeadId, requestHeadId, user);
- } else if (preview.getIntegrationStrategy() == REBASE_SOURCE_ONTO_TARGET) {
- integrated = GitUtils.rebase(targetDepot.getRepository(), requestHeadId, targetHeadId, user);
- } else if (preview.getIntegrationStrategy() == MERGE_WITH_SQUASH) {
- integrated = GitUtils.merge(targetDepot.getRepository(),
- requestHeadId, targetHeadId, true, user, request.getCommitMessage());
- } else {
- integrated = GitUtils.merge(targetDepot.getRepository(),
- requestHeadId, targetHeadId, false, user, request.getCommitMessage());
- }
-
- if (integrated != null) {
- preview.setIntegrated(integrated.name());
- RefUpdate refUpdate = targetDepot.updateRef(integrateRef);
- refUpdate.setNewObjectId(integrated);
- GitUtils.updateRef(refUpdate);
- } else {
- RefUpdate refUpdate = targetDepot.updateRef(integrateRef);
- GitUtils.deleteRef(refUpdate);
- }
- }
- dao.persist(request);
-
- listenerRegistry.post(new IntegrationPreviewCalculated(request));
- logger.info("Integration preview of pull request #{} in repository '{}' is calculated.",
- request.getNumber(), request.getTargetDepot());
- }
- } catch (Exception e) {
- logger.error("Error calculating pull request integration preview", e);
- }
- return null;
- }
-
- });
- }
-
- };
- }
-
- @Transactional
- @Listen
- public void on(DepotDeleted event) {
- for (PullRequest request: event.getDepot().getOutgoingRequests()) {
- if (!request.getTargetDepot().equals(event.getDepot()) && request.isOpen())
- discard(request, "Source repository is deleted.");
- }
-
- Query query = getSession().createQuery("update PullRequest set sourceDepot=null where "
- + "sourceDepot=:depot");
- query.setParameter("depot", event.getDepot());
- query.executeUpdate();
- }
-
- @Transactional
- @Listen
- public void on(RefUpdated event) {
- String branch = GitUtils.ref2branch(event.getRefName());
- if (branch != null) {
- DepotAndBranch depotAndBranch = new DepotAndBranch(event.getDepot(), branch);
- Criterion criterion = Restrictions.and(
- ofOpen(),
- Restrictions.or(ofSource(depotAndBranch), ofTarget(depotAndBranch)));
- for (PullRequest request: findAll(EntityCriteria.of(PullRequest.class).add(criterion))) {
- check(request);
- }
- }
- }
-
- @Sessional
- @Override
- public PullRequest findOpen(DepotAndBranch target, DepotAndBranch source) {
- return find(EntityCriteria.of(PullRequest.class)
- .add(ofTarget(target)).add(ofSource(source)).add(ofOpen()));
- }
-
- @Sessional
- @Override
- public PullRequest findLatest(Depot depot, Account submitter) {
- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
- criteria.add(ofOpen());
- criteria.add(Restrictions.or(ofSourceDepot(depot), ofTargetDepot(depot)));
- criteria.add(ofSubmitter(submitter));
- criteria.addOrder(Order.desc("id"));
- return find(criteria);
- }
-
- @Sessional
- @Override
- public Collection<PullRequest> findAllOpenTo(DepotAndBranch target, @Nullable Depot sourceDepot) {
- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
- criteria.add(ofTarget(target));
-
- if (sourceDepot != null)
- criteria.add(Restrictions.eq("sourceDepot", sourceDepot));
- criteria.add(ofOpen());
- return findAll(criteria);
- }
-
- @Sessional
- @Override
- public Collection<PullRequest> findAllOpenFrom(DepotAndBranch source, @Nullable Depot targetDepot) {
- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
- criteria.add(ofSource(source));
-
- if (targetDepot != null)
- criteria.add(Restrictions.eq("targetDepot", targetDepot));
- criteria.add(ofOpen());
- return findAll(criteria);
- }
-
- @Sessional
- @Override
- public Collection<PullRequest> findAllOpen(DepotAndBranch sourceOrTarget) {
- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
- criteria.add(ofOpen());
- criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));
- return findAll(criteria);
- }
-
- @Sessional
- @Override
- public int countOpen(Depot depot) {
- EntityCriteria<PullRequest> criteria = newCriteria();
- criteria.add(PullRequest.CriterionHelper.ofOpen());
- criteria.add(PullRequest.CriterionHelper.ofTargetDepot(depot));
- return count(criteria);
- }
-
- @Sessional
- @Override
- public PullRequest find(Depot target, long number) {
- EntityCriteria<PullRequest> criteria = newCriteria();
- criteria.add(Restrictions.eq("targetDepot", target));
- criteria.add(Restrictions.eq("number", number));
- return find(criteria);
- }
-
- @Sessional
- @Override
- public PullRequest find(String uuid) {
- EntityCriteria<PullRequest> criteria = newCriteria();
- criteria.add(Restrictions.eq("uuid", uuid));
- return find(criteria);
- }
-
- @Listen
- public void on(PullRequestStatusChangeEvent event) {
- Type type = event.getStatusChange().getType();
- if (type == Type.APPROVED || type == Type.DISAPPROVED || type == Type.REVIEW_DELETED
- || type == Type.VERIFICATION_DELETED || type == Type.VERIFICATION_SUCCEEDED
- || type == Type.VERIFICATION_FAILED) {
- checkAsync(event.getRequest());
- }
- }
-
- @Listen
- public void on(IntegrationPreviewCalculated event) {
- checkAsync(event.getRequest());
- }
-
- private Runnable newCheckRunnable(Long requestId, Subject subject) {
- return new Runnable() {
-
- @Override
- public void run() {
- try {
- ThreadContext.bind(subject);
- check(load(requestId));
- } catch (Exception e) {
- logger.error("Error checking pull request", e);
- } finally {
- ThreadContext.unbindSubject();
- }
- }
-
- };
- }
-
- @Sessional
- protected void checkAsync(PullRequest request) {
- Long requestId = request.getId();
- Subject subject = SecurityUtils.getSubject();
- if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
- doUnitOfWorkAsyncAfterCommit(newCheckRunnable(requestId, subject));
- } else {
- unitOfWork.doAsync(newCheckRunnable(requestId, subject));
- }
- }
-
-}
+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;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicLong;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.shiro.subject.Subject;
+import org.apache.shiro.util.ThreadContext;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.eclipse.jgit.api.errors.GitAPIException;
+import org.eclipse.jgit.lib.CommitBuilder;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.transport.RefSpec;
+import org.hibernate.Query;
+import org.hibernate.criterion.Criterion;
+import org.hibernate.criterion.Order;
+import org.hibernate.criterion.Restrictions;
+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;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.hibernate.Sessional;
+import com.gitplex.commons.hibernate.Transactional;
+import com.gitplex.commons.hibernate.UnitOfWork;
+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.loader.ListenerRegistry;
+import com.gitplex.commons.markdown.MarkdownManager;
+import com.gitplex.commons.util.concurrent.Prioritized;
+import com.gitplex.commons.util.match.PatternMatcher;
+
+@Singleton
+public class DefaultPullRequestManager extends AbstractEntityManager<PullRequest> implements PullRequestManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultPullRequestManager.class);
+
+ private static final int UI_PREVIEW_PRIORITY = 10;
+
+ private static final int BACKEND_PREVIEW_PRIORITY = 50;
+
+ private static final PatternMatcher BRANCH_MATCHER = new ChildAwareMatcher();
+
+ private final PullRequestUpdateManager pullRequestUpdateManager;
+
+ private final AccountManager accountManager;
+
+ private final UnitOfWork unitOfWork;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final PullRequestReviewInvitationManager reviewInvitationManager;
+
+ private final BatchWorkManager batchWorkManager;
+
+ private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
+
+ private final Map<String, AtomicLong> nextNumbers = new HashMap<>();
+
+ @Inject
+ public DefaultPullRequestManager(Dao dao, PullRequestUpdateManager pullRequestUpdateManager,
+ PullRequestReviewInvitationManager reviewInvitationManager, AccountManager accountManager,
+ MarkdownManager markdownManager, BatchWorkManager batchWorkManager,
+ ListenerRegistry listenerRegistry, UnitOfWork unitOfWork,
+ PullRequestStatusChangeManager pullRequestStatusChangeManager) {
+ super(dao);
+
+ this.pullRequestUpdateManager = pullRequestUpdateManager;
+ this.reviewInvitationManager = reviewInvitationManager;
+ this.accountManager = accountManager;
+ this.batchWorkManager = batchWorkManager;
+ this.unitOfWork = unitOfWork;
+ this.listenerRegistry = listenerRegistry;
+ this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
+ }
+
+ @Transactional
+ @Override
+ public void delete(PullRequest request) {
+ deleteRefs(request);
+ dao.remove(request);
+ }
+
+ @Sessional
+ @Override
+ public void deleteRefs(PullRequest request) {
+ for (PullRequestUpdate update : request.getUpdates())
+ update.deleteRefs();
+
+ request.deleteRefs();
+ }
+
+ @Transactional
+ @Override
+ public void restoreSourceBranch(PullRequest request, String note) {
+ Preconditions.checkState(!request.isOpen() && request.getSourceDepot() != null);
+ if (request.getSource().getObjectName(false) == null) {
+ RevCommit latestCommit = request.getHeadCommit();
+ try {
+ request.getSourceDepot().git().branchCreate().setName(request.getSourceBranch()).setStartPoint(latestCommit).call();
+ } catch (Exception e) {
+ Throwables.propagate(e);
+ }
+ request.getSourceDepot().cacheObjectId(request.getSourceBranch(), latestCommit.copy());
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ statusChange.setType(Type.SOURCE_BRANCH_RESTORED);
+ statusChange.setUser(accountManager.getCurrent());
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ save(request);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void deleteSourceBranch(PullRequest request, String note) {
+ Preconditions.checkState(!request.isOpen() && request.getSourceDepot() != null);
+
+ if (request.getSource().getObjectName(false) != null) {
+ request.getSource().delete();
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ statusChange.setType(Type.SOURCE_BRANCH_DELETED);
+ statusChange.setUser(accountManager.getCurrent());
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ save(request);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void reopen(PullRequest request, String note) {
+ Account user = accountManager.getCurrent();
+ request.setCloseInfo(null);
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ statusChange.setType(Type.REOPENED);
+ statusChange.setUser(user);
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ save(request);
+ checkAsync(request);
+ }
+
+ @Transactional
+ @Override
+ public void discard(PullRequest request, String note) {
+ Account user = accountManager.getCurrent();
+ Date date = new Date();
+
+ CloseInfo closeInfo = new CloseInfo();
+ closeInfo.setCloseDate(date);
+ closeInfo.setClosedBy(user);
+ closeInfo.setCloseStatus(CloseInfo.Status.DISCARDED);
+ request.setCloseInfo(closeInfo);
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(date);
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ statusChange.setType(Type.DISCARDED);
+ statusChange.setUser(user);
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ save(request);
+ }
+
+ @Transactional
+ @Override
+ public void integrate(PullRequest request, String note) {
+ IntegrationPreview preview = request.getIntegrationPreview();
+ if (preview == null)
+ throw new IllegalStateException("Integration preview has not been calculated yet.");
+
+ String integrated = preview.getIntegrated();
+ if (integrated == null)
+ throw new IllegalStateException("There are integration conflicts.");
+
+ Account user = accountManager.getCurrent();
+
+ ObjectId integratedId = ObjectId.fromString(integrated);
+ RevCommit integratedCommit = request.getTargetDepot().getRevCommit(integratedId);
+
+ Depot targetDepot = request.getTargetDepot();
+ IntegrationStrategy strategy = request.getIntegrationStrategy();
+ if ((strategy == MERGE_ALWAYS || strategy == MERGE_IF_NECESSARY || strategy == MERGE_WITH_SQUASH)
+ && !preview.getIntegrated().equals(preview.getRequestHead())
+ && !integratedCommit.getFullMessage().equals(request.getCommitMessage())) {
+ try ( RevWalk revWalk = new RevWalk(targetDepot.getRepository());
+ ObjectInserter inserter = targetDepot.getRepository().newObjectInserter()) {
+ CommitBuilder newCommit = new CommitBuilder();
+ newCommit.setAuthor(integratedCommit.getAuthorIdent());
+ newCommit.setCommitter(user.asPerson());
+ newCommit.setMessage(request.getCommitMessage());
+ newCommit.setTreeId(integratedCommit.getTree());
+ newCommit.setParentIds(integratedCommit.getParents());
+ integratedId = inserter.insert(newCommit);
+ integrated = integratedId.name();
+ inserter.flush();
+ } catch (Exception e) {
+ Throwables.propagate(e);
+ }
+ preview = new IntegrationPreview(preview.getTargetHead(), preview.getRequestHead(),
+ preview.getIntegrationStrategy(), integrated);
+ request.setLastIntegrationPreview(preview);
+ RefUpdate refUpdate = targetDepot.updateRef(request.getIntegrateRef());
+ refUpdate.setNewObjectId(integratedId);
+ GitUtils.updateRef(refUpdate);
+ }
+
+ closeAsIntegrated(request, false, note);
+
+ if (strategy == REBASE_SOURCE_ONTO_TARGET || strategy == MERGE_WITH_SQUASH) {
+ Depot sourceDepot = request.getSourceDepot();
+ if (!sourceDepot.equals(targetDepot)) {
+ try {
+ sourceDepot.git().fetch()
+ .setRemote(targetDepot.getDirectory().getAbsolutePath())
+ .setRefSpecs(new RefSpec(request.getIntegrateRef()))
+ .call();
+ } catch (GitAPIException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ RefUpdate refUpdate = sourceDepot.updateRef(request.getSourceRef());
+ refUpdate.setNewObjectId(integratedId);
+ ObjectId requestHeadId = ObjectId.fromString(preview.getRequestHead());
+ refUpdate.setExpectedOldObjectId(requestHeadId);
+ refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);
+ GitUtils.updateRef(refUpdate);
+
+ checkUpdate(request, false);
+
+ Long requestId = request.getId();
+ ObjectId newSourceHeadId = integratedId;
+ Subject subject = SecurityUtils.getSubject();
+ doUnitOfWorkAsyncAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ ThreadContext.bind(subject);
+ try {
+ PullRequest request = load(requestId);
+ request.getSourceDepot().cacheObjectId(request.getSourceRef(), newSourceHeadId);
+ listenerRegistry.post(new RefUpdated(
+ request.getSourceDepot(), request.getSourceRef(), requestHeadId, newSourceHeadId));
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
+ }
+
+ String targetRef = request.getTargetRef();
+ ObjectId targetHeadId = ObjectId.fromString(preview.getTargetHead());
+ RefUpdate refUpdate = targetDepot.updateRef(targetRef);
+ refUpdate.setRefLogIdent(user.asPerson());
+ refUpdate.setRefLogMessage("Pull request #" + request.getNumber(), true);
+ refUpdate.setExpectedOldObjectId(targetHeadId);
+ refUpdate.setNewObjectId(integratedId);
+ GitUtils.updateRef(refUpdate);
+
+ Long requestId = request.getId();
+ Subject subject = SecurityUtils.getSubject();
+ ObjectId newTargetHeadId = integratedId;
+ doUnitOfWorkAsyncAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ ThreadContext.bind(subject);
+ try {
+ PullRequest request = load(requestId);
+ request.getTargetDepot().cacheObjectId(request.getTargetRef(), newTargetHeadId);
+ listenerRegistry.post(new RefUpdated(request.getTargetDepot(), targetRef,
+ targetHeadId, newTargetHeadId));
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ });
+ }
+
+ private long getNextNumber(Depot depot) {
+ AtomicLong nextNumber;
+ synchronized (nextNumbers) {
+ nextNumber = nextNumbers.get(depot.getUUID());
+ }
+ if (nextNumber == null) {
+ long maxNumber;
+ Query query = getSession().createQuery("select max(number) from PullRequest where targetDepot=:depot");
+ query.setParameter("depot", depot);
+ Object result = query.uniqueResult();
+ if (result != null) {
+ maxNumber = (Long)result;
+ } else {
+ maxNumber = 0;
+ }
+
+ /*
+ * do not put the whole method in synchronized block to avoid possible deadlocks
+ * if there are limited connections.
+ */
+ synchronized (nextNumbers) {
+ nextNumber = nextNumbers.get(depot.getUUID());
+ if (nextNumber == null) {
+ nextNumber = new AtomicLong(maxNumber+1);
+ nextNumbers.put(depot.getUUID(), nextNumber);
+ }
+ }
+ }
+ return nextNumber.getAndIncrement();
+ }
+
+ @Transactional
+ @Override
+ public void open(PullRequest request) {
+ request.setNumber(getNextNumber(request.getTargetDepot()));
+ dao.persist(request);
+
+ RefUpdate refUpdate = request.getTargetDepot().updateRef(request.getBaseRef());
+ refUpdate.setNewObjectId(ObjectId.fromString(request.getBaseCommitHash()));
+ GitUtils.updateRef(refUpdate);
+
+ for (PullRequestUpdate update: request.getUpdates()) {
+ pullRequestUpdateManager.save(update, false);
+ }
+
+ for (PullRequestReviewInvitation invitation: request.getReviewInvitations())
+ reviewInvitationManager.save(invitation);
+
+ checkAsync(request);
+
+ listenerRegistry.post(new PullRequestOpened(request));
+ }
+
+ @Override
+ public List<IntegrationStrategy> getApplicableIntegrationStrategies(PullRequest request) {
+ List<IntegrationStrategy> strategies = null;
+ for (IntegrationPolicy policy: request.getTargetDepot().getIntegrationPolicies()) {
+ if (IncludeExcludeUtils.getIncludeExclude(policy.getTargetBranchMatch()).matches(BRANCH_MATCHER, request.getTargetBranch())
+ && FullBranchMatchUtils.matches(policy.getSourceBranchMatch(), request.getTargetDepot(), request.getSource())) {
+ strategies = policy.getIntegrationStrategies();
+ break;
+ }
+ }
+ if (strategies == null)
+ strategies = Lists.newArrayList(IntegrationStrategy.MERGE_ALWAYS);
+ return strategies;
+ }
+
+ @Transactional
+ @Override
+ public void changeAssignee(PullRequest request) {
+ if (request.isOpen()) {
+ String note = request.getAssignee().getDisplayName() + " is expected to integrate the pull request";
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ statusChange.setType(Type.ASSIGNED);
+ statusChange.setUser(accountManager.getCurrent());
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ }
+ save(request);
+ }
+
+ private void closeAsIntegrated(PullRequest request, boolean dueToMerged, String note) {
+ Account user = accountManager.getCurrent();
+ Date date = new Date();
+
+ if (dueToMerged)
+ request.setLastIntegrationPreview(null);
+
+ CloseInfo closeInfo = new CloseInfo();
+ closeInfo.setCloseDate(date);
+ closeInfo.setClosedBy(user);
+ closeInfo.setCloseStatus(CloseInfo.Status.INTEGRATED);
+ request.setCloseInfo(closeInfo);
+
+ if (dueToMerged)
+ note = "Source branch is already merged to target branch by some one";
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(date);
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ statusChange.setType(Type.INTEGRATED);
+ statusChange.setUser(user);
+ pullRequestStatusChangeManager.save(statusChange);
+ request.setLastEvent(statusChange);
+
+ save(request);
+ }
+
+ private void checkUpdate(PullRequest request, boolean independent) {
+ if (!request.getHeadCommitHash().equals(request.getSource().getObjectName())) {
+ PullRequestUpdate update = new PullRequestUpdate();
+ update.setRequest(request);
+ update.setHeadCommitHash(request.getSource().getObjectName());
+ ObjectId mergeBase = GitUtils.getMergeBase(
+ request.getTargetDepot().getRepository(), request.getTarget().getObjectId(),
+ request.getSourceDepot().getRepository(), request.getSource().getObjectId(),
+ GitUtils.branch2ref(request.getSourceBranch()));
+ update.setMergeCommitHash(mergeBase.name());
+ request.addUpdate(update);
+ pullRequestUpdateManager.save(update, independent);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void check(PullRequest request) {
+ if (request.isOpen()) {
+ if (request.getSourceDepot() == null) {
+ discard(request, "Source repository no longer exists");
+ } else if (request.getSource().getObjectId(false) == null) {
+ discard(request, "Source branch no longer exists");
+ } else if (request.getTarget().getObjectId(false) == null) {
+ discard(request, "Target branch no longer exists");
+ } else {
+ checkUpdate(request, true);
+ if (request.isMerged()) {
+ closeAsIntegrated(request, true, null);
+ } else {
+ IntegrationPreview integrationPreview = request.getIntegrationPreview();
+ Date timeBeforeCheck = new Date();
+ GateCheckResult result = request.checkGates(false);
+ if (result instanceof Pending) {
+ for (PullRequestReviewInvitation invitation: request.getReviewInvitations()) {
+ if (invitation.getDate().getTime()>=timeBeforeCheck.getTime())
+ reviewInvitationManager.save(invitation);
+ }
+ listenerRegistry.post(new PullRequestPendingApproval(request));
+ } else if (result instanceof Failed) {
+ listenerRegistry.post(new PullRequestPendingUpdate(request));
+ } else if (integrationPreview != null
+ && integrationPreview.getIntegrated() != null
+ && request.getAssignee() == null) {
+ integrate(request, "Integrated automatically by GitPlex");
+ } else {
+ listenerRegistry.post(new PullRequestPendingIntegration(request));
+ }
+ }
+ }
+ }
+ }
+
+ @Override
+ public IntegrationPreview previewIntegration(PullRequest request) {
+ IntegrationPreview preview = request.getLastIntegrationPreview();
+ if (request.isOpen() && !request.isMerged() && (preview == null || preview.isObsolete(request))) {
+ int priority = RequestCycle.get() != null?UI_PREVIEW_PRIORITY:BACKEND_PREVIEW_PRIORITY;
+ if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
+ doAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ batchWorkManager.submit(getIntegrationPreviewer(request), new Prioritized(priority));
+ }
+
+ });
+ } else {
+ batchWorkManager.submit(getIntegrationPreviewer(request), new Prioritized(priority));
+ }
+ return null;
+ } else {
+ return preview;
+ }
+ }
+
+ private BatchWorker getIntegrationPreviewer(PullRequest request) {
+ Long requestId = request.getId();
+ return new BatchWorker("request-" + requestId + "-previewIntegration", 1) {
+
+ @Override
+ public void doWork(Collection<Prioritized> works) {
+ Preconditions.checkState(works.size() == 1);
+ unitOfWork.call(new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ PullRequest request = load(requestId);
+ try {
+ IntegrationPreview preview = request.getLastIntegrationPreview();
+ if (request.isOpen() && !request.isMerged() && (preview == null || preview.isObsolete(request))) {
+ logger.info("Calculating integration preview of pull request #{} in repository '{}'...",
+ request.getNumber(), request.getTargetDepot());
+ String requestHead = request.getHeadCommitHash();
+ String targetHead = request.getTarget().getObjectName();
+ Depot targetDepot = request.getTargetDepot();
+ preview = new IntegrationPreview(targetHead, requestHead, request.getIntegrationStrategy(), null);
+ request.setLastIntegrationPreview(preview);
+ String integrateRef = request.getIntegrateRef();
+ ObjectId requestHeadId = ObjectId.fromString(requestHead);
+ ObjectId targetHeadId = ObjectId.fromString(targetHead);
+ if (preview.getIntegrationStrategy() == MERGE_IF_NECESSARY
+ && GitUtils.isMergedInto(targetDepot.getRepository(), targetHeadId, requestHeadId)) {
+ preview.setIntegrated(requestHead);
+ RefUpdate refUpdate = targetDepot.updateRef(integrateRef);
+ refUpdate.setNewObjectId(ObjectId.fromString(requestHead));
+ GitUtils.updateRef(refUpdate);
+ } else {
+ PersonIdent user = accountManager.getRoot().asPerson();
+ ObjectId integrated;
+ if (preview.getIntegrationStrategy() == REBASE_TARGET_ONTO_SOURCE) {
+ integrated = GitUtils.rebase(targetDepot.getRepository(), targetHeadId, requestHeadId, user);
+ } else if (preview.getIntegrationStrategy() == REBASE_SOURCE_ONTO_TARGET) {
+ integrated = GitUtils.rebase(targetDepot.getRepository(), requestHeadId, targetHeadId, user);
+ } else if (preview.getIntegrationStrategy() == MERGE_WITH_SQUASH) {
+ integrated = GitUtils.merge(targetDepot.getRepository(),
+ requestHeadId, targetHeadId, true, user, request.getCommitMessage());
+ } else {
+ integrated = GitUtils.merge(targetDepot.getRepository(),
+ requestHeadId, targetHeadId, false, user, request.getCommitMessage());
+ }
+
+ if (integrated != null) {
+ preview.setIntegrated(integrated.name());
+ RefUpdate refUpdate = targetDepot.updateRef(integrateRef);
+ refUpdate.setNewObjectId(integrated);
+ GitUtils.updateRef(refUpdate);
+ } else {
+ RefUpdate refUpdate = targetDepot.updateRef(integrateRef);
+ GitUtils.deleteRef(refUpdate);
+ }
+ }
+ dao.persist(request);
+
+ listenerRegistry.post(new IntegrationPreviewCalculated(request));
+ logger.info("Integration preview of pull request #{} in repository '{}' is calculated.",
+ request.getNumber(), request.getTargetDepot());
+ }
+ } catch (Exception e) {
+ logger.error("Error calculating pull request integration preview", e);
+ }
+ return null;
+ }
+
+ });
+ }
+
+ };
+ }
+
+ @Transactional
+ @Listen
+ public void on(DepotDeleted event) {
+ for (PullRequest request: event.getDepot().getOutgoingRequests()) {
+ if (!request.getTargetDepot().equals(event.getDepot()) && request.isOpen())
+ discard(request, "Source repository is deleted.");
+ }
+
+ Query query = getSession().createQuery("update PullRequest set sourceDepot=null where "
+ + "sourceDepot=:depot");
+ query.setParameter("depot", event.getDepot());
+ query.executeUpdate();
+ }
+
+ @Transactional
+ @Listen
+ public void on(RefUpdated event) {
+ String branch = GitUtils.ref2branch(event.getRefName());
+ if (branch != null) {
+ DepotAndBranch depotAndBranch = new DepotAndBranch(event.getDepot(), branch);
+ Criterion criterion = Restrictions.and(
+ ofOpen(),
+ Restrictions.or(ofSource(depotAndBranch), ofTarget(depotAndBranch)));
+ for (PullRequest request: findAll(EntityCriteria.of(PullRequest.class).add(criterion))) {
+ check(request);
+ }
+ }
+ }
+
+ @Sessional
+ @Override
+ public PullRequest findOpen(DepotAndBranch target, DepotAndBranch source) {
+ return find(EntityCriteria.of(PullRequest.class)
+ .add(ofTarget(target)).add(ofSource(source)).add(ofOpen()));
+ }
+
+ @Sessional
+ @Override
+ public PullRequest findLatest(Depot depot, Account submitter) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ criteria.add(ofOpen());
+ criteria.add(Restrictions.or(ofSourceDepot(depot), ofTargetDepot(depot)));
+ criteria.add(ofSubmitter(submitter));
+ criteria.addOrder(Order.desc("id"));
+ return find(criteria);
+ }
+
+ @Sessional
+ @Override
+ public Collection<PullRequest> findAllOpenTo(DepotAndBranch target, @Nullable Depot sourceDepot) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ criteria.add(ofTarget(target));
+
+ if (sourceDepot != null)
+ criteria.add(Restrictions.eq("sourceDepot", sourceDepot));
+ criteria.add(ofOpen());
+ return findAll(criteria);
+ }
+
+ @Sessional
+ @Override
+ public Collection<PullRequest> findAllOpenFrom(DepotAndBranch source, @Nullable Depot targetDepot) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ criteria.add(ofSource(source));
+
+ if (targetDepot != null)
+ criteria.add(Restrictions.eq("targetDepot", targetDepot));
+ criteria.add(ofOpen());
+ return findAll(criteria);
+ }
+
+ @Sessional
+ @Override
+ public Collection<PullRequest> findAllOpen(DepotAndBranch sourceOrTarget) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ criteria.add(ofOpen());
+ criteria.add(Restrictions.or(ofSource(sourceOrTarget), ofTarget(sourceOrTarget)));
+ return findAll(criteria);
+ }
+
+ @Sessional
+ @Override
+ public int countOpen(Depot depot) {
+ EntityCriteria<PullRequest> criteria = newCriteria();
+ criteria.add(PullRequest.CriterionHelper.ofOpen());
+ criteria.add(PullRequest.CriterionHelper.ofTargetDepot(depot));
+ return count(criteria);
+ }
+
+ @Sessional
+ @Override
+ public PullRequest find(Depot target, long number) {
+ EntityCriteria<PullRequest> criteria = newCriteria();
+ criteria.add(Restrictions.eq("targetDepot", target));
+ criteria.add(Restrictions.eq("number", number));
+ return find(criteria);
+ }
+
+ @Sessional
+ @Override
+ public PullRequest find(String uuid) {
+ EntityCriteria<PullRequest> criteria = newCriteria();
+ criteria.add(Restrictions.eq("uuid", uuid));
+ return find(criteria);
+ }
+
+ @Listen
+ public void on(PullRequestStatusChangeEvent event) {
+ Type type = event.getStatusChange().getType();
+ if (type == Type.APPROVED || type == Type.DISAPPROVED || type == Type.REVIEW_DELETED
+ || type == Type.VERIFICATION_DELETED || type == Type.VERIFICATION_SUCCEEDED
+ || type == Type.VERIFICATION_FAILED) {
+ checkAsync(event.getRequest());
+ }
+ }
+
+ @Listen
+ public void on(IntegrationPreviewCalculated event) {
+ checkAsync(event.getRequest());
+ }
+
+ private Runnable newCheckRunnable(Long requestId, Subject subject) {
+ return new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ ThreadContext.bind(subject);
+ check(load(requestId));
+ } catch (Exception e) {
+ logger.error("Error checking pull request", e);
+ } finally {
+ ThreadContext.unbindSubject();
+ }
+ }
+
+ };
+ }
+
+ @Sessional
+ protected void checkAsync(PullRequest request) {
+ Long requestId = request.getId();
+ Subject subject = SecurityUtils.getSubject();
+ if (dao.getSession().getTransaction().getStatus() == TransactionStatus.ACTIVE) {
+ doUnitOfWorkAsyncAfterCommit(newCheckRunnable(requestId, subject));
+ } else {
+ unitOfWork.doAsync(newCheckRunnable(requestId, subject));
+ }
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java
similarity index 67%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java
index 0d79d576ec..dd555c0e3b 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReferenceManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Date;
@@ -7,19 +7,19 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.markdown.MarkdownManager;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReference;
-import com.pmease.gitplex.core.event.MarkdownAware;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestChangeEvent;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.PullRequestReferenceManager;
-import com.pmease.gitplex.core.util.markdown.PullRequestParser;
+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;
@Singleton
public class DefaultPullRequestReferenceManager extends AbstractEntityManager<PullRequestReference>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
similarity index 68%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
index 6bc165776e..ff40eaa127 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewInvitationManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestReviewInvitationChanged;
-import com.pmease.gitplex.core.manager.PullRequestReviewInvitationManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewManager;
+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;
@Singleton
public class DefaultPullRequestReviewInvitationManager extends AbstractEntityManager<PullRequestReviewInvitation>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java
similarity index 75%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java
index 612a15500e..0ee708d941 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestReviewManager.java
@@ -1,124 +1,124 @@
-package com.pmease.gitplex.core.manager.impl;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange.Type;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewManager;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
-
-@Singleton
-public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview> implements PullRequestReviewManager {
-
- private final AccountManager accountManager;
-
- private final PullRequestManager pullRequestManager;
-
- private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
-
- @Inject
- public DefaultPullRequestReviewManager(Dao dao, AccountManager accountManager, PullRequestManager pullRequestManager,
- PullRequestStatusChangeManager pullRequestStatusChangeManager) {
- super(dao);
-
- this.accountManager = accountManager;
- this.pullRequestManager = pullRequestManager;
- this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
- }
-
- @Sessional
- @Override
- public PullRequestReview find(Account user, PullRequestUpdate update) {
- return find(EntityCriteria.of(PullRequestReview.class)
- .add(Restrictions.eq("user", user))
- .add(Restrictions.eq("update", update)));
- }
-
- @Transactional
- @Override
- public void review(PullRequest request, PullRequestReview.Result result, String note) {
- Account user = accountManager.getCurrent();
- Date date = new Date();
-
- PullRequestReview review = new PullRequestReview();
- review.setUpdate(request.getLatestUpdate());
- review.setResult(result);
- review.setUser(user);
- review.setDate(date);
- save(review);
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(date);
- statusChange.setNote(note);
- statusChange.setRequest(request);
- if (result == PullRequestReview.Result.APPROVE) {
- statusChange.setType(Type.APPROVED);
- } else {
- statusChange.setType(Type.DISAPPROVED);
- }
- statusChange.setUser(user);
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- pullRequestManager.save(request);
- }
-
- @Transactional
- @Override
- public void delete(PullRequestReview entity) {
- super.delete(entity);
-
- PullRequest request = entity.getUpdate().getRequest();
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setRequest(request);
- statusChange.setType(Type.REVIEW_DELETED);
- statusChange.setUser(accountManager.getCurrent());
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- pullRequestManager.save(request);
- }
-
- @Sessional
- @Override
- public List<PullRequestReview> findAll(PullRequest request) {
- EntityCriteria<PullRequestReview> criteria = EntityCriteria.of(PullRequestReview.class);
- criteria.createCriteria("update").add(Restrictions.eq("request", request));
- criteria.addOrder(Order.asc("date"));
- return findAll(criteria);
- }
-
- @Transactional
- @Override
- public void deleteAll(Account user, PullRequest request) {
- for (Iterator<PullRequestReview> it = request.getReviews().iterator(); it.hasNext();) {
- PullRequestReview review = it.next();
- if (review.getUser().equals(user)) {
- delete(review);
- it.remove();
- }
- }
- }
-
-}
+package com.gitplex.core.manager.impl;
+
+import java.util.Date;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.inject.Inject;
+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;
+
+@Singleton
+public class DefaultPullRequestReviewManager extends AbstractEntityManager<PullRequestReview> implements PullRequestReviewManager {
+
+ private final AccountManager accountManager;
+
+ private final PullRequestManager pullRequestManager;
+
+ private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
+
+ @Inject
+ public DefaultPullRequestReviewManager(Dao dao, AccountManager accountManager, PullRequestManager pullRequestManager,
+ PullRequestStatusChangeManager pullRequestStatusChangeManager) {
+ super(dao);
+
+ this.accountManager = accountManager;
+ this.pullRequestManager = pullRequestManager;
+ this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
+ }
+
+ @Sessional
+ @Override
+ public PullRequestReview find(Account user, PullRequestUpdate update) {
+ return find(EntityCriteria.of(PullRequestReview.class)
+ .add(Restrictions.eq("user", user))
+ .add(Restrictions.eq("update", update)));
+ }
+
+ @Transactional
+ @Override
+ public void review(PullRequest request, PullRequestReview.Result result, String note) {
+ Account user = accountManager.getCurrent();
+ Date date = new Date();
+
+ PullRequestReview review = new PullRequestReview();
+ review.setUpdate(request.getLatestUpdate());
+ review.setResult(result);
+ review.setUser(user);
+ review.setDate(date);
+ save(review);
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(date);
+ statusChange.setNote(note);
+ statusChange.setRequest(request);
+ if (result == PullRequestReview.Result.APPROVE) {
+ statusChange.setType(Type.APPROVED);
+ } else {
+ statusChange.setType(Type.DISAPPROVED);
+ }
+ statusChange.setUser(user);
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ pullRequestManager.save(request);
+ }
+
+ @Transactional
+ @Override
+ public void delete(PullRequestReview entity) {
+ super.delete(entity);
+
+ PullRequest request = entity.getUpdate().getRequest();
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setRequest(request);
+ statusChange.setType(Type.REVIEW_DELETED);
+ statusChange.setUser(accountManager.getCurrent());
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ pullRequestManager.save(request);
+ }
+
+ @Sessional
+ @Override
+ public List<PullRequestReview> findAll(PullRequest request) {
+ EntityCriteria<PullRequestReview> criteria = EntityCriteria.of(PullRequestReview.class);
+ criteria.createCriteria("update").add(Restrictions.eq("request", request));
+ criteria.addOrder(Order.asc("date"));
+ return findAll(criteria);
+ }
+
+ @Transactional
+ @Override
+ public void deleteAll(Account user, PullRequest request) {
+ for (Iterator<PullRequestReview> it = request.getReviews().iterator(); it.hasNext();) {
+ PullRequestReview review = it.next();
+ if (review.getUser().equals(user)) {
+ delete(review);
+ it.remove();
+ }
+ }
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java
similarity index 59%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java
index db125c038b..979570b3c3 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestStatusChangeManager.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
+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;
@Singleton
public class DefaultPullRequestStatusChangeManager extends AbstractEntityManager<PullRequestStatusChange>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
index 100fd8faf9..ed56994c28 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestTaskManager.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
-import static com.pmease.gitplex.core.entity.PullRequest.Status.PENDING_INTEGRATE;
-import static com.pmease.gitplex.core.entity.PullRequestTask.Type.INTEGRATE;
-import static com.pmease.gitplex.core.entity.PullRequestTask.Type.REVIEW;
-import static com.pmease.gitplex.core.entity.PullRequestTask.Type.UPDATE;
+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 javax.inject.Inject;
import javax.inject.Singleton;
@@ -11,29 +11,29 @@ 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.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestTask;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.event.TaskChangeEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestPendingApproval;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestPendingIntegration;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestPendingUpdate;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestReviewInvitationChanged;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestUpdated;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.core.manager.PullRequestTaskManager;
-import com.pmease.gitplex.core.manager.UrlManager;
+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.loader.ListenerRegistry;
/**
* This class manages pull request tasks and send task notifications if necessary.
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java
similarity index 74%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java
index 8d3f278940..cf5a882098 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestUpdateManager.java
@@ -1,118 +1,118 @@
-package com.pmease.gitplex.core.manager.impl;
-
-import java.util.List;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.transport.RefSpec;
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
-
-import com.google.common.base.Throwables;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.LastEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestUpdated;
-import com.pmease.gitplex.core.manager.PullRequestCommentManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestUpdateManager;
-
-@Singleton
-public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
- implements PullRequestUpdateManager {
-
- private final ListenerRegistry listenerRegistry;
-
- private final PullRequestManager pullRequestManager;
-
- @Inject
- public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
- PullRequestCommentManager commentManager, PullRequestManager pullRequestManager) {
- super(dao);
-
- this.listenerRegistry = listenerRegistry;
- this.pullRequestManager = pullRequestManager;
- }
-
- @Transactional
- @Override
- public void save(PullRequestUpdate update) {
- save(update, true);
- }
-
- @Transactional
- @Override
- public void save(PullRequestUpdate update, boolean independent) {
- PullRequest request = update.getRequest();
-
- dao.persist(update);
-
- ObjectId updateHeadId = ObjectId.fromString(update.getHeadCommitHash());
- if (!request.getTargetDepot().equals(request.getSourceDepot())) {
- try {
- request.getTargetDepot().git().fetch()
- .setRemote(request.getSourceDepot().getDirectory().getAbsolutePath())
- .setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef()))
- .call();
- if (!request.getTargetDepot().getObjectId(update.getHeadRef()).equals(updateHeadId)) {
- RefUpdate refUpdate = request.getTargetDepot().updateRef(update.getHeadRef());
- refUpdate.setNewObjectId(updateHeadId);
- GitUtils.updateRef(refUpdate);
- }
- } catch (Exception e) {
- Throwables.propagate(e);
- }
- } else {
- RefUpdate refUpdate = request.getTargetDepot().updateRef(update.getHeadRef());
- refUpdate.setNewObjectId(updateHeadId);
- GitUtils.updateRef(refUpdate);
- }
-
- if (independent) {
- PullRequestUpdated event = new PullRequestUpdated(update);
- listenerRegistry.post(event);
-
- LastEvent lastEvent = new LastEvent();
- lastEvent.setDate(event.getDate());
- lastEvent.setType(EditableUtils.getName(event.getClass()));
- request.setLastEvent(lastEvent);
- pullRequestManager.save(request);
- }
- }
-
- @Sessional
- @Override
- public PullRequestUpdate find(String uuid) {
- EntityCriteria<PullRequestUpdate> criteria = newCriteria();
- criteria.add(Restrictions.eq("uuid", uuid));
- return find(criteria);
- }
-
- @Sessional
- @Override
- public List<PullRequestUpdate> findAllAfter(Depot depot, String updateUUID) {
- EntityCriteria<PullRequestUpdate> criteria = newCriteria();
- criteria.createCriteria("request").add(Restrictions.eq("targetDepot", depot));
- criteria.addOrder(Order.asc("id"));
- if (updateUUID != null) {
- PullRequestUpdate update = find(updateUUID);
- if (update != null) {
- criteria.add(Restrictions.gt("id", update.getId()));
- }
- }
- return findAll(criteria);
- }
-
-}
+package com.gitplex.core.manager.impl;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.RefUpdate;
+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;
+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.commons.wicket.editable.EditableUtils;
+
+@Singleton
+public class DefaultPullRequestUpdateManager extends AbstractEntityManager<PullRequestUpdate>
+ implements PullRequestUpdateManager {
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final PullRequestManager pullRequestManager;
+
+ @Inject
+ public DefaultPullRequestUpdateManager(Dao dao, ListenerRegistry listenerRegistry,
+ PullRequestCommentManager commentManager, PullRequestManager pullRequestManager) {
+ super(dao);
+
+ this.listenerRegistry = listenerRegistry;
+ this.pullRequestManager = pullRequestManager;
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestUpdate update) {
+ save(update, true);
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestUpdate update, boolean independent) {
+ PullRequest request = update.getRequest();
+
+ dao.persist(update);
+
+ ObjectId updateHeadId = ObjectId.fromString(update.getHeadCommitHash());
+ if (!request.getTargetDepot().equals(request.getSourceDepot())) {
+ try {
+ request.getTargetDepot().git().fetch()
+ .setRemote(request.getSourceDepot().getDirectory().getAbsolutePath())
+ .setRefSpecs(new RefSpec(GitUtils.branch2ref(request.getSourceBranch()) + ":" + update.getHeadRef()))
+ .call();
+ if (!request.getTargetDepot().getObjectId(update.getHeadRef()).equals(updateHeadId)) {
+ RefUpdate refUpdate = request.getTargetDepot().updateRef(update.getHeadRef());
+ refUpdate.setNewObjectId(updateHeadId);
+ GitUtils.updateRef(refUpdate);
+ }
+ } catch (Exception e) {
+ Throwables.propagate(e);
+ }
+ } else {
+ RefUpdate refUpdate = request.getTargetDepot().updateRef(update.getHeadRef());
+ refUpdate.setNewObjectId(updateHeadId);
+ GitUtils.updateRef(refUpdate);
+ }
+
+ if (independent) {
+ PullRequestUpdated event = new PullRequestUpdated(update);
+ listenerRegistry.post(event);
+
+ LastEvent lastEvent = new LastEvent();
+ lastEvent.setDate(event.getDate());
+ lastEvent.setType(EditableUtils.getName(event.getClass()));
+ request.setLastEvent(lastEvent);
+ pullRequestManager.save(request);
+ }
+ }
+
+ @Sessional
+ @Override
+ public PullRequestUpdate find(String uuid) {
+ EntityCriteria<PullRequestUpdate> criteria = newCriteria();
+ criteria.add(Restrictions.eq("uuid", uuid));
+ return find(criteria);
+ }
+
+ @Sessional
+ @Override
+ public List<PullRequestUpdate> findAllAfter(Depot depot, String updateUUID) {
+ EntityCriteria<PullRequestUpdate> criteria = newCriteria();
+ criteria.createCriteria("request").add(Restrictions.eq("targetDepot", depot));
+ criteria.addOrder(Order.asc("id"));
+ if (updateUUID != null) {
+ PullRequestUpdate update = find(updateUUID);
+ if (update != null) {
+ criteria.add(Restrictions.gt("id", update.getId()));
+ }
+ }
+ return findAll(criteria);
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java
similarity index 77%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java
index fe42f1ee87..3842abb5fe 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestVerificationManager.java
@@ -1,131 +1,131 @@
-package com.pmease.gitplex.core.manager.impl;
-
-import java.util.Collection;
-import java.util.Date;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange.Type;
-import com.pmease.gitplex.core.entity.PullRequestVerification;
-import com.pmease.gitplex.core.entity.PullRequestVerification.Status;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestVerificationRunning;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
-import com.pmease.gitplex.core.manager.PullRequestVerificationManager;
-
-@Singleton
-public class DefaultPullRequestVerificationManager extends AbstractEntityManager<PullRequestVerification>
- implements PullRequestVerificationManager {
-
- private final AccountManager accountManager;
-
- private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
-
- private final PullRequestManager pullRequestManager;
-
- private final ListenerRegistry listenerRegistry;
-
- @Inject
- public DefaultPullRequestVerificationManager(Dao dao, AccountManager accountManager,
- PullRequestStatusChangeManager pullRequestStatusChangeManager,
- PullRequestManager pullRequestManager, ListenerRegistry listenerRegistry) {
- super(dao);
- this.accountManager = accountManager;
- this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
- this.pullRequestManager = pullRequestManager;
- this.listenerRegistry = listenerRegistry;
- }
-
- @Transactional
- @Override
- public void save(PullRequestVerification entity) {
- super.save(entity);
-
- PullRequest request = entity.getRequest();
-
- if (entity.getStatus() == PullRequestVerification.Status.RUNNING) {
- listenerRegistry.post(new PullRequestVerificationRunning(entity));
- } else {
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setNote("configuration: " + entity.getConfiguration() + "\n"
- + "message: " + entity.getMessage());
- statusChange.setRequest(request);
- if (entity.getStatus() == PullRequestVerification.Status.FAILED)
- statusChange.setType(Type.VERIFICATION_FAILED);
- else
- statusChange.setType(Type.VERIFICATION_SUCCEEDED);
- statusChange.setRequest(request);
- statusChange.setUser(entity.getUser());
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- pullRequestManager.save(request);
- }
- }
-
- @Transactional
- @Override
- public void delete(PullRequestVerification entity) {
- super.delete(entity);
-
- PullRequest request = entity.getRequest();
-
- PullRequestStatusChange statusChange = new PullRequestStatusChange();
- statusChange.setDate(new Date());
- statusChange.setNote("configuration: " + entity.getConfiguration());
- statusChange.setRequest(request);
- statusChange.setType(Type.VERIFICATION_DELETED);
- statusChange.setUser(accountManager.getCurrent());
- pullRequestStatusChangeManager.save(statusChange);
-
- request.setLastEvent(statusChange);
- pullRequestManager.save(request);
- }
-
- @Sessional
- @Override
- public Collection<PullRequestVerification> findAll(PullRequest request, String commit) {
- return findRange(EntityCriteria.of(PullRequestVerification.class)
- .add(Restrictions.eq("request", request))
- .add(Restrictions.eq("commit", commit)), 0, 0);
- }
-
- @Sessional
- @Override
- public PullRequestVerification find(PullRequest request, String commit, String configuration) {
- return find(EntityCriteria.of(PullRequestVerification.class)
- .add(Restrictions.eq("request", request))
- .add(Restrictions.eq("commit", commit))
- .add(Restrictions.eq("configuration", configuration)));
- }
-
- @Override
- public Status getOverallStatus(Collection<PullRequestVerification> verifications) {
- PullRequestVerification.Status overallStatus = null;
- for (PullRequestVerification verification: verifications) {
- if (verification.getStatus() == PullRequestVerification.Status.FAILED) {
- overallStatus = PullRequestVerification.Status.FAILED;
- break;
- } else if (verification.getStatus() == PullRequestVerification.Status.RUNNING) {
- overallStatus = PullRequestVerification.Status.RUNNING;
- } else if (overallStatus == null) {
- overallStatus = PullRequestVerification.Status.SUCCESSFUL;
- }
- }
- return overallStatus;
- }
-
-}
+package com.gitplex.core.manager.impl;
+
+import java.util.Collection;
+import java.util.Date;
+
+import javax.inject.Inject;
+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;
+
+@Singleton
+public class DefaultPullRequestVerificationManager extends AbstractEntityManager<PullRequestVerification>
+ implements PullRequestVerificationManager {
+
+ private final AccountManager accountManager;
+
+ private final PullRequestStatusChangeManager pullRequestStatusChangeManager;
+
+ private final PullRequestManager pullRequestManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ @Inject
+ public DefaultPullRequestVerificationManager(Dao dao, AccountManager accountManager,
+ PullRequestStatusChangeManager pullRequestStatusChangeManager,
+ PullRequestManager pullRequestManager, ListenerRegistry listenerRegistry) {
+ super(dao);
+ this.accountManager = accountManager;
+ this.pullRequestStatusChangeManager = pullRequestStatusChangeManager;
+ this.pullRequestManager = pullRequestManager;
+ this.listenerRegistry = listenerRegistry;
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestVerification entity) {
+ super.save(entity);
+
+ PullRequest request = entity.getRequest();
+
+ if (entity.getStatus() == PullRequestVerification.Status.RUNNING) {
+ listenerRegistry.post(new PullRequestVerificationRunning(entity));
+ } else {
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setNote("configuration: " + entity.getConfiguration() + "\n"
+ + "message: " + entity.getMessage());
+ statusChange.setRequest(request);
+ if (entity.getStatus() == PullRequestVerification.Status.FAILED)
+ statusChange.setType(Type.VERIFICATION_FAILED);
+ else
+ statusChange.setType(Type.VERIFICATION_SUCCEEDED);
+ statusChange.setRequest(request);
+ statusChange.setUser(entity.getUser());
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ pullRequestManager.save(request);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void delete(PullRequestVerification entity) {
+ super.delete(entity);
+
+ PullRequest request = entity.getRequest();
+
+ PullRequestStatusChange statusChange = new PullRequestStatusChange();
+ statusChange.setDate(new Date());
+ statusChange.setNote("configuration: " + entity.getConfiguration());
+ statusChange.setRequest(request);
+ statusChange.setType(Type.VERIFICATION_DELETED);
+ statusChange.setUser(accountManager.getCurrent());
+ pullRequestStatusChangeManager.save(statusChange);
+
+ request.setLastEvent(statusChange);
+ pullRequestManager.save(request);
+ }
+
+ @Sessional
+ @Override
+ public Collection<PullRequestVerification> findAll(PullRequest request, String commit) {
+ return findRange(EntityCriteria.of(PullRequestVerification.class)
+ .add(Restrictions.eq("request", request))
+ .add(Restrictions.eq("commit", commit)), 0, 0);
+ }
+
+ @Sessional
+ @Override
+ public PullRequestVerification find(PullRequest request, String commit, String configuration) {
+ return find(EntityCriteria.of(PullRequestVerification.class)
+ .add(Restrictions.eq("request", request))
+ .add(Restrictions.eq("commit", commit))
+ .add(Restrictions.eq("configuration", configuration)));
+ }
+
+ @Override
+ public Status getOverallStatus(Collection<PullRequestVerification> verifications) {
+ PullRequestVerification.Status overallStatus = null;
+ for (PullRequestVerification verification: verifications) {
+ if (verification.getStatus() == PullRequestVerification.Status.FAILED) {
+ overallStatus = PullRequestVerification.Status.FAILED;
+ break;
+ } else if (verification.getStatus() == PullRequestVerification.Status.RUNNING) {
+ overallStatus = PullRequestVerification.Status.RUNNING;
+ } else if (overallStatus == null) {
+ overallStatus = PullRequestVerification.Status.SUCCESSFUL;
+ }
+ }
+ return overallStatus;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
index b6af8cd178..61b4260a64 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultPullRequestWatchManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Collection;
import java.util.Date;
@@ -11,39 +11,39 @@ 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.pmease.commons.git.NameAndEmail;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.markdown.MarkdownManager;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.BranchWatch;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange.Type;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.PullRequestWatch;
-import com.pmease.gitplex.core.event.MarkdownAware;
-import com.pmease.gitplex.core.event.pullrequest.IntegrationPreviewCalculated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestChangeEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentActivityEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCodeCommentCreated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCommentCreated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestOpened;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestReviewInvitationChanged;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestUpdated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestVerificationRunning;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.BranchWatchManager;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.core.manager.PullRequestWatchManager;
-import com.pmease.gitplex.core.manager.UrlManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.util.markdown.MentionParser;
+import com.gitplex.commons.git.NameAndEmail;
+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.markdown.MarkdownManager;
+import com.gitplex.commons.wicket.editable.EditableUtils;
@Singleton
public class DefaultPullRequestWatchManager extends AbstractEntityManager<PullRequestWatch>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultStorageManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultStorageManager.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultStorageManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultStorageManager.java
index 64fd7d1205..dbdff8f594 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultStorageManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultStorageManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStarting;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.StorageManager;
+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;
@Singleton
public class DefaultStorageManager implements StorageManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java
similarity index 72%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java
index 504d78ac06..414fc0e736 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamAuthorizationManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Collection;
@@ -8,18 +8,18 @@ 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.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.loader.Listen;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.event.depot.DepotTransferred;
-import com.pmease.gitplex.core.manager.TeamAuthorizationManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
+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.Listen;
@Singleton
public class DefaultTeamAuthorizationManager extends AbstractEntityManager<TeamAuthorization>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamManager.java
similarity index 68%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamManager.java
index 480a754c57..0dc752eaa2 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Iterator;
@@ -7,16 +7,16 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.manager.TeamManager;
+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;
@Singleton
public class DefaultTeamManager extends AbstractEntityManager<Team> implements TeamManager {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamMembershipManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamMembershipManager.java
similarity index 70%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamMembershipManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamMembershipManager.java
index 1b90c0e0ad..ff7bc31775 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultTeamMembershipManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultTeamMembershipManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.core.manager.impl;
import java.util.Collection;
@@ -7,14 +7,14 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import com.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
+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;
@Singleton
public class DefaultTeamMembershipManager extends AbstractEntityManager<TeamMembership>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java
similarity index 73%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java
index 5cfcb6d6ba..2429bd0a8d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultUserAuthorizationManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Sessional;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.AbstractEntityManager;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
+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;
@Singleton
public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAuthorization>
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultVisitInfoManager.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultVisitInfoManager.java
similarity index 86%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultVisitInfoManager.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultVisitInfoManager.java
index 6661401a67..9960c5b5e5 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultVisitInfoManager.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultVisitInfoManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentRelation;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentActivityEvent;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentCreated;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestCommentCreated;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestOpened;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestStatusChangeEvent;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
+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 jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultWorkExecutor.java b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultWorkExecutor.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultWorkExecutor.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultWorkExecutor.java
index dc6f8ea36a..f260b561ca 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/impl/DefaultWorkExecutor.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/impl/DefaultWorkExecutor.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.impl;
+package com.gitplex.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.pmease.commons.loader.Listen;
-import com.pmease.commons.util.concurrent.PrioritizedCallable;
-import com.pmease.commons.util.concurrent.PrioritizedExecutor;
-import com.pmease.commons.util.concurrent.PrioritizedRunnable;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.WorkExecutor;
+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;
@Singleton
public class DefaultWorkExecutor implements WorkExecutor {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/support/BatchWorker.java b/gitplex.core/src/main/java/com/gitplex/core/manager/support/BatchWorker.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/support/BatchWorker.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/support/BatchWorker.java
index d5a29e07a8..4df61c755a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/support/BatchWorker.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/support/BatchWorker.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.support;
+package com.gitplex.core.manager.support;
import java.util.Collection;
@@ -6,7 +6,7 @@ import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import com.google.common.base.Preconditions;
-import com.pmease.commons.util.concurrent.Prioritized;
+import com.gitplex.commons.util.concurrent.Prioritized;
public abstract class BatchWorker {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/support/IndexResult.java b/gitplex.core/src/main/java/com/gitplex/core/manager/support/IndexResult.java
similarity index 89%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/manager/support/IndexResult.java
rename to gitplex.core/src/main/java/com/gitplex/core/manager/support/IndexResult.java
index 3fc640893c..d52e5809bb 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/support/IndexResult.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/manager/support/IndexResult.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.manager.support;
+package com.gitplex.core.manager.support;
public class IndexResult {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/migration/DatabaseMigrator.java b/gitplex.core/src/main/java/com/gitplex/core/migration/DatabaseMigrator.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/migration/DatabaseMigrator.java
rename to gitplex.core/src/main/java/com/gitplex/core/migration/DatabaseMigrator.java
index 89e1987f10..2d643c0769 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/migration/DatabaseMigrator.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/migration/DatabaseMigrator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.migration;
+package com.gitplex.core.migration;
import java.io.File;
import java.util.Stack;
@@ -7,8 +7,8 @@ import javax.inject.Singleton;
import org.dom4j.Element;
-import com.pmease.commons.hibernate.migration.Migrator;
-import com.pmease.commons.hibernate.migration.VersionedDocument;
+import com.gitplex.commons.hibernate.migration.Migrator;
+import com.gitplex.commons.hibernate.migration.VersionedDocument;
@Singleton
@SuppressWarnings("unused")
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/ObjectPermission.java b/gitplex.core/src/main/java/com/gitplex/core/security/ObjectPermission.java
similarity index 74%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/ObjectPermission.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/ObjectPermission.java
index 9b8d2490d4..a6c57e5674 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/ObjectPermission.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/ObjectPermission.java
@@ -1,82 +1,82 @@
-package com.pmease.gitplex.core.security;
-
-import org.apache.shiro.authz.Permission;
-
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.privilege.AccountPrivilege;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.core.security.privilege.Privilege;
-import com.pmease.gitplex.core.security.privilege.SystemAdmin;
-import com.pmease.gitplex.core.security.protectedobject.ProtectedObject;
-import com.pmease.gitplex.core.security.protectedobject.SystemObject;
-
-/**
- * This class represents permissions to operate an account and its belongings.
- *
- * @author robin
- *
- */
-public class ObjectPermission implements Permission {
-
- private ProtectedObject object;
-
- private Privilege privilege;
-
- public ObjectPermission(ProtectedObject object, Privilege privilege) {
- this.object = object;
- this.privilege = privilege;
- }
-
- public ProtectedObject getObject() {
- return object;
- }
-
- public Privilege getPrivilege() {
- return privilege;
- }
-
- public void setPrivilege(Privilege privilege) {
- this.privilege = privilege;
- }
-
- public void setObject(ProtectedObject object) {
- this.object = object;
- }
-
- @Override
- public boolean implies(Permission permission) {
- if (permission instanceof ObjectPermission) {
- ObjectPermission objectPermission = (ObjectPermission) permission;
- return getObject().has(objectPermission.getObject())
- && getPrivilege().can(objectPermission.getPrivilege());
- } else {
- return false;
- }
- }
-
- public static ObjectPermission ofDepotAdmin(Depot depot) {
- return new ObjectPermission(depot, DepotPrivilege.ADMIN);
- }
-
- public static ObjectPermission ofDepotRead(Depot depot) {
- return new ObjectPermission(depot, DepotPrivilege.READ);
- }
-
- public static ObjectPermission ofDepotWrite(Depot depot) {
- return new ObjectPermission(depot, DepotPrivilege.WRITE);
- }
-
- public static ObjectPermission ofAccountAdmin(Account account) {
- return new ObjectPermission(account, AccountPrivilege.ADMIN);
- }
-
- public static ObjectPermission ofAccountAccess(Account account) {
- return new ObjectPermission(account, AccountPrivilege.ACCESS);
- }
-
- public static ObjectPermission ofSystemAdmin() {
- return new ObjectPermission(new SystemObject(), new SystemAdmin());
- }
-
-}
+package com.gitplex.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;
+
+/**
+ * This class represents permissions to operate an account and its belongings.
+ *
+ * @author robin
+ *
+ */
+public class ObjectPermission implements Permission {
+
+ private ProtectedObject object;
+
+ private Privilege privilege;
+
+ public ObjectPermission(ProtectedObject object, Privilege privilege) {
+ this.object = object;
+ this.privilege = privilege;
+ }
+
+ public ProtectedObject getObject() {
+ return object;
+ }
+
+ public Privilege getPrivilege() {
+ return privilege;
+ }
+
+ public void setPrivilege(Privilege privilege) {
+ this.privilege = privilege;
+ }
+
+ public void setObject(ProtectedObject object) {
+ this.object = object;
+ }
+
+ @Override
+ public boolean implies(Permission permission) {
+ if (permission instanceof ObjectPermission) {
+ ObjectPermission objectPermission = (ObjectPermission) permission;
+ return getObject().has(objectPermission.getObject())
+ && getPrivilege().can(objectPermission.getPrivilege());
+ } else {
+ return false;
+ }
+ }
+
+ public static ObjectPermission ofDepotAdmin(Depot depot) {
+ return new ObjectPermission(depot, DepotPrivilege.ADMIN);
+ }
+
+ public static ObjectPermission ofDepotRead(Depot depot) {
+ return new ObjectPermission(depot, DepotPrivilege.READ);
+ }
+
+ public static ObjectPermission ofDepotWrite(Depot depot) {
+ return new ObjectPermission(depot, DepotPrivilege.WRITE);
+ }
+
+ public static ObjectPermission ofAccountAdmin(Account account) {
+ return new ObjectPermission(account, AccountPrivilege.ADMIN);
+ }
+
+ public static ObjectPermission ofAccountAccess(Account account) {
+ return new ObjectPermission(account, AccountPrivilege.ACCESS);
+ }
+
+ public static ObjectPermission ofSystemAdmin() {
+ return new ObjectPermission(new SystemObject(), new SystemAdmin());
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/SecurityRealm.java b/gitplex.core/src/main/java/com/gitplex/core/security/SecurityRealm.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/SecurityRealm.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/SecurityRealm.java
index 2c86459390..c9fd7b676f 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/SecurityRealm.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/SecurityRealm.java
@@ -1,158 +1,158 @@
-package com.pmease.gitplex.core.security;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.shiro.authz.Permission;
-
-import com.pmease.commons.shiro.AbstractRealm;
-import com.pmease.commons.shiro.AbstractUser;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.privilege.AccountPrivilege;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-@Singleton
-public class SecurityRealm extends AbstractRealm {
-
- private final AccountManager accountManager;
-
- private final OrganizationMembershipManager organizationMembershipManager;
-
- private final TeamMembershipManager teamMembershipManager;
-
- @Inject
- public SecurityRealm(AccountManager userManager,
- OrganizationMembershipManager organizationMembershipManager,
- TeamMembershipManager teamMembershipManager) {
- this.accountManager = userManager;
- this.organizationMembershipManager = organizationMembershipManager;
- this.teamMembershipManager = teamMembershipManager;
- }
-
- @Override
- protected AbstractUser getUserByName(String userName) {
- return accountManager.findByName(userName);
- }
-
- @Override
- protected Collection<Permission> permissionsOf(Long userId) {
- Collection<Permission> permissions = new ArrayList<>();
-
- /*
- * Instead of returning all permissions of the user, we return a customized
- * permission object so that we can control the authorization procedure for
- * optimization purpose. For instance, we may check information contained
- * in the permission being checked and if it means authorization of certain
- * object, we can then only load authorization information of that object.
- */
- permissions.add(new Permission() {
-
- @Override
- public boolean implies(Permission permission) {
- if (permission instanceof ObjectPermission) {
- ObjectPermission objectPermission = (ObjectPermission) permission;
- Depot checkDepot = getDepot(objectPermission);
- if (checkDepot != null
- && checkDepot.isPublicRead()
- && DepotPrivilege.READ.can(objectPermission.getPrivilege())) {
- return true;
- }
- if (userId != 0L) {
- Account user = accountManager.get(userId);
- if (user != null) {
- // administrator can do anything
- if (user.isAdministrator())
- return true;
-
- Account checkAccount = getAccount(objectPermission);
-
- // if permission is to check privilege of account belongings
- if (checkAccount != null) {
- // I can do anything against my own account
- if (checkAccount.equals(user))
- return true;
-
- OrganizationMembership organizationMembership =
- organizationMembershipManager.find(checkAccount, user);
- if (organizationMembership != null) {
- AccountPrivilege accountPrivilege;
- if (organizationMembership.isAdmin())
- accountPrivilege = AccountPrivilege.ADMIN;
- else
- accountPrivilege = AccountPrivilege.ACCESS;
- if (accountPrivilege.can(objectPermission.getPrivilege()))
- return true;
- }
- if (checkDepot != null) {
- if (organizationMembership != null
- && checkAccount.getDefaultPrivilege().can(objectPermission.getPrivilege())) {
- return true;
- }
- UserAuthorizationManager userAuthorizationManager =
- GitPlex.getInstance(UserAuthorizationManager.class);
- UserAuthorization userAuthorization = userAuthorizationManager.find(user, checkDepot);
- if (userAuthorization != null
- && userAuthorization.getPrivilege().can(objectPermission.getPrivilege())) {
- return true;
- }
-
- Set<Team> teams = new HashSet<>();
- for (TeamMembership teamMembership:
- teamMembershipManager.findAll(checkAccount, user)) {
- teams.add(teamMembership.getTeam());
- }
- for (TeamAuthorization authorization: checkDepot.getAuthorizedTeams()) {
- if (authorization.getPrivilege().can(objectPermission.getPrivilege())
- && teams.contains(authorization.getTeam())) {
- return true;
- }
- }
- }
- }
- }
- }
- }
- return false;
- }
- });
-
- return permissions;
- }
-
- private Account getAccount(ObjectPermission permission) {
- if (permission.getObject() instanceof Depot) {
- Depot depot = (Depot) permission.getObject();
- return depot.getAccount();
- } else if (permission.getObject() instanceof Account) {
- return (Account) permission.getObject();
- } else {
- return null;
- }
- }
-
- private Depot getDepot(ObjectPermission permission) {
- if (permission.getObject() instanceof Depot) {
- Depot depot = (Depot) permission.getObject();
- return depot;
- } else {
- return null;
- }
- }
-
-}
+package com.gitplex.core.security;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+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;
+
+@Singleton
+public class SecurityRealm extends AbstractRealm {
+
+ private final AccountManager accountManager;
+
+ private final OrganizationMembershipManager organizationMembershipManager;
+
+ private final TeamMembershipManager teamMembershipManager;
+
+ @Inject
+ public SecurityRealm(AccountManager userManager,
+ OrganizationMembershipManager organizationMembershipManager,
+ TeamMembershipManager teamMembershipManager) {
+ this.accountManager = userManager;
+ this.organizationMembershipManager = organizationMembershipManager;
+ this.teamMembershipManager = teamMembershipManager;
+ }
+
+ @Override
+ protected AbstractUser getUserByName(String userName) {
+ return accountManager.findByName(userName);
+ }
+
+ @Override
+ protected Collection<Permission> permissionsOf(Long userId) {
+ Collection<Permission> permissions = new ArrayList<>();
+
+ /*
+ * Instead of returning all permissions of the user, we return a customized
+ * permission object so that we can control the authorization procedure for
+ * optimization purpose. For instance, we may check information contained
+ * in the permission being checked and if it means authorization of certain
+ * object, we can then only load authorization information of that object.
+ */
+ permissions.add(new Permission() {
+
+ @Override
+ public boolean implies(Permission permission) {
+ if (permission instanceof ObjectPermission) {
+ ObjectPermission objectPermission = (ObjectPermission) permission;
+ Depot checkDepot = getDepot(objectPermission);
+ if (checkDepot != null
+ && checkDepot.isPublicRead()
+ && DepotPrivilege.READ.can(objectPermission.getPrivilege())) {
+ return true;
+ }
+ if (userId != 0L) {
+ Account user = accountManager.get(userId);
+ if (user != null) {
+ // administrator can do anything
+ if (user.isAdministrator())
+ return true;
+
+ Account checkAccount = getAccount(objectPermission);
+
+ // if permission is to check privilege of account belongings
+ if (checkAccount != null) {
+ // I can do anything against my own account
+ if (checkAccount.equals(user))
+ return true;
+
+ OrganizationMembership organizationMembership =
+ organizationMembershipManager.find(checkAccount, user);
+ if (organizationMembership != null) {
+ AccountPrivilege accountPrivilege;
+ if (organizationMembership.isAdmin())
+ accountPrivilege = AccountPrivilege.ADMIN;
+ else
+ accountPrivilege = AccountPrivilege.ACCESS;
+ if (accountPrivilege.can(objectPermission.getPrivilege()))
+ return true;
+ }
+ if (checkDepot != null) {
+ if (organizationMembership != null
+ && checkAccount.getDefaultPrivilege().can(objectPermission.getPrivilege())) {
+ return true;
+ }
+ UserAuthorizationManager userAuthorizationManager =
+ GitPlex.getInstance(UserAuthorizationManager.class);
+ UserAuthorization userAuthorization = userAuthorizationManager.find(user, checkDepot);
+ if (userAuthorization != null
+ && userAuthorization.getPrivilege().can(objectPermission.getPrivilege())) {
+ return true;
+ }
+
+ Set<Team> teams = new HashSet<>();
+ for (TeamMembership teamMembership:
+ teamMembershipManager.findAll(checkAccount, user)) {
+ teams.add(teamMembership.getTeam());
+ }
+ for (TeamAuthorization authorization: checkDepot.getAuthorizedTeams()) {
+ if (authorization.getPrivilege().can(objectPermission.getPrivilege())
+ && teams.contains(authorization.getTeam())) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+ });
+
+ return permissions;
+ }
+
+ private Account getAccount(ObjectPermission permission) {
+ if (permission.getObject() instanceof Depot) {
+ Depot depot = (Depot) permission.getObject();
+ return depot.getAccount();
+ } else if (permission.getObject() instanceof Account) {
+ return (Account) permission.getObject();
+ } else {
+ return null;
+ }
+ }
+
+ private Depot getDepot(ObjectPermission permission) {
+ if (permission.getObject() instanceof Depot) {
+ Depot depot = (Depot) permission.getObject();
+ return depot;
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/SecurityUtils.java b/gitplex.core/src/main/java/com/gitplex/core/security/SecurityUtils.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/SecurityUtils.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/SecurityUtils.java
index ad7705c655..454b32385c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/SecurityUtils.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/SecurityUtils.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.security;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.core.security.privilege.Privilege;
+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;
public class SecurityUtils extends org.apache.shiro.SecurityUtils {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/AccountPrivilege.java b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/AccountPrivilege.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/AccountPrivilege.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/privilege/AccountPrivilege.java
index f31b3c770a..6a8622e375 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/AccountPrivilege.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/AccountPrivilege.java
@@ -1,43 +1,43 @@
-package com.pmease.gitplex.core.security.privilege;
-
-public enum AccountPrivilege implements Privilege {
-
- NONE("None") {
-
- @Override
- public boolean can(Privilege privilege) {
- return privilege == NONE;
- }
-
- },
-
- // Organization members can access member/team information of organization account
- ACCESS("Access") {
-
- @Override
- public boolean can(Privilege privilege) {
- return privilege == ACCESS || NONE.can(privilege);
- }
-
- },
- ADMIN("Admin") {
-
- @Override
- public boolean can(Privilege privilege) {
- return privilege == ADMIN || ACCESS.can(privilege) || privilege instanceof DepotPrivilege;
- }
-
- };
-
- private final String displayName;
-
- AccountPrivilege(String displayName) {
- this.displayName = displayName;
- }
-
- @Override
- public String toString() {
- return displayName;
- }
-
-}
+package com.gitplex.core.security.privilege;
+
+public enum AccountPrivilege implements Privilege {
+
+ NONE("None") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return privilege == NONE;
+ }
+
+ },
+
+ // Organization members can access member/team information of organization account
+ ACCESS("Access") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return privilege == ACCESS || NONE.can(privilege);
+ }
+
+ },
+ ADMIN("Admin") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return privilege == ADMIN || ACCESS.can(privilege) || privilege instanceof DepotPrivilege;
+ }
+
+ };
+
+ private final String displayName;
+
+ AccountPrivilege(String displayName) {
+ this.displayName = displayName;
+ }
+
+ @Override
+ public String toString() {
+ return displayName;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/DepotPrivilege.java b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/DepotPrivilege.java
similarity index 87%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/DepotPrivilege.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/privilege/DepotPrivilege.java
index 5d2b9e30da..3f44003321 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/DepotPrivilege.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/DepotPrivilege.java
@@ -1,49 +1,49 @@
-package com.pmease.gitplex.core.security.privilege;
-
-public enum DepotPrivilege implements Privilege {
-
- NONE("None") {
-
- @Override
- public boolean can(Privilege privilege) {
- return privilege == NONE;
- }
-
- },
- READ("Read") {
-
- @Override
- public boolean can(Privilege privilege) {
- return privilege == READ || NONE.can(privilege);
- }
-
- },
- WRITE("Write") {
-
- @Override
- public boolean can(Privilege privilege) {
- return privilege == WRITE || READ.can(privilege);
- }
-
- },
- ADMIN("Admin") {
-
- @Override
- public boolean can(Privilege privilege) {
- return true;
- }
-
- };
-
- private final String displayName;
-
- DepotPrivilege(String displayName) {
- this.displayName = displayName;
- }
-
- @Override
- public String toString() {
- return displayName;
- }
-
-}
+package com.gitplex.core.security.privilege;
+
+public enum DepotPrivilege implements Privilege {
+
+ NONE("None") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return privilege == NONE;
+ }
+
+ },
+ READ("Read") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return privilege == READ || NONE.can(privilege);
+ }
+
+ },
+ WRITE("Write") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return privilege == WRITE || READ.can(privilege);
+ }
+
+ },
+ ADMIN("Admin") {
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return true;
+ }
+
+ };
+
+ private final String displayName;
+
+ DepotPrivilege(String displayName) {
+ this.displayName = displayName;
+ }
+
+ @Override
+ public String toString() {
+ return displayName;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/Privilege.java b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/Privilege.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/Privilege.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/privilege/Privilege.java
index dcd21fb474..524dcca93c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/Privilege.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/Privilege.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.core.security.privilege;
-
-import java.io.Serializable;
-
-public interface Privilege extends Serializable {
-
- boolean can(Privilege privilege);
-
-}
+package com.gitplex.core.security.privilege;
+
+import java.io.Serializable;
+
+public interface Privilege extends Serializable {
+
+ boolean can(Privilege privilege);
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/SystemAdmin.java b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/SystemAdmin.java
similarity index 73%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/SystemAdmin.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/privilege/SystemAdmin.java
index ac2072fcac..92a50e91f3 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/privilege/SystemAdmin.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/privilege/SystemAdmin.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.core.security.privilege;
-
-public class SystemAdmin implements Privilege {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean can(Privilege privilege) {
- return true;
- }
-
-}
+package com.gitplex.core.security.privilege;
+
+public class SystemAdmin implements Privilege {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean can(Privilege privilege) {
+ return true;
+ }
+
+}
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.java
new file mode 100644
index 0000000000..4480e8e2ec
--- /dev/null
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/AccountBelonging.java
@@ -0,0 +1,7 @@
+package com.gitplex.core.security.protectedobject;
+
+import com.gitplex.core.entity.Account;
+
+public interface AccountBelonging extends ProtectedObject {
+ Account getAccount();
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/ProtectedObject.java b/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/ProtectedObject.java
similarity index 54%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/ProtectedObject.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/ProtectedObject.java
index f860ee9e96..6daf057278 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/ProtectedObject.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/ProtectedObject.java
@@ -1,5 +1,5 @@
-package com.pmease.gitplex.core.security.protectedobject;
-
-public interface ProtectedObject {
- boolean has(ProtectedObject object);
-}
+package com.gitplex.core.security.protectedobject;
+
+public interface ProtectedObject {
+ boolean has(ProtectedObject object);
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/SystemObject.java b/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/SystemObject.java
similarity index 66%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/SystemObject.java
rename to gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/SystemObject.java
index a3b61ac403..d18dd1fb58 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/SystemObject.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/security/protectedobject/SystemObject.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.security.protectedobject;
-
-public class SystemObject implements ProtectedObject {
-
- @Override
- public boolean has(ProtectedObject object) {
- return true;
- }
-
-}
+package com.gitplex.core.security.protectedobject;
+
+public class SystemObject implements ProtectedObject {
+
+ @Override
+ public boolean has(ProtectedObject object) {
+ return true;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/BackupSetting.java b/gitplex.core/src/main/java/com/gitplex/core/setting/BackupSetting.java
similarity index 86%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/BackupSetting.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/BackupSetting.java
index 383aa7fc2e..1d4de4517c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/BackupSetting.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/BackupSetting.java
@@ -1,71 +1,71 @@
-package com.pmease.gitplex.core.setting;
-
-import java.io.Serializable;
-import java.text.ParseException;
-
-import javax.validation.ConstraintValidatorContext;
-
-import org.hibernate.validator.constraints.NotEmpty;
-import org.quartz.CronExpression;
-
-import com.pmease.commons.validation.ClassValidating;
-import com.pmease.commons.validation.Directory;
-import com.pmease.commons.validation.Validatable;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-
-@Editable
-@ClassValidating
-public class BackupSetting implements Serializable, Validatable {
-
- private static final long serialVersionUID = 1L;
-
- private String schedule;
-
- private String folder;
-
- @Editable(order=100, name="Backup Schedule", description=
- "Optionally specify a cron expression to schedule database auto-backup. The cron expression format is " +
- "<em>&lt;seconds&gt; &lt;minutes&gt; &lt;hours&gt; &lt;day-of-month&gt; &lt;month&gt; &lt;day-of-week&gt;</em>." +
- "For example, <em>0 0 1 * * ?</em> means 1:00am every day. For details of the format, refer " +
- "to <a href='http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/tutorial-lesson-06'>Quartz tutorial</a>." +
- "The backup files will be placed into <em>backup</em> folder under GitPlex " +
- "installation directory. Leave this property empty if you do not want to enable database " +
- "auto backup.")
- @NotEmpty
- public String getSchedule() {
- return schedule;
- }
-
- public void setSchedule(String schedule) {
- this.schedule = schedule;
- }
-
- @Editable(order=200, name="Backup Directory", description=
- "Specify the directory to which the auto backup files will be stored. Non-absolute path " +
- "will be considered to be relative to installation directory of GitPlex.")
- @Directory(absolute=true, outsideOfInstallDir=true, writeable=true)
- @NotEmpty
- public String getFolder() {
- return folder;
- }
-
- public void setFolder(String folder) {
- this.folder = folder;
- }
-
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- boolean hasErrors = false;
- if (schedule != null) {
- try {
- new CronExpression(schedule);
- } catch (ParseException e) {
- context.buildConstraintViolationWithTemplate(e.getMessage())
- .addPropertyNode("schedule").addConstraintViolation();
- hasErrors = true;
- }
- }
- return !hasErrors;
- }
-
-}
+package com.gitplex.core.setting;
+
+import java.io.Serializable;
+import java.text.ParseException;
+
+import javax.validation.ConstraintValidatorContext;
+
+import org.hibernate.validator.constraints.NotEmpty;
+import org.quartz.CronExpression;
+
+import com.gitplex.commons.validation.ClassValidating;
+import com.gitplex.commons.validation.Directory;
+import com.gitplex.commons.validation.Validatable;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
+
+@Editable
+@ClassValidating
+public class BackupSetting implements Serializable, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String schedule;
+
+ private String folder;
+
+ @Editable(order=100, name="Backup Schedule", description=
+ "Optionally specify a cron expression to schedule database auto-backup. The cron expression format is " +
+ "<em>&lt;seconds&gt; &lt;minutes&gt; &lt;hours&gt; &lt;day-of-month&gt; &lt;month&gt; &lt;day-of-week&gt;</em>." +
+ "For example, <em>0 0 1 * * ?</em> means 1:00am every day. For details of the format, refer " +
+ "to <a href='http://www.quartz-scheduler.org/documentation/quartz-2.x/tutorials/tutorial-lesson-06'>Quartz tutorial</a>." +
+ "The backup files will be placed into <em>backup</em> folder under GitPlex " +
+ "installation directory. Leave this property empty if you do not want to enable database " +
+ "auto backup.")
+ @NotEmpty
+ public String getSchedule() {
+ return schedule;
+ }
+
+ public void setSchedule(String schedule) {
+ this.schedule = schedule;
+ }
+
+ @Editable(order=200, name="Backup Directory", description=
+ "Specify the directory to which the auto backup files will be stored. Non-absolute path " +
+ "will be considered to be relative to installation directory of GitPlex.")
+ @Directory(absolute=true, outsideOfInstallDir=true, writeable=true)
+ @NotEmpty
+ public String getFolder() {
+ return folder;
+ }
+
+ public void setFolder(String folder) {
+ this.folder = folder;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ boolean hasErrors = false;
+ if (schedule != null) {
+ try {
+ new CronExpression(schedule);
+ } catch (ParseException e) {
+ context.buildConstraintViolationWithTemplate(e.getMessage())
+ .addPropertyNode("schedule").addConstraintViolation();
+ hasErrors = true;
+ }
+ }
+ return !hasErrors;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/MailSetting.java b/gitplex.core/src/main/java/com/gitplex/core/setting/MailSetting.java
similarity index 93%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/MailSetting.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/MailSetting.java
index 023dc7d3d5..33debc36e1 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/MailSetting.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/MailSetting.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.core.setting;
+package com.gitplex.core.setting;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Password;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.commons.wicket.editable.annotation.Password;
@Editable
public class MailSetting implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SecuritySetting.java b/gitplex.core/src/main/java/com/gitplex/core/setting/SecuritySetting.java
similarity index 81%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SecuritySetting.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/SecuritySetting.java
index da5d63d5e7..ae40592f38 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SecuritySetting.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/SecuritySetting.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.core.setting;
+package com.gitplex.core.setting;
import java.io.Serializable;
-import com.pmease.commons.wicket.editable.annotation.Editable;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable
public class SecuritySetting implements Serializable {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/ServerConfig.java b/gitplex.core/src/main/java/com/gitplex/core/setting/ServerConfig.java
similarity index 94%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/ServerConfig.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/ServerConfig.java
index 40e3c8f7d6..f8b9025248 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/ServerConfig.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/ServerConfig.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.setting;
+package com.gitplex.core.setting;
public interface ServerConfig {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SpecifiedGit.java b/gitplex.core/src/main/java/com/gitplex/core/setting/SpecifiedGit.java
similarity index 77%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SpecifiedGit.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/SpecifiedGit.java
index c2d3c0a8d5..afd55780a6 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SpecifiedGit.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/SpecifiedGit.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.core.setting;
+package com.gitplex.core.setting;
import org.hibernate.validator.constraints.NotEmpty;
-import com.pmease.commons.git.GitConfig;
-import com.pmease.commons.wicket.editable.annotation.Editable;
+import com.gitplex.commons.git.GitConfig;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="Use Specified Git", order=200)
@SuppressWarnings("serial")
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SslConfig.java b/gitplex.core/src/main/java/com/gitplex/core/setting/SslConfig.java
similarity index 78%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SslConfig.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/SslConfig.java
index 433aa1c765..7ad35600f9 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SslConfig.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/SslConfig.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.setting;
+package com.gitplex.core.setting;
public interface SslConfig {
int getPort();
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SystemGit.java b/gitplex.core/src/main/java/com/gitplex/core/setting/SystemGit.java
similarity index 56%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SystemGit.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/SystemGit.java
index 68fa4c9b11..b7fb6c17a1 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SystemGit.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/SystemGit.java
@@ -1,7 +1,7 @@
-package com.pmease.gitplex.core.setting;
+package com.gitplex.core.setting;
-import com.pmease.commons.git.GitConfig;
-import com.pmease.commons.wicket.editable.annotation.Editable;
+import com.gitplex.commons.git.GitConfig;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable(name="Use Git in System Path", order=100)
@SuppressWarnings("serial")
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SystemSetting.java b/gitplex.core/src/main/java/com/gitplex/core/setting/SystemSetting.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SystemSetting.java
rename to gitplex.core/src/main/java/com/gitplex/core/setting/SystemSetting.java
index 1166dcef71..e9041b3ab4 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/setting/SystemSetting.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/setting/SystemSetting.java
@@ -1,82 +1,82 @@
-package com.pmease.gitplex.core.setting;
-
-import java.io.Serializable;
-
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-
-import org.apache.commons.lang3.StringUtils;
-import org.hibernate.validator.constraints.NotEmpty;
-
-import com.pmease.commons.git.GitConfig;
-import com.pmease.commons.validation.ClassValidating;
-import com.pmease.commons.validation.Directory;
-import com.pmease.commons.validation.Validatable;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-
-@Editable
-@ClassValidating
-public class SystemSetting implements Serializable, Validatable {
-
- private static final long serialVersionUID = 1;
-
- private String serverUrl;
-
- private String storagePath;
-
- private GitConfig gitConfig = new SystemGit();
-
- private boolean gravatarEnabled = true;
-
- @Editable(name="Server URL", order=90, description="Specify root URL to access this server. GitPlex uses this url "
- + "to construct various links in notification email.")
- @NotEmpty
- public String getServerUrl() {
- return serverUrl;
- }
-
- public void setServerUrl(String serverUrl) {
- this.serverUrl = serverUrl;
- }
-
- @Editable(name="Storage Directory", order=100, description="Specify directory to store GitPlex data such as Git repositories.")
- @Directory(absolute=true, outsideOfInstallDir=true, writeable=true)
- @NotEmpty
- public String getStoragePath() {
- return storagePath;
- }
-
- public void setStoragePath(String storagePath) {
- this.storagePath = storagePath;
- }
-
- @Editable(order=200, description="GitPlex relies on git command line to manage repositories. The minimum "
- + "required version is 1.8.0.")
- @Valid
- @NotNull
- public GitConfig getGitConfig() {
- return gitConfig;
- }
-
- public void setGitConfig(GitConfig gitConfig) {
- this.gitConfig = gitConfig;
- }
-
- @Editable(order=300, description="Whether or not to enable user gravatar.")
- public boolean isGravatarEnabled() {
- return gravatarEnabled;
- }
-
- public void setGravatarEnabled(boolean gravatarEnabled) {
- this.gravatarEnabled = gravatarEnabled;
- }
-
- @Override
- public boolean isValid(ConstraintValidatorContext context) {
- if (serverUrl != null)
- serverUrl = StringUtils.stripEnd(serverUrl, "/\\");
- return true;
- }
-
-}
+package com.gitplex.core.setting;
+
+import java.io.Serializable;
+
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
+
+import org.apache.commons.lang3.StringUtils;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import com.gitplex.commons.git.GitConfig;
+import com.gitplex.commons.validation.ClassValidating;
+import com.gitplex.commons.validation.Directory;
+import com.gitplex.commons.validation.Validatable;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
+
+@Editable
+@ClassValidating
+public class SystemSetting implements Serializable, Validatable {
+
+ private static final long serialVersionUID = 1;
+
+ private String serverUrl;
+
+ private String storagePath;
+
+ private GitConfig gitConfig = new SystemGit();
+
+ private boolean gravatarEnabled = true;
+
+ @Editable(name="Server URL", order=90, description="Specify root URL to access this server. GitPlex uses this url "
+ + "to construct various links in notification email.")
+ @NotEmpty
+ public String getServerUrl() {
+ return serverUrl;
+ }
+
+ public void setServerUrl(String serverUrl) {
+ this.serverUrl = serverUrl;
+ }
+
+ @Editable(name="Storage Directory", order=100, description="Specify directory to store GitPlex data such as Git repositories.")
+ @Directory(absolute=true, outsideOfInstallDir=true, writeable=true)
+ @NotEmpty
+ public String getStoragePath() {
+ return storagePath;
+ }
+
+ public void setStoragePath(String storagePath) {
+ this.storagePath = storagePath;
+ }
+
+ @Editable(order=200, description="GitPlex relies on git command line to manage repositories. The minimum "
+ + "required version is 1.8.0.")
+ @Valid
+ @NotNull
+ public GitConfig getGitConfig() {
+ return gitConfig;
+ }
+
+ public void setGitConfig(GitConfig gitConfig) {
+ this.gitConfig = gitConfig;
+ }
+
+ @Editable(order=300, description="Whether or not to enable user gravatar.")
+ public boolean isGravatarEnabled() {
+ return gravatarEnabled;
+ }
+
+ public void setGravatarEnabled(boolean gravatarEnabled) {
+ this.gravatarEnabled = gravatarEnabled;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ if (serverUrl != null)
+ serverUrl = StringUtils.stripEnd(serverUrl, "/\\");
+ return true;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/ChildAwareMatcher.java b/gitplex.core/src/main/java/com/gitplex/core/util/ChildAwareMatcher.java
similarity index 81%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/ChildAwareMatcher.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/ChildAwareMatcher.java
index 7ac4d95ecd..9c928c30f8 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/ChildAwareMatcher.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/ChildAwareMatcher.java
@@ -1,25 +1,25 @@
-package com.pmease.gitplex.core.util;
-
-import com.pmease.commons.util.match.WildcardStringMatcher;
-
-/**
- * Besides the normal wildcard string match, this matcher also matches
- * paths beneath a parent path if the parent path ends with slash. For
- * instance, if the pattern is &quot;parent/&quot;, it will match value
- * &quot;parent/child&quot;
- *
- * @author robin
- *
- */
-public class ChildAwareMatcher extends WildcardStringMatcher {
-
- @Override
- public boolean matches(String rule, String value) {
- if (value.startsWith(rule) && rule.endsWith("/")) {
- return true;
- } else {
- return super.matches(rule, value);
- }
- }
-
-}
+package com.gitplex.core.util;
+
+import com.gitplex.commons.util.match.WildcardStringMatcher;
+
+/**
+ * Besides the normal wildcard string match, this matcher also matches
+ * paths beneath a parent path if the parent path ends with slash. For
+ * instance, if the pattern is &quot;parent/&quot;, it will match value
+ * &quot;parent/child&quot;
+ *
+ * @author robin
+ *
+ */
+public class ChildAwareMatcher extends WildcardStringMatcher {
+
+ @Override
+ public boolean matches(String rule, String value) {
+ if (value.startsWith(rule) && rule.endsWith("/")) {
+ return true;
+ } else {
+ return super.matches(rule, value);
+ }
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/ParentAwareMatcher.java b/gitplex.core/src/main/java/com/gitplex/core/util/ParentAwareMatcher.java
similarity index 96%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/ParentAwareMatcher.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/ParentAwareMatcher.java
index 8e59032801..be0d1923de 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/ParentAwareMatcher.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/ParentAwareMatcher.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.util;
+package com.gitplex.core.util;
/**
* Besides the normal child aware match, this matcher also matches
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/fullbranchmatch/FullBranchMatch.g4 b/gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatch.g4
similarity index 100%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/fullbranchmatch/FullBranchMatch.g4
rename to gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatch.g4
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java b/gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java
index 5b04882c18..43a314a532 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/fullbranchmatch/FullBranchMatchUtils.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.util.fullbranchmatch;
+package com.gitplex.core.util.fullbranchmatch;
import java.util.ArrayList;
import java.util.List;
@@ -10,14 +10,16 @@ import org.antlr.v4.runtime.BailErrorStrategy;
import org.antlr.v4.runtime.CommonTokenStream;
import org.apache.commons.lang3.StringUtils;
-import com.pmease.commons.util.match.IncludeExclude;
-import com.pmease.commons.util.match.Matcher;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.CriteriaContext;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.FullBranchMatchContext;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchParser.MatchContext;
+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;
+import com.gitplex.core.util.fullbranchmatch.FullBranchMatchLexer;
+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;
public class FullBranchMatchUtils {
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/includeexclude/IncludeExclude.g4 b/gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExclude.g4
similarity index 100%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/includeexclude/IncludeExclude.g4
rename to gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExclude.g4
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/includeexclude/IncludeExcludeUtils.java b/gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExcludeUtils.java
similarity index 79%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/includeexclude/IncludeExcludeUtils.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExcludeUtils.java
index af6c542b05..c678fb5944 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/includeexclude/IncludeExcludeUtils.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/includeexclude/IncludeExcludeUtils.java
@@ -1,48 +1,50 @@
-package com.pmease.gitplex.core.util.includeexclude;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.antlr.v4.runtime.ANTLRInputStream;
-import org.antlr.v4.runtime.BailErrorStrategy;
-import org.antlr.v4.runtime.CommonTokenStream;
-import org.antlr.v4.runtime.tree.TerminalNode;
-
-import com.pmease.commons.util.match.IncludeExclude;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser.CriteriaContext;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser.MatchContext;
-
-public class IncludeExcludeUtils {
-
- public static MatchContext parse(String match) {
- ANTLRInputStream is = new ANTLRInputStream(match);
- IncludeExcludeLexer lexer = new IncludeExcludeLexer(is);
- lexer.removeErrorListeners();
- CommonTokenStream tokens = new CommonTokenStream(lexer);
- IncludeExcludeParser parser = new IncludeExcludeParser(tokens);
- parser.removeErrorListeners();
- parser.setErrorHandler(new BailErrorStrategy());
- return parser.match();
- }
-
- public static String getValue(TerminalNode terminal) {
- String value = terminal.getText().substring(1);
- return value.substring(0, value.length()-1).trim();
- }
-
- public static IncludeExclude<String, String> getIncludeExclude(String match) {
- MatchContext matchContext = parse(match);
- List<String> includes = new ArrayList<>();
- List<String> excludes = new ArrayList<>();
- for (CriteriaContext criteriaContext: matchContext.criteria()) {
- if (criteriaContext.includeMatch() != null) {
- includes.add(getValue(criteriaContext.includeMatch().Value()));
- } else if (criteriaContext.excludeMatch() != null) {
- excludes.add(getValue(criteriaContext.excludeMatch().Value()));
- }
- }
-
- return new IncludeExclude<String, String>(includes, excludes);
- }
-
-}
+package com.gitplex.core.util.includeexclude;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.tree.TerminalNode;
+
+import com.gitplex.commons.util.match.IncludeExclude;
+import com.gitplex.core.util.includeexclude.IncludeExcludeLexer;
+import com.gitplex.core.util.includeexclude.IncludeExcludeParser;
+import com.gitplex.core.util.includeexclude.IncludeExcludeParser.CriteriaContext;
+import com.gitplex.core.util.includeexclude.IncludeExcludeParser.MatchContext;
+
+public class IncludeExcludeUtils {
+
+ public static MatchContext parse(String match) {
+ ANTLRInputStream is = new ANTLRInputStream(match);
+ IncludeExcludeLexer lexer = new IncludeExcludeLexer(is);
+ lexer.removeErrorListeners();
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ IncludeExcludeParser parser = new IncludeExcludeParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ return parser.match();
+ }
+
+ public static String getValue(TerminalNode terminal) {
+ String value = terminal.getText().substring(1);
+ return value.substring(0, value.length()-1).trim();
+ }
+
+ public static IncludeExclude<String, String> getIncludeExclude(String match) {
+ MatchContext matchContext = parse(match);
+ List<String> includes = new ArrayList<>();
+ List<String> excludes = new ArrayList<>();
+ for (CriteriaContext criteriaContext: matchContext.criteria()) {
+ if (criteriaContext.includeMatch() != null) {
+ includes.add(getValue(criteriaContext.includeMatch().Value()));
+ } else if (criteriaContext.excludeMatch() != null) {
+ excludes.add(getValue(criteriaContext.excludeMatch().Value()));
+ }
+ }
+
+ return new IncludeExclude<String, String>(includes, excludes);
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/markdown/MentionParser.java b/gitplex.core/src/main/java/com/gitplex/core/util/markdown/MentionParser.java
similarity index 83%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/markdown/MentionParser.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/markdown/MentionParser.java
index 195641fd25..1749cfda9c 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/markdown/MentionParser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/markdown/MentionParser.java
@@ -1,73 +1,73 @@
-package com.pmease.gitplex.core.util.markdown;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.TextNode;
-import org.jsoup.select.NodeTraversor;
-
-import com.google.common.collect.ImmutableSet;
-import com.pmease.commons.util.JsoupUtils;
-import com.pmease.commons.util.TextNodeVisitor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-
-public class MentionParser {
-
- private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");
-
- private static final Pattern PATTERN = Pattern.compile("(^|\\s+)@(\\S+)(?=($|\\s+))");
-
- public Collection<Account> parseMentions(String html) {
- return parseMentions(Jsoup.parseBodyFragment(html).body());
- }
-
- public Collection<Account> parseMentions(Element body) {
- Collection<Account> mentions = new HashSet<>();
-
- TextNodeVisitor visitor = new TextNodeVisitor() {
-
- @Override
- protected boolean isApplicable(TextNode node) {
- if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))
- return false;
-
- return node.getWholeText().contains("@"); // fast scan here, do pattern match later
- }
- };
-
- NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(body);
-
- AccountManager userManager = GitPlex.getInstance(AccountManager.class);
-
- for (TextNode node : visitor.getMatchedNodes()) {
- Matcher matcher = PATTERN.matcher(node.getWholeText());
- while (matcher.find()) {
- String userName = matcher.group(2);
- String userTag;
- Account user = userManager.findByName(userName);
- if (user != null) {
- mentions.add(user);
- userTag = toHtml(user);
- } else {
- userTag = "@" + userName;
- }
- JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + userTag + matcher.group(3));
- }
- JsoupUtils.appendTail(matcher, node);
- }
-
- return mentions;
- }
-
- protected String toHtml(Account user) {
- return "@" + user.getName();
- }
-
-}
+package com.gitplex.core.util.markdown;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.Jsoup;
+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;
+
+public class MentionParser {
+
+ private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");
+
+ private static final Pattern PATTERN = Pattern.compile("(^|\\s+)@(\\S+)(?=($|\\s+))");
+
+ public Collection<Account> parseMentions(String html) {
+ return parseMentions(Jsoup.parseBodyFragment(html).body());
+ }
+
+ public Collection<Account> parseMentions(Element body) {
+ Collection<Account> mentions = new HashSet<>();
+
+ TextNodeVisitor visitor = new TextNodeVisitor() {
+
+ @Override
+ protected boolean isApplicable(TextNode node) {
+ if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))
+ return false;
+
+ return node.getWholeText().contains("@"); // fast scan here, do pattern match later
+ }
+ };
+
+ NodeTraversor tranversor = new NodeTraversor(visitor);
+ tranversor.traverse(body);
+
+ AccountManager userManager = GitPlex.getInstance(AccountManager.class);
+
+ for (TextNode node : visitor.getMatchedNodes()) {
+ Matcher matcher = PATTERN.matcher(node.getWholeText());
+ while (matcher.find()) {
+ String userName = matcher.group(2);
+ String userTag;
+ Account user = userManager.findByName(userName);
+ if (user != null) {
+ mentions.add(user);
+ userTag = toHtml(user);
+ } else {
+ userTag = "@" + userName;
+ }
+ JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + userTag + matcher.group(3));
+ }
+ JsoupUtils.appendTail(matcher, node);
+ }
+
+ return mentions;
+ }
+
+ protected String toHtml(Account user) {
+ return "@" + user.getName();
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/markdown/PullRequestParser.java b/gitplex.core/src/main/java/com/gitplex/core/util/markdown/PullRequestParser.java
similarity index 84%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/markdown/PullRequestParser.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/markdown/PullRequestParser.java
index 89577ba756..7b57fd8929 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/markdown/PullRequestParser.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/markdown/PullRequestParser.java
@@ -1,73 +1,73 @@
-package com.pmease.gitplex.core.util.markdown;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Element;
-import org.jsoup.nodes.TextNode;
-import org.jsoup.select.NodeTraversor;
-
-import com.google.common.collect.ImmutableSet;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.util.JsoupUtils;
-import com.pmease.commons.util.TextNodeVisitor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequest;
-
-public class PullRequestParser {
-
- private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");
-
- private static final Pattern PATTERN = Pattern.compile("(^|\\s+)#(\\d+)(?=($|\\s+))");
-
- public Collection<PullRequest> parseRequests(String html) {
- return parseRequests(Jsoup.parseBodyFragment(html).body());
- }
-
- public Collection<PullRequest> parseRequests(Element body) {
- Collection<PullRequest> references = new HashSet<>();
-
- TextNodeVisitor visitor = new TextNodeVisitor() {
-
- @Override
- protected boolean isApplicable(TextNode node) {
- if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))
- return false;
-
- return node.getWholeText().contains("#"); // fast scan here, do pattern match later
- }
- };
-
- NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(body);
-
- Dao dao = GitPlex.getInstance(Dao.class);
-
- for (TextNode node : visitor.getMatchedNodes()) {
- Matcher matcher = PATTERN.matcher(node.getWholeText());
- while (matcher.find()) {
- Long requestId = Long.valueOf(matcher.group(2));
- String requestTag;
- PullRequest request = dao.get(PullRequest.class, requestId);
- if (request != null) {
- references.add(request);
- requestTag = toHtml(request);
- } else {
- requestTag = "#" + requestId;
- }
- JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + requestTag + matcher.group(3));
- }
- JsoupUtils.appendTail(matcher, node);
- }
-
- return references;
- }
-
- protected String toHtml(PullRequest request) {
- return "#" + request.getId();
- }
-
-}
+package com.gitplex.core.util.markdown;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.Jsoup;
+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;
+
+public class PullRequestParser {
+
+ private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");
+
+ private static final Pattern PATTERN = Pattern.compile("(^|\\s+)#(\\d+)(?=($|\\s+))");
+
+ public Collection<PullRequest> parseRequests(String html) {
+ return parseRequests(Jsoup.parseBodyFragment(html).body());
+ }
+
+ public Collection<PullRequest> parseRequests(Element body) {
+ Collection<PullRequest> references = new HashSet<>();
+
+ TextNodeVisitor visitor = new TextNodeVisitor() {
+
+ @Override
+ protected boolean isApplicable(TextNode node) {
+ if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))
+ return false;
+
+ return node.getWholeText().contains("#"); // fast scan here, do pattern match later
+ }
+ };
+
+ NodeTraversor tranversor = new NodeTraversor(visitor);
+ tranversor.traverse(body);
+
+ Dao dao = GitPlex.getInstance(Dao.class);
+
+ for (TextNode node : visitor.getMatchedNodes()) {
+ Matcher matcher = PATTERN.matcher(node.getWholeText());
+ while (matcher.find()) {
+ Long requestId = Long.valueOf(matcher.group(2));
+ String requestTag;
+ PullRequest request = dao.get(PullRequest.class, requestId);
+ if (request != null) {
+ references.add(request);
+ requestTag = toHtml(request);
+ } else {
+ requestTag = "#" + requestId;
+ }
+ JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + requestTag + matcher.group(3));
+ }
+ JsoupUtils.appendTail(matcher, node);
+ }
+
+ return references;
+ }
+
+ protected String toHtml(PullRequest request) {
+ return "#" + request.getId();
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountName.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountName.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountName.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountName.java
index 6cb02935e9..e6760936d7 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountName.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountName.java
@@ -1,21 +1,21 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=AccountNameValidator.class)
-public @interface AccountName {
-
- String message() default "";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
+package com.gitplex.core.util.validation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=AccountNameValidator.class)
+public @interface AccountName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountNameReservation.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameReservation.java
similarity index 51%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountNameReservation.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameReservation.java
index 236cb0b1df..09a420ea5a 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountNameReservation.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameReservation.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.util.Set;
-
-import com.pmease.commons.loader.ExtensionPoint;
-
-@ExtensionPoint
-public interface AccountNameReservation {
- Set<String> getReserved();
-}
+package com.gitplex.core.util.validation;
+
+import java.util.Set;
+
+import com.gitplex.commons.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface AccountNameReservation {
+ Set<String> getReserved();
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountNameValidator.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameValidator.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountNameValidator.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameValidator.java
index 36352cffb2..3c69fe1c9d 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/AccountNameValidator.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/AccountNameValidator.java
@@ -1,48 +1,48 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import com.pmease.gitplex.core.GitPlex;
-
-public class AccountNameValidator implements ConstraintValidator<AccountName, String> {
-
- private static Set<String> reservedNames;
-
- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
-
- public void initialize(AccountName constaintAnnotation) {
- }
-
- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value == null) {
- return true;
- } else if (!pattern.matcher(value).find()) {
- constraintContext.disableDefaultConstraintViolation();
- String message = "Only alphanumeric, underscore, dash, and dot are accepted";
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
- } else if (getReservedNames().contains(value)) {
- constraintContext.disableDefaultConstraintViolation();
- constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved name").addConstraintViolation();
- return false;
- } else {
- return true;
- }
- }
-
- public static synchronized Set<String> getReservedNames() {
- if (reservedNames == null) {
- reservedNames = new HashSet<>();
- for (AccountNameReservation each : GitPlex.getExtensions(AccountNameReservation.class)) {
- reservedNames.addAll(each.getReserved());
- }
- }
- return reservedNames;
- }
-
-}
+package com.gitplex.core.util.validation;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import com.gitplex.core.GitPlex;
+
+public class AccountNameValidator implements ConstraintValidator<AccountName, String> {
+
+ private static Set<String> reservedNames;
+
+ private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
+
+ public void initialize(AccountName constaintAnnotation) {
+ }
+
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else if (!pattern.matcher(value).find()) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "Only alphanumeric, underscore, dash, and dot are accepted";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else if (getReservedNames().contains(value)) {
+ constraintContext.disableDefaultConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved name").addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public static synchronized Set<String> getReservedNames() {
+ if (reservedNames == null) {
+ reservedNames = new HashSet<>();
+ for (AccountNameReservation each : GitPlex.getExtensions(AccountNameReservation.class)) {
+ reservedNames.addAll(each.getReserved());
+ }
+ }
+ return reservedNames;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotName.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotName.java
similarity index 88%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotName.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotName.java
index 57bd3dba6d..4846ee2edb 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotName.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotName.java
@@ -1,21 +1,21 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Constraint(validatedBy=DepotNameValidator.class)
-public @interface DepotName {
-
- String message() default "";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
+package com.gitplex.core.util.validation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=DepotNameValidator.class)
+public @interface DepotName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotNameReservation.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameReservation.java
similarity index 50%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotNameReservation.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameReservation.java
index 09d9f6d6c1..2ab1b55203 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotNameReservation.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameReservation.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.util.Set;
-
-import com.pmease.commons.loader.ExtensionPoint;
-
-@ExtensionPoint
-public interface DepotNameReservation {
- Set<String> getReserved();
-}
+package com.gitplex.core.util.validation;
+
+import java.util.Set;
+
+import com.gitplex.commons.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface DepotNameReservation {
+ Set<String> getReserved();
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotNameValidator.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameValidator.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotNameValidator.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameValidator.java
index d823c06926..49fdfe95e0 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/DepotNameValidator.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/DepotNameValidator.java
@@ -1,47 +1,47 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import com.pmease.gitplex.core.GitPlex;
-
-public class DepotNameValidator implements ConstraintValidator<DepotName, String> {
-
- private static Set<String> reservedNames;
-
- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
-
- public void initialize(DepotName constaintAnnotation) {
- }
-
- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value == null) {
- return true;
- } else if (!pattern.matcher(value).find()) {
- constraintContext.disableDefaultConstraintViolation();
- String message = "Only alphanumeric, underscore, dash, and dot are accepted";
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
- } else if (getReservedNames().contains(value)) {
- constraintContext.disableDefaultConstraintViolation();
- constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved word").addConstraintViolation();
- return false;
- } else {
- return true;
- }
- }
-
- public static synchronized Set<String> getReservedNames() {
- if (reservedNames == null) {
- reservedNames = new HashSet<>();
- for (DepotNameReservation each : GitPlex.getExtensions(DepotNameReservation.class)) {
- reservedNames.addAll(each.getReserved());
- }
- }
- return reservedNames;
- }
-}
+package com.gitplex.core.util.validation;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import com.gitplex.core.GitPlex;
+
+public class DepotNameValidator implements ConstraintValidator<DepotName, String> {
+
+ private static Set<String> reservedNames;
+
+ private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
+
+ public void initialize(DepotName constaintAnnotation) {
+ }
+
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else if (!pattern.matcher(value).find()) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "Only alphanumeric, underscore, dash, and dot are accepted";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else if (getReservedNames().contains(value)) {
+ constraintContext.disableDefaultConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved word").addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public static synchronized Set<String> getReservedNames() {
+ if (reservedNames == null) {
+ reservedNames = new HashSet<>();
+ for (DepotNameReservation each : GitPlex.getExtensions(DepotNameReservation.class)) {
+ reservedNames.addAll(each.getReserved());
+ }
+ }
+ return reservedNames;
+ }
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamName.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamName.java
similarity index 82%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamName.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamName.java
index 559680c7c8..0bfc2ffcf9 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamName.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamName.java
@@ -1,24 +1,24 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import javax.validation.Constraint;
-import javax.validation.Payload;
-
-import com.pmease.commons.validation.Name;
-
-@Target({ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-@Name
-@Constraint(validatedBy=TeamNameValidator.class)
-public @interface TeamName {
-
- String message() default "";
-
- Class<?>[] groups() default {};
-
- Class<? extends Payload>[] payload() default {};
-}
+package com.gitplex.core.util.validation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import com.gitplex.commons.validation.Name;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Name
+@Constraint(validatedBy=TeamNameValidator.class)
+public @interface TeamName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamNameReservation.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameReservation.java
similarity index 50%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamNameReservation.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameReservation.java
index 6ff7125d9c..327185e981 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamNameReservation.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameReservation.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.util.Set;
-
-import com.pmease.commons.loader.ExtensionPoint;
-
-@ExtensionPoint
-public interface TeamNameReservation {
- Set<String> getReserved();
-}
+package com.gitplex.core.util.validation;
+
+import java.util.Set;
+
+import com.gitplex.commons.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface TeamNameReservation {
+ Set<String> getReserved();
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamNameValidator.java b/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameValidator.java
similarity index 91%
rename from gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamNameValidator.java
rename to gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameValidator.java
index a27e28754d..ca8efacda5 100644
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/util/validation/TeamNameValidator.java
+++ b/gitplex.core/src/main/java/com/gitplex/core/util/validation/TeamNameValidator.java
@@ -1,48 +1,48 @@
-package com.pmease.gitplex.core.util.validation;
-
-import java.util.HashSet;
-import java.util.Set;
-import java.util.regex.Pattern;
-
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
-import com.pmease.gitplex.core.GitPlex;
-
-public class TeamNameValidator implements ConstraintValidator<TeamName, String> {
-
- private static Set<String> reservedNames;
-
- private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
-
- public void initialize(TeamName constaintAnnotation) {
- }
-
- public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
- if (value == null) {
- return true;
- } else if (!pattern.matcher(value).find()) {
- constraintContext.disableDefaultConstraintViolation();
- String message = "Only alphanumeric, underscore, dash, and dot are accepted";
- constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
- return false;
- } else if (getReservedNames().contains(value)) {
- constraintContext.disableDefaultConstraintViolation();
- constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved word").addConstraintViolation();
- return false;
- } else {
- return true;
- }
- }
-
- public static synchronized Set<String> getReservedNames() {
- if (reservedNames == null) {
- reservedNames = new HashSet<>();
- for (TeamNameReservation each : GitPlex.getExtensions(TeamNameReservation.class)) {
- reservedNames.addAll(each.getReserved());
- }
- }
- return reservedNames;
- }
-
-}
+package com.gitplex.core.util.validation;
+
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import com.gitplex.core.GitPlex;
+
+public class TeamNameValidator implements ConstraintValidator<TeamName, String> {
+
+ private static Set<String> reservedNames;
+
+ private static Pattern pattern = Pattern.compile("^[\\w-\\.]+$");
+
+ public void initialize(TeamName constaintAnnotation) {
+ }
+
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else if (!pattern.matcher(value).find()) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = "Only alphanumeric, underscore, dash, and dot are accepted";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else if (getReservedNames().contains(value)) {
+ constraintContext.disableDefaultConstraintViolation();
+ constraintContext.buildConstraintViolationWithTemplate(value + " is a reserved word").addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ public static synchronized Set<String> getReservedNames() {
+ if (reservedNames == null) {
+ reservedNames = new HashSet<>();
+ for (TeamNameReservation each : GitPlex.getExtensions(TeamNameReservation.class)) {
+ reservedNames.addAll(each.getReserved());
+ }
+ }
+ return reservedNames;
+ }
+
+}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreModule.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreModule.java
deleted file mode 100644
index 4dc123ecf6..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/CoreModule.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.pmease.gitplex.core;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.hibernate.boot.model.naming.PhysicalNamingStrategy;
-
-import com.google.common.collect.Sets;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.git.GitConfig;
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.hibernate.EntityValidator;
-import com.pmease.commons.hibernate.ModelProvider;
-import com.pmease.commons.hibernate.PersistManager;
-import com.pmease.commons.hibernate.PrefixedNamingStrategy;
-import com.pmease.commons.hibernate.migration.Migrator;
-import com.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.commons.loader.AbstractPlugin;
-import com.pmease.commons.loader.AbstractPluginModule;
-import com.pmease.commons.loader.ImplementationProvider;
-import com.pmease.commons.shiro.AbstractRealm;
-import com.pmease.commons.util.ClassUtils;
-import com.pmease.gitplex.core.commitmessagetransform.CommitMessageTransformer;
-import com.pmease.gitplex.core.commitmessagetransform.PatternCommitMessageTransformer;
-import com.pmease.gitplex.core.entity.EntityLocator;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.AttachmentManager;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.BranchWatchManager;
-import com.pmease.gitplex.core.manager.CodeCommentInfoManager;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.CodeCommentRelationManager;
-import com.pmease.gitplex.core.manager.CodeCommentReplyManager;
-import com.pmease.gitplex.core.manager.CodeCommentStatusChangeManager;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.DataManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.manager.PullRequestCommentManager;
-import com.pmease.gitplex.core.manager.PullRequestInfoManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestTaskManager;
-import com.pmease.gitplex.core.manager.PullRequestReferenceManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewInvitationManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewManager;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
-import com.pmease.gitplex.core.manager.PullRequestUpdateManager;
-import com.pmease.gitplex.core.manager.PullRequestVerificationManager;
-import com.pmease.gitplex.core.manager.PullRequestWatchManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.TeamAuthorizationManager;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.manager.WorkExecutor;
-import com.pmease.gitplex.core.manager.impl.DefaultAccountManager;
-import com.pmease.gitplex.core.manager.impl.DefaultAttachmentManager;
-import com.pmease.gitplex.core.manager.impl.DefaultBatchWorkManager;
-import com.pmease.gitplex.core.manager.impl.DefaultBranchWatchManager;
-import com.pmease.gitplex.core.manager.impl.DefaultCodeCommentInfoManager;
-import com.pmease.gitplex.core.manager.impl.DefaultCodeCommentManager;
-import com.pmease.gitplex.core.manager.impl.DefaultCodeCommentRelationManager;
-import com.pmease.gitplex.core.manager.impl.DefaultCodeCommentReplyManager;
-import com.pmease.gitplex.core.manager.impl.DefaultCodeCommentStatusChangeManager;
-import com.pmease.gitplex.core.manager.impl.DefaultCommitInfoManager;
-import com.pmease.gitplex.core.manager.impl.DefaultConfigManager;
-import com.pmease.gitplex.core.manager.impl.DefaultDataManager;
-import com.pmease.gitplex.core.manager.impl.DefaultDepotManager;
-import com.pmease.gitplex.core.manager.impl.DefaultMailManager;
-import com.pmease.gitplex.core.manager.impl.DefaultOrganizationMembershipManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestCommentManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestInfoManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestTaskManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestReferenceManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestReviewInvitationManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestReviewManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestStatusChangeManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestUpdateManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestVerificationManager;
-import com.pmease.gitplex.core.manager.impl.DefaultPullRequestWatchManager;
-import com.pmease.gitplex.core.manager.impl.DefaultStorageManager;
-import com.pmease.gitplex.core.manager.impl.DefaultTeamAuthorizationManager;
-import com.pmease.gitplex.core.manager.impl.DefaultTeamManager;
-import com.pmease.gitplex.core.manager.impl.DefaultTeamMembershipManager;
-import com.pmease.gitplex.core.manager.impl.DefaultUserAuthorizationManager;
-import com.pmease.gitplex.core.manager.impl.DefaultVisitInfoManager;
-import com.pmease.gitplex.core.manager.impl.DefaultWorkExecutor;
-import com.pmease.gitplex.core.migration.DatabaseMigrator;
-import com.pmease.gitplex.core.security.SecurityRealm;
-import com.pmease.gitplex.core.setting.SpecifiedGit;
-import com.pmease.gitplex.core.setting.SystemGit;
-import com.pmease.gitplex.core.util.validation.AccountNameReservation;
-import com.pmease.gitplex.core.util.validation.DepotNameReservation;
-
-/**
- * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
- *
- */
-public class CoreModule extends AbstractPluginModule {
-
- @Override
- protected void configure() {
- super.configure();
-
- bind(Migrator.class).to(DatabaseMigrator.class);
-
- bind(PhysicalNamingStrategy.class).toInstance(new PrefixedNamingStrategy("g_"));
-
- contribute(ModelProvider.class, new ModelProvider() {
-
- @Override
- public Collection<Class<? extends AbstractEntity>> getModelClasses() {
- Collection<Class<? extends AbstractEntity>> modelClasses =
- new HashSet<Class<? extends AbstractEntity>>();
- modelClasses.addAll(ClassUtils.findImplementations(AbstractEntity.class, EntityLocator.class));
- return modelClasses;
- }
-
- });
-
- /*
- * Contribute empty reservations to avoid Guice complain
- */
- contribute(AccountNameReservation.class, new AccountNameReservation() {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet();
- }
- });
-
- /*
- * Contribute empty reservations to avoid Guice complain
- */
- contribute(DepotNameReservation.class, new DepotNameReservation() {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet();
- }
- });
-
- contribute(ServletConfigurator.class, CoreServletConfigurator.class);
-
- contribute(ImplementationProvider.class, new ImplementationProvider() {
-
- @Override
- public Collection<Class<?>> getImplementations() {
- Collection<Class<?>> implementations = new HashSet<Class<?>>();
- implementations.add(SystemGit.class);
- implementations.add(SpecifiedGit.class);
- return implementations;
- }
-
- @Override
- public Class<?> getAbstractClass() {
- return GitConfig.class;
- }
- });
-
- contribute(CommitMessageTransformer.class, PatternCommitMessageTransformer.class);
-
- bind(GitConfig.class).toProvider(GitConfigProvider.class);
-
- /*
- * Declare bindings explicitly instead of using ImplementedBy annotation as
- * HK2 to guice bridge can only search in explicit bindings in Guice
- */
- bind(StorageManager.class).to(DefaultStorageManager.class);
- bind(ConfigManager.class).to(DefaultConfigManager.class);
- bind(DataManager.class).to(DefaultDataManager.class);
- bind(PullRequestCommentManager.class).to(DefaultPullRequestCommentManager.class);
- bind(CodeCommentManager.class).to(DefaultCodeCommentManager.class);
- bind(PullRequestManager.class).to(DefaultPullRequestManager.class);
- bind(PullRequestUpdateManager.class).to(DefaultPullRequestUpdateManager.class);
- bind(DepotManager.class).to(DefaultDepotManager.class);
- bind(AccountManager.class).to(DefaultAccountManager.class);
- bind(PullRequestVerificationManager.class).to(DefaultPullRequestVerificationManager.class);
- bind(PullRequestReviewInvitationManager.class).to(DefaultPullRequestReviewInvitationManager.class);
- bind(PullRequestReviewManager.class).to(DefaultPullRequestReviewManager.class);
- bind(MailManager.class).to(DefaultMailManager.class);
- bind(BranchWatchManager.class).to(DefaultBranchWatchManager.class);
- bind(PullRequestTaskManager.class).to(DefaultPullRequestTaskManager.class);
- bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);
- bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
- bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);
- bind(CodeCommentInfoManager.class).to(DefaultCodeCommentInfoManager.class);
- bind(VisitInfoManager.class).to(DefaultVisitInfoManager.class);
- bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
- bind(TeamManager.class).to(DefaultTeamManager.class);
- bind(OrganizationMembershipManager.class).to(DefaultOrganizationMembershipManager.class);
- bind(TeamMembershipManager.class).to(DefaultTeamMembershipManager.class);
- bind(TeamAuthorizationManager.class).to(DefaultTeamAuthorizationManager.class);
- bind(UserAuthorizationManager.class).to(DefaultUserAuthorizationManager.class);
- bind(PullRequestStatusChangeManager.class).to(DefaultPullRequestStatusChangeManager.class);
- bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
- bind(AttachmentManager.class).to(DefaultAttachmentManager.class);
- bind(CodeCommentRelationManager.class).to(DefaultCodeCommentRelationManager.class);
- bind(CodeCommentStatusChangeManager.class).to(DefaultCodeCommentStatusChangeManager.class);
- bind(PullRequestReferenceManager.class).to(DefaultPullRequestReferenceManager.class);
- bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
-
- bind(AbstractRealm.class).to(SecurityRealm.class);
-
- bind(EntityValidator.class).to(CoreEntityValidator.class);
-
- if (Bootstrap.command != null
- && Bootstrap.command.getName().equals("reset_admin_password")) {
- bind(PersistManager.class).to(ResetAdminPasswordCommand.class);
- }
- }
-
- @Override
- protected Class<? extends AbstractPlugin> getPluginClass() {
- return GitPlex.class;
- }
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/commitmessagetransform/CommitMessageTransformer.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/commitmessagetransform/CommitMessageTransformer.java
deleted file mode 100644
index c7f22b68be..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/commitmessagetransform/CommitMessageTransformer.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.pmease.gitplex.core.commitmessagetransform;
-
-import com.pmease.commons.loader.ExtensionPoint;
-import com.pmease.gitplex.core.entity.Depot;
-
-@ExtensionPoint
-public interface CommitMessageTransformer {
-
- String transform(Depot depot, String commitMessage);
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/EntityLocator.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/EntityLocator.java
deleted file mode 100644
index 0cf1c8b844..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/entity/EntityLocator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.core.entity;
-
-public class EntityLocator {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStarted.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStarted.java
deleted file mode 100644
index c0e990fe60..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStarted.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.core.event.lifecycle;
-
-public class SystemStarted {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStarting.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStarting.java
deleted file mode 100644
index d801d2c4bc..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStarting.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.core.event.lifecycle;
-
-public class SystemStarting {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStopped.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStopped.java
deleted file mode 100644
index 21dbbb8110..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStopped.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.core.event.lifecycle;
-
-public class SystemStopped {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStopping.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStopping.java
deleted file mode 100644
index 31999be937..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/event/lifecycle/SystemStopping.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.core.event.lifecycle;
-
-public class SystemStopping {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/BatchWorkManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/BatchWorkManager.java
deleted file mode 100644
index 493cfdca32..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/BatchWorkManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
-
-public interface BatchWorkManager {
-
- void submit(BatchWorker worker, Prioritized work);
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/BranchWatchManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/BranchWatchManager.java
deleted file mode 100644
index deeb0528e8..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/BranchWatchManager.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import java.util.Collection;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.BranchWatch;
-import com.pmease.gitplex.core.entity.Depot;
-
-public interface BranchWatchManager extends EntityManager<BranchWatch> {
-
- Collection<BranchWatch> find(Account user, Depot depot);
-
- Collection<BranchWatch> find(Depot depot, String branch);
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentRelationManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentRelationManager.java
deleted file mode 100644
index bce6a46d43..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentRelationManager.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import java.util.List;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentRelation;
-import com.pmease.gitplex.core.entity.PullRequest;
-
-public interface CodeCommentRelationManager extends EntityManager<CodeCommentRelation> {
-
- /**
- * Get code comments related to specified pull request, ordered by id descendantly
- */
- List<CodeComment> findCodeComments(PullRequest request);
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentReplyManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentReplyManager.java
deleted file mode 100644
index 1bc3497a5a..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentReplyManager.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.CodeCommentReply;
-
-public interface CodeCommentReplyManager extends EntityManager<CodeCommentReply> {
-
- void save(CodeCommentReply reply, boolean callListeners);
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentStatusChangeManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentStatusChangeManager.java
deleted file mode 100644
index d9812f6531..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/CodeCommentStatusChangeManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-
-public interface CodeCommentStatusChangeManager extends EntityManager<CodeCommentStatusChange> {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReferenceManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReferenceManager.java
deleted file mode 100644
index 12089733c1..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestReferenceManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.PullRequestReference;
-
-public interface PullRequestReferenceManager extends EntityManager<PullRequestReference> {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestStatusChangeManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestStatusChangeManager.java
deleted file mode 100644
index 45ff773263..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestStatusChangeManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-
-public interface PullRequestStatusChangeManager extends EntityManager<PullRequestStatusChange> {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestTaskManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestTaskManager.java
deleted file mode 100644
index 5c32b911f7..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestTaskManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.PullRequestTask;
-
-public interface PullRequestTaskManager extends EntityManager<PullRequestTask> {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestWatchManager.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestWatchManager.java
deleted file mode 100644
index e5a80a95a7..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/manager/PullRequestWatchManager.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.pmease.gitplex.core.manager;
-
-import com.pmease.commons.hibernate.dao.EntityManager;
-import com.pmease.gitplex.core.entity.PullRequestWatch;
-
-public interface PullRequestWatchManager extends EntityManager<PullRequestWatch> {
-
-}
diff --git a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/AccountBelonging.java b/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/AccountBelonging.java
deleted file mode 100644
index c448d61342..0000000000
--- a/gitplex.core/src/main/java/com/pmease/gitplex/core/security/protectedobject/AccountBelonging.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.pmease.gitplex.core.security.protectedobject;
-
-import com.pmease.gitplex.core.entity.Account;
-
-public interface AccountBelonging extends ProtectedObject {
- Account getAccount();
-}
diff --git a/gitplex.core/src/main/resources/archetype-resource/pom.xml b/gitplex.core/src/main/resources/archetype-resource/pom.xml
index b4f8a999c6..9de1e4efaa 100644
--- a/gitplex.core/src/main/resources/archetype-resource/pom.xml
+++ b/gitplex.core/src/main/resources/archetype-resource/pom.xml
@@ -1,13 +1,13 @@
<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>
-#if (\${groupId} != "com.pmease")
+#if (\${groupId} != "com.gitplex")
<groupId>\${groupId}</groupId>
#end
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
@@ -15,7 +15,7 @@
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -37,8 +37,8 @@
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -49,7 +49,7 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
diff --git a/gitplex.core/src/main/resources/archetype-resource/src/main/java/Plugin.java b/gitplex.core/src/main/resources/archetype-resource/src/main/java/Plugin.java
index da8842a8e2..82fb445067 100644
--- a/gitplex.core/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ b/gitplex.core/src/main/resources/archetype-resource/src/main/java/Plugin.java
@@ -1,7 +1,7 @@
package ${package};
import java.util.Collection;
-import com.pmease.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPlugin;
public class Plugin extends AbstractPlugin {
diff --git a/gitplex.core/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/gitplex.core/src/main/resources/archetype-resource/src/main/java/PluginModule.java
index d566c299ba..9ad2374240 100644
--- a/gitplex.core/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ b/gitplex.core/src/main/resources/archetype-resource/src/main/java/PluginModule.java
@@ -1,7 +1,7 @@
package ${package};
-import com.pmease.commons.loader.AbstractPlugin;
-import com.pmease.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/gitplex.core/src/test/java/com/pmease/gitplex/core/model/PullRequestTest.java b/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestTest.java
similarity index 92%
rename from gitplex.core/src/test/java/com/pmease/gitplex/core/model/PullRequestTest.java
rename to gitplex.core/src/test/java/com/gitplex/core/model/PullRequestTest.java
index 5d9f4ed290..52e03a4281 100644
--- a/gitplex.core/src/test/java/com/pmease/gitplex/core/model/PullRequestTest.java
+++ b/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestTest.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.model;
+package com.gitplex.core.model;
import java.io.File;
@@ -8,12 +8,12 @@ import org.junit.Test;
import org.mockito.Matchers;
import org.mockito.Mockito;
-import com.pmease.commons.git.AbstractGitTest;
-import com.pmease.commons.loader.AppLoader;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.manager.DepotManager;
+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;
public class PullRequestTest extends AbstractGitTest {
diff --git a/gitplex.core/src/test/java/com/pmease/gitplex/core/model/PullRequestUpdateTest.java b/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestUpdateTest.java
similarity index 96%
rename from gitplex.core/src/test/java/com/pmease/gitplex/core/model/PullRequestUpdateTest.java
rename to gitplex.core/src/test/java/com/gitplex/core/model/PullRequestUpdateTest.java
index a183fb3975..ddd74a3d2d 100644
--- a/gitplex.core/src/test/java/com/pmease/gitplex/core/model/PullRequestUpdateTest.java
+++ b/gitplex.core/src/test/java/com/gitplex/core/model/PullRequestUpdateTest.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.core.model;
+package com.gitplex.core.model;
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.pmease.commons.git.AbstractGitTest;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
+import com.gitplex.commons.git.AbstractGitTest;
+import com.gitplex.commons.git.GitUtils;
public class PullRequestUpdateTest extends AbstractGitTest {
diff --git a/gitplex.http/pom.xml b/gitplex.http/pom.xml
index e25104666a..950ab953e3 100644
--- a/gitplex.http/pom.xml
+++ b/gitplex.http/pom.xml
@@ -5,14 +5,14 @@
<artifactId>gitplex.http</artifactId>
<version>1.0.6</version>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<!-- Uncomment below if you'd like to publish an archetype based on your plugin -->
@@ -29,20 +29,20 @@
</build>
<dependencies>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.loader</artifactId>
<version>1.0.34</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.core</artifactId>
<version>1.0.37</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -53,10 +53,10 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
<properties>
- <moduleClass>com.pmease.gitplex.http.HttpModule</moduleClass>
+ <moduleClass>com.gitplex.http.HttpModule</moduleClass>
</properties>
</project>
diff --git a/gitplex.http/src/main/java/com/pmease/gitplex/http/GitFilter.java b/gitplex.http/src/main/java/com/gitplex/http/GitFilter.java
similarity index 91%
rename from gitplex.http/src/main/java/com/pmease/gitplex/http/GitFilter.java
rename to gitplex.http/src/main/java/com/gitplex/http/GitFilter.java
index d44219b37d..439ba643a6 100644
--- a/gitplex.http/src/main/java/com/pmease/gitplex/http/GitFilter.java
+++ b/gitplex.http/src/main/java/com/gitplex/http/GitFilter.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.http;
+package com.gitplex.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.pmease.commons.git.command.AdvertiseReceiveRefsCommand;
-import com.pmease.commons.git.command.AdvertiseUploadRefsCommand;
-import com.pmease.commons.git.command.ReceiveCommand;
-import com.pmease.commons.git.command.UploadCommand;
-import com.pmease.commons.git.exception.GitException;
-import com.pmease.commons.util.concurrent.PrioritizedRunnable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.WorkExecutor;
-import com.pmease.gitplex.core.security.ObjectPermission;
-import com.pmease.gitplex.core.setting.ServerConfig;
+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;
@Singleton
public class GitFilter implements Filter {
diff --git a/gitplex.http/src/main/java/com/pmease/gitplex/http/HttpModule.java b/gitplex.http/src/main/java/com/gitplex/http/HttpModule.java
similarity index 82%
rename from gitplex.http/src/main/java/com/pmease/gitplex/http/HttpModule.java
rename to gitplex.http/src/main/java/com/gitplex/http/HttpModule.java
index 5c31f392c6..07c5c28666 100644
--- a/gitplex.http/src/main/java/com/pmease/gitplex/http/HttpModule.java
+++ b/gitplex.http/src/main/java/com/gitplex/http/HttpModule.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.http;
+package com.gitplex.http;
import org.apache.shiro.web.filter.mgt.FilterChainManager;
-import com.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.commons.loader.AbstractPluginModule;
-import com.pmease.commons.shiro.FilterChainConfigurator;
+import com.gitplex.commons.jetty.ServletConfigurator;
+import com.gitplex.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.shiro.FilterChainConfigurator;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/gitplex.http/src/main/java/com/pmease/gitplex/http/HttpServletConfigurator.java b/gitplex.http/src/main/java/com/gitplex/http/HttpServletConfigurator.java
similarity index 92%
rename from gitplex.http/src/main/java/com/pmease/gitplex/http/HttpServletConfigurator.java
rename to gitplex.http/src/main/java/com/gitplex/http/HttpServletConfigurator.java
index dc548d2365..08335d4812 100644
--- a/gitplex.http/src/main/java/com/pmease/gitplex/http/HttpServletConfigurator.java
+++ b/gitplex.http/src/main/java/com/gitplex/http/HttpServletConfigurator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.http;
+package com.gitplex.http;
import java.util.EnumSet;
@@ -9,7 +9,7 @@ import javax.servlet.DispatcherType;
import org.eclipse.jetty.servlet.FilterHolder;
import org.eclipse.jetty.servlet.ServletContextHandler;
-import com.pmease.commons.jetty.ServletConfigurator;
+import com.gitplex.commons.jetty.ServletConfigurator;
@Singleton
public class HttpServletConfigurator implements ServletConfigurator {
diff --git a/gitplex.http/src/main/resources/archetype-resource/pom.xml b/gitplex.http/src/main/resources/archetype-resource/pom.xml
index b4f8a999c6..9de1e4efaa 100644
--- a/gitplex.http/src/main/resources/archetype-resource/pom.xml
+++ b/gitplex.http/src/main/resources/archetype-resource/pom.xml
@@ -1,13 +1,13 @@
<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>
-#if (\${groupId} != "com.pmease")
+#if (\${groupId} != "com.gitplex")
<groupId>\${groupId}</groupId>
#end
<artifactId>\${artifactId}</artifactId>
<version>\${version}</version>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
@@ -15,7 +15,7 @@
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -37,8 +37,8 @@
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -49,7 +49,7 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
diff --git a/gitplex.http/src/main/resources/archetype-resource/src/main/java/Plugin.java b/gitplex.http/src/main/resources/archetype-resource/src/main/java/Plugin.java
index da8842a8e2..82fb445067 100644
--- a/gitplex.http/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ b/gitplex.http/src/main/resources/archetype-resource/src/main/java/Plugin.java
@@ -1,7 +1,7 @@
package ${package};
import java.util.Collection;
-import com.pmease.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPlugin;
public class Plugin extends AbstractPlugin {
diff --git a/gitplex.http/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/gitplex.http/src/main/resources/archetype-resource/src/main/java/PluginModule.java
index d566c299ba..9ad2374240 100644
--- a/gitplex.http/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ b/gitplex.http/src/main/resources/archetype-resource/src/main/java/PluginModule.java
@@ -1,7 +1,7 @@
package ${package};
-import com.pmease.commons.loader.AbstractPlugin;
-import com.pmease.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/gitplex.product/pom.xml b/gitplex.product/pom.xml
index 56ee479837..bc0583b3fb 100644
--- a/gitplex.product/pom.xml
+++ b/gitplex.product/pom.xml
@@ -5,7 +5,7 @@
<artifactId>gitplex</artifactId>
<name>GitPlex</name>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
@@ -21,7 +21,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
<executions>
<execution>
@@ -62,7 +62,7 @@
<gant file="build/prepare_package.gant">
<definition name="buildDirectory" value="${project.build.directory}"/>
<definition name="outputDirectory" value="${project.build.outputDirectory}"/>
- <definition name="jswPath" value="${com.pmease:commons.jsw:jar}"/>
+ <definition name="jswPath" value="${com.gitplex:commons.jsw:jar}"/>
<definition name="productId" value="${project.artifactId}"/>
<definition name="productName" value="${project.name}"/>
<definition name="bootstrapClass" value="${bootstrapClass}"/>
@@ -93,55 +93,55 @@
</build>
<dependencies>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.jsw</artifactId>
<version>1.0.33</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.core</artifactId>
<version>1.0.37</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.web</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.loader</artifactId>
<version>1.0.34</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.git</artifactId>
<version>1.0.6</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.rest</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.http</artifactId>
<version>1.0.6</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.search</artifactId>
<version>1.0.6</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -152,13 +152,13 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
<properties>
<executables>bin/*.sh, boot/wrapper-*</executables>
- <bootstrapClass>com.pmease.commons.bootstrap.Bootstrap</bootstrapClass>
- <moduleClass>com.pmease.gitplex.product.ProductModule</moduleClass>
+ <bootstrapClass>com.gitplex.commons.bootstrap.Bootstrap</bootstrapClass>
+ <moduleClass>com.gitplex.product.ProductModule</moduleClass>
<aggregation>true</aggregation>
</properties>
<version>1.0-EAP-build3</version>
diff --git a/gitplex.product/src/main/java/com/pmease/gitplex/product/DefaultServerConfig.java b/gitplex.product/src/main/java/com/gitplex/product/DefaultServerConfig.java
similarity index 92%
rename from gitplex.product/src/main/java/com/pmease/gitplex/product/DefaultServerConfig.java
rename to gitplex.product/src/main/java/com/gitplex/product/DefaultServerConfig.java
index 2874a4f3c5..4feffde2c4 100644
--- a/gitplex.product/src/main/java/com/pmease/gitplex/product/DefaultServerConfig.java
+++ b/gitplex.product/src/main/java/com/gitplex/product/DefaultServerConfig.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.product;
+package com.gitplex.product;
import java.io.File;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.setting.ServerConfig;
-import com.pmease.gitplex.core.setting.SslConfig;
+import com.gitplex.core.setting.ServerConfig;
+import com.gitplex.core.setting.SslConfig;
+import com.gitplex.commons.bootstrap.Bootstrap;
+import com.gitplex.commons.util.StringUtils;
@Singleton
public class DefaultServerConfig implements ServerConfig {
diff --git a/gitplex.product/src/main/java/com/pmease/gitplex/product/ProductConfigurator.java b/gitplex.product/src/main/java/com/gitplex/product/ProductConfigurator.java
similarity index 87%
rename from gitplex.product/src/main/java/com/pmease/gitplex/product/ProductConfigurator.java
rename to gitplex.product/src/main/java/com/gitplex/product/ProductConfigurator.java
index 90844115a1..83d42922fa 100644
--- a/gitplex.product/src/main/java/com/pmease/gitplex/product/ProductConfigurator.java
+++ b/gitplex.product/src/main/java/com/gitplex/product/ProductConfigurator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.product;
+package com.gitplex.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.pmease.commons.jetty.ServerConfigurator;
-import com.pmease.gitplex.core.setting.ServerConfig;
-import com.pmease.gitplex.core.setting.SslConfig;
+import com.gitplex.core.setting.ServerConfig;
+import com.gitplex.core.setting.SslConfig;
+import com.gitplex.commons.jetty.ServerConfigurator;
public class ProductConfigurator implements ServerConfigurator {
diff --git a/gitplex.product/src/main/java/com/pmease/gitplex/product/ProductModule.java b/gitplex.product/src/main/java/com/gitplex/product/ProductModule.java
similarity index 70%
rename from gitplex.product/src/main/java/com/pmease/gitplex/product/ProductModule.java
rename to gitplex.product/src/main/java/com/gitplex/product/ProductModule.java
index 1736543125..b0c3b352a7 100644
--- a/gitplex.product/src/main/java/com/pmease/gitplex/product/ProductModule.java
+++ b/gitplex.product/src/main/java/com/gitplex/product/ProductModule.java
@@ -1,17 +1,17 @@
-package com.pmease.gitplex.product;
+package com.gitplex.product;
import java.io.File;
import org.hibernate.cfg.Environment;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.hibernate.HibernateProperties;
-import com.pmease.commons.jetty.ServerConfigurator;
-import com.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.commons.loader.AbstractPluginModule;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.setting.ServerConfig;
+import com.gitplex.core.setting.ServerConfig;
+import com.gitplex.commons.bootstrap.Bootstrap;
+import com.gitplex.commons.hibernate.HibernateProperties;
+import com.gitplex.commons.jetty.ServerConfigurator;
+import com.gitplex.commons.jetty.ServletConfigurator;
+import com.gitplex.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.util.FileUtils;
+import com.gitplex.commons.util.StringUtils;
public class ProductModule extends AbstractPluginModule {
diff --git a/gitplex.product/src/main/java/com/pmease/gitplex/product/ProductServletConfigurator.java b/gitplex.product/src/main/java/com/gitplex/product/ProductServletConfigurator.java
similarity index 79%
rename from gitplex.product/src/main/java/com/pmease/gitplex/product/ProductServletConfigurator.java
rename to gitplex.product/src/main/java/com/gitplex/product/ProductServletConfigurator.java
index ce4c16c9d4..f5cc0ca0b8 100644
--- a/gitplex.product/src/main/java/com/pmease/gitplex/product/ProductServletConfigurator.java
+++ b/gitplex.product/src/main/java/com/gitplex/product/ProductServletConfigurator.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.product;
+package com.gitplex.product;
import javax.inject.Inject;
import org.eclipse.jetty.servlet.ServletContextHandler;
import org.eclipse.jetty.servlet.ServletHolder;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.jetty.FileAssetServlet;
-import com.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.gitplex.core.setting.ServerConfig;
+import com.gitplex.core.setting.ServerConfig;
+import com.gitplex.commons.bootstrap.Bootstrap;
+import com.gitplex.commons.jetty.FileAssetServlet;
+import com.gitplex.commons.jetty.ServletConfigurator;
public class ProductServletConfigurator implements ServletConfigurator {
diff --git a/gitplex.product/src/main/java/com/pmease/gitplex/product/ServerProperties.java b/gitplex.product/src/main/java/com/gitplex/product/ServerProperties.java
similarity index 89%
rename from gitplex.product/src/main/java/com/pmease/gitplex/product/ServerProperties.java
rename to gitplex.product/src/main/java/com/gitplex/product/ServerProperties.java
index ddcd675552..10df7973ce 100644
--- a/gitplex.product/src/main/java/com/pmease/gitplex/product/ServerProperties.java
+++ b/gitplex.product/src/main/java/com/gitplex/product/ServerProperties.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.product;
+package com.gitplex.product;
import java.util.Map;
import java.util.Properties;
diff --git a/gitplex.product/src/main/java/com/pmease/gitplex/product/SslConfigBean.java b/gitplex.product/src/main/java/com/gitplex/product/SslConfigBean.java
similarity index 90%
rename from gitplex.product/src/main/java/com/pmease/gitplex/product/SslConfigBean.java
rename to gitplex.product/src/main/java/com/gitplex/product/SslConfigBean.java
index e47c69aa52..245ce2631f 100644
--- a/gitplex.product/src/main/java/com/pmease/gitplex/product/SslConfigBean.java
+++ b/gitplex.product/src/main/java/com/gitplex/product/SslConfigBean.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.product;
+package com.gitplex.product;
-import com.pmease.gitplex.core.setting.SslConfig;
+import com.gitplex.core.setting.SslConfig;
class SslConfigBean implements SslConfig {
diff --git a/gitplex.product/src/main/resources/archetype-resource/pom.xml b/gitplex.product/src/main/resources/archetype-resource/pom.xml
index 97228d02fc..29264aa4f8 100644
--- a/gitplex.product/src/main/resources/archetype-resource/pom.xml
+++ b/gitplex.product/src/main/resources/archetype-resource/pom.xml
@@ -1,7 +1,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>
-#if (\${groupId} != "com.pmease")
+#if (\${groupId} != "com.gitplex")
<groupId>\${groupId}</groupId>
#end
<artifactId>\${artifactId}</artifactId>
@@ -9,7 +9,7 @@
<version>\${version}</version>
#end
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
@@ -17,7 +17,7 @@
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -39,8 +39,8 @@
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -51,7 +51,7 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
diff --git a/gitplex.product/src/main/resources/archetype-resource/src/main/java/Plugin.java b/gitplex.product/src/main/resources/archetype-resource/src/main/java/Plugin.java
index da8842a8e2..82fb445067 100644
--- a/gitplex.product/src/main/resources/archetype-resource/src/main/java/Plugin.java
+++ b/gitplex.product/src/main/resources/archetype-resource/src/main/java/Plugin.java
@@ -1,7 +1,7 @@
package ${package};
import java.util.Collection;
-import com.pmease.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPlugin;
public class Plugin extends AbstractPlugin {
diff --git a/gitplex.product/src/main/resources/archetype-resource/src/main/java/PluginModule.java b/gitplex.product/src/main/resources/archetype-resource/src/main/java/PluginModule.java
index d566c299ba..9ad2374240 100644
--- a/gitplex.product/src/main/resources/archetype-resource/src/main/java/PluginModule.java
+++ b/gitplex.product/src/main/resources/archetype-resource/src/main/java/PluginModule.java
@@ -1,7 +1,7 @@
package ${package};
-import com.pmease.commons.loader.AbstractPlugin;
-import com.pmease.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.loader.AbstractPlugin;
+import com.gitplex.commons.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/gitplex.product/src/test/java/gitplex/product/Test.java b/gitplex.product/src/test/java/com/gitplex/product/Test.java
similarity index 79%
rename from gitplex.product/src/test/java/gitplex/product/Test.java
rename to gitplex.product/src/test/java/com/gitplex/product/Test.java
index b1e139ece9..f243cb582f 100644
--- a/gitplex.product/src/test/java/gitplex/product/Test.java
+++ b/gitplex.product/src/test/java/com/gitplex/product/Test.java
@@ -1,4 +1,4 @@
-package gitplex.product;
+package com.gitplex.product;
import java.io.IOException;
diff --git a/gitplex.product/system/conf/logback.xml b/gitplex.product/system/conf/logback.xml
index d0196848a5..62cca13abe 100644
--- a/gitplex.product/system/conf/logback.xml
+++ b/gitplex.product/system/conf/logback.xml
@@ -34,7 +34,7 @@
<logger name="jetbrains.exodus" level="WARN"/>
<logger name="com.zaxxer.hikari.HikariDataSource" level="ERROR"/>
<logger name="com.zaxxer.hikari.util.DriverDataSource" level="ERROR"/>
- <logger name="com.pmease" level="INFO"/>
+ <logger name="com.gitplex" level="INFO"/>
<root level="WARN">
<appender-ref ref="FILE"/>
diff --git a/gitplex.product/system/conf/wrapper-license.conf b/gitplex.product/system/conf/wrapper-license.conf
index 156b02cfae..36f9ae31c6 100644
--- a/gitplex.product/system/conf/wrapper-license.conf
+++ b/gitplex.product/system/conf/wrapper-license.conf
@@ -1,8 +1,8 @@
#encoding=UTF-8
wrapper.license.type=DEV
wrapper.license.id=201605010000004
-wrapper.license.licensee=PMEase Inc.
-wrapper.license.group=PMEase
+wrapper.license.licensee=GitPlex Inc.
+wrapper.license.group=GitPlex
wrapper.license.dev_application=GitPlex
wrapper.license.features=64bit
wrapper.license.upgrade_term.begin_date=2009-04-26
diff --git a/gitplex.rest/pom.xml b/gitplex.rest/pom.xml
index f904de7b23..a1d23d9337 100644
--- a/gitplex.rest/pom.xml
+++ b/gitplex.rest/pom.xml
@@ -5,14 +5,14 @@
<artifactId>gitplex.rest</artifactId>
<version>1.0.6</version>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -25,20 +25,20 @@
</build>
<dependencies>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.jersey</artifactId>
<version>1.0.3</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.core</artifactId>
<version>1.0.37</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -49,10 +49,10 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
<properties>
- <moduleClass>com.pmease.gitplex.rest.RestModule</moduleClass>
+ <moduleClass>com.gitplex.rest.RestModule</moduleClass>
</properties>
</project>
diff --git a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/RestModule.java b/gitplex.rest/src/main/java/com/gitplex/rest/RestModule.java
similarity index 74%
rename from gitplex.rest/src/main/java/com/pmease/gitplex/rest/RestModule.java
rename to gitplex.rest/src/main/java/com/gitplex/rest/RestModule.java
index 2663f15ede..3cc0a6a591 100644
--- a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/RestModule.java
+++ b/gitplex.rest/src/main/java/com/gitplex/rest/RestModule.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.rest;
+package com.gitplex.rest;
import org.glassfish.jersey.server.ResourceConfig;
-import com.pmease.commons.jersey.JerseyConfigurator;
-import com.pmease.commons.loader.AbstractPluginModule;
-import com.pmease.gitplex.rest.resource.ResourceLocator;
+import com.gitplex.rest.resource.ResourceLocator;
+import com.gitplex.commons.jersey.JerseyConfigurator;
+import com.gitplex.commons.loader.AbstractPluginModule;
/**
* 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/pmease/gitplex/rest/resource/PullRequestResource.java b/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestResource.java
similarity index 90%
rename from gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/PullRequestResource.java
rename to gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestResource.java
index 31c19e2b84..0b7172b23e 100644
--- a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/PullRequestResource.java
+++ b/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.rest.resource;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.jersey.ValidQueryParams;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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;
@Path("/pull_requests")
@Consumes(MediaType.WILDCARD)
diff --git a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/PullRequestVerificationResource.java b/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestVerificationResource.java
similarity index 88%
rename from gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/PullRequestVerificationResource.java
rename to gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestVerificationResource.java
index f0fcf61734..0e8b3e393e 100644
--- a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/PullRequestVerificationResource.java
+++ b/gitplex.rest/src/main/java/com/gitplex/rest/resource/PullRequestVerificationResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.rest.resource;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.jersey.ValidQueryParams;
-import com.pmease.gitplex.core.entity.PullRequestVerification;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.PullRequestVerificationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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;
@Path("/pull_request_verifications")
@Consumes(MediaType.WILDCARD)
diff --git a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/RepositoryResource.java b/gitplex.rest/src/main/java/com/gitplex/rest/resource/RepositoryResource.java
similarity index 85%
rename from gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/RepositoryResource.java
rename to gitplex.rest/src/main/java/com/gitplex/rest/resource/RepositoryResource.java
index 0b6a9e9d94..fefdb393ae 100644
--- a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/RepositoryResource.java
+++ b/gitplex.rest/src/main/java/com/gitplex/rest/resource/RepositoryResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.rest.resource;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.jersey.ValidQueryParams;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.ObjectPermission;
+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;
@Path("/repositories")
@Consumes(MediaType.WILDCARD)
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.java
new file mode 100644
index 0000000000..8685e88672
--- /dev/null
+++ b/gitplex.rest/src/main/java/com/gitplex/rest/resource/ResourceLocator.java
@@ -0,0 +1,5 @@
+package com.gitplex.rest.resource;
+
+public class ResourceLocator {
+
+}
diff --git a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/UserResource.java b/gitplex.rest/src/main/java/com/gitplex/rest/resource/UserResource.java
similarity index 83%
rename from gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/UserResource.java
rename to gitplex.rest/src/main/java/com/gitplex/rest/resource/UserResource.java
index dd3eedab85..88ceef711d 100644
--- a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/UserResource.java
+++ b/gitplex.rest/src/main/java/com/gitplex/rest/resource/UserResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.rest.resource;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.jersey.ValidQueryParams;
-import com.pmease.gitplex.core.entity.Account;
+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;
@Path("/users")
@Consumes(MediaType.WILDCARD)
diff --git a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/ResourceLocator.java b/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/ResourceLocator.java
deleted file mode 100644
index 762cc5fe28..0000000000
--- a/gitplex.rest/src/main/java/com/pmease/gitplex/rest/resource/ResourceLocator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.rest.resource;
-
-public class ResourceLocator {
-
-}
diff --git a/gitplex.search/pom.xml b/gitplex.search/pom.xml
index a599efbe3c..e513493fff 100644
--- a/gitplex.search/pom.xml
+++ b/gitplex.search/pom.xml
@@ -5,14 +5,14 @@
<artifactId>gitplex.search</artifactId>
<version>1.0.6</version>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -32,7 +32,7 @@
</build>
<dependencies>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.core</artifactId>
<version>1.0.37</version>
</dependency>
@@ -67,14 +67,14 @@
<version>${luceneVersion}</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.loader</artifactId>
<version>1.0.34</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.git</artifactId>
<version>1.0.6</version>
<type>test-jar</type>
@@ -83,8 +83,8 @@
</dependencies>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -95,11 +95,11 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
<properties>
- <moduleClass>com.pmease.gitplex.search.SearchModule</moduleClass>
+ <moduleClass>com.gitplex.search.SearchModule</moduleClass>
<luceneVersion>4.10.3</luceneVersion>
</properties>
</project>
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/CommitIndexed.java b/gitplex.search/src/main/java/com/gitplex/search/CommitIndexed.java
similarity index 81%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/CommitIndexed.java
rename to gitplex.search/src/main/java/com/gitplex/search/CommitIndexed.java
index 68d1f1ecef..e9f63155db 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/CommitIndexed.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/CommitIndexed.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
public class CommitIndexed {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/DefaultIndexManager.java b/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java
similarity index 87%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/DefaultIndexManager.java
rename to gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java
index 56829bc33f..8f1845936d 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/DefaultIndexManager.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/DefaultIndexManager.java
@@ -1,20 +1,20 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_HASH;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_INDEX_VERSION;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_NAME;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_PATH;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_TEXT;
-import static com.pmease.gitplex.search.FieldConstants.COMMIT_HASH;
-import static com.pmease.gitplex.search.FieldConstants.COMMIT_INDEX_VERSION;
-import static com.pmease.gitplex.search.FieldConstants.LAST_COMMIT;
-import static com.pmease.gitplex.search.FieldConstants.LAST_COMMIT_HASH;
-import static com.pmease.gitplex.search.FieldConstants.LAST_COMMIT_INDEX_VERSION;
-import static com.pmease.gitplex.search.FieldConstants.META;
-import static com.pmease.gitplex.search.IndexConstants.MAX_INDEXABLE_SIZE;
-import static com.pmease.gitplex.search.IndexConstants.NGRAM_SIZE;
+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 java.io.File;
import java.io.IOException;
@@ -59,24 +59,24 @@ 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.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.lang.extractors.ExtractException;
-import com.pmease.commons.lang.extractors.Extractor;
-import com.pmease.commons.lang.extractors.Extractors;
-import com.pmease.commons.lang.extractors.Symbol;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.util.ContentDetector;
-import com.pmease.commons.util.concurrent.Prioritized;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.manager.BatchWorkManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.core.manager.support.BatchWorker;
-import com.pmease.gitplex.core.manager.support.IndexResult;
+import com.gitplex.commons.hibernate.UnitOfWork;
+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.loader.Listen;
+import com.gitplex.commons.loader.ListenerRegistry;
+import com.gitplex.commons.util.ContentDetector;
+import com.gitplex.commons.util.concurrent.Prioritized;
@Singleton
public class DefaultIndexManager implements IndexManager {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/DefaultSearchManager.java b/gitplex.search/src/main/java/com/gitplex/search/DefaultSearchManager.java
similarity index 91%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/DefaultSearchManager.java
rename to gitplex.search/src/main/java/com/gitplex/search/DefaultSearchManager.java
index 48a344d0af..6cf281cb37 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/DefaultSearchManager.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/DefaultSearchManager.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
import java.io.IOException;
import java.nio.channels.ClosedByInterruptException;
@@ -29,16 +29,16 @@ 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.google.common.base.Throwables;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.Listen;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.event.depot.DepotDeleted;
-import com.pmease.gitplex.core.event.lifecycle.SystemStopping;
-import com.pmease.gitplex.core.manager.StorageManager;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.query.BlobQuery;
+import com.gitplex.commons.hibernate.Transactional;
+import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.commons.loader.Listen;
@Singleton
public class DefaultSearchManager implements SearchManager {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/FieldConstants.java b/gitplex.search/src/main/java/com/gitplex/search/FieldConstants.java
similarity index 93%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/FieldConstants.java
rename to gitplex.search/src/main/java/com/gitplex/search/FieldConstants.java
index 1dd0632746..5e696fec72 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/FieldConstants.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/FieldConstants.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
import org.apache.lucene.index.Term;
import org.apache.lucene.search.TermQuery;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/IndexConstants.java b/gitplex.search/src/main/java/com/gitplex/search/IndexConstants.java
similarity index 73%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/IndexConstants.java
rename to gitplex.search/src/main/java/com/gitplex/search/IndexConstants.java
index e5543aac12..10e86ef907 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/IndexConstants.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/IndexConstants.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
public interface IndexConstants {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/IndexManager.java b/gitplex.search/src/main/java/com/gitplex/search/IndexManager.java
similarity index 62%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/IndexManager.java
rename to gitplex.search/src/main/java/com/gitplex/search/IndexManager.java
index 70c70b8df1..8f52ddd476 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/IndexManager.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/IndexManager.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.support.IndexResult;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.manager.support.IndexResult;
public interface IndexManager {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/NGramAnalyzer.java b/gitplex.search/src/main/java/com/gitplex/search/NGramAnalyzer.java
similarity index 96%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/NGramAnalyzer.java
rename to gitplex.search/src/main/java/com/gitplex/search/NGramAnalyzer.java
index 049d19aa37..10605996a8 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/NGramAnalyzer.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/NGramAnalyzer.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
import java.io.IOException;
import java.io.Reader;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/SearchManager.java b/gitplex.search/src/main/java/com/gitplex/search/SearchManager.java
similarity index 70%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/SearchManager.java
rename to gitplex.search/src/main/java/com/gitplex/search/SearchManager.java
index e0e5b88bbe..2350ed884a 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/SearchManager.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/SearchManager.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
import java.util.List;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.query.BlobQuery;
-import com.pmease.gitplex.search.query.TooGeneralQueryException;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.search.hit.QueryHit;
+import com.gitplex.search.query.BlobQuery;
+import com.gitplex.search.query.TooGeneralQueryException;
public interface SearchManager {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/SearchModule.java b/gitplex.search/src/main/java/com/gitplex/search/SearchModule.java
similarity index 81%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/SearchModule.java
rename to gitplex.search/src/main/java/com/gitplex/search/SearchModule.java
index 44ec70aff2..a497cfc775 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/SearchModule.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/SearchModule.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.search;
+package com.gitplex.search;
-import com.pmease.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.loader.AbstractPluginModule;
/**
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/FileHit.java b/gitplex.search/src/main/java/com/gitplex/search/hit/FileHit.java
similarity index 90%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/hit/FileHit.java
rename to gitplex.search/src/main/java/com/gitplex/search/hit/FileHit.java
index 60ff17edba..703e408ebb 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/FileHit.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/hit/FileHit.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.hit;
+package com.gitplex.search.hit;
import javax.annotation.Nullable;
@@ -7,8 +7,8 @@ import org.apache.wicket.Component;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.wicket.component.EmphasizeAwareLabel;
+import com.gitplex.commons.util.Range;
+import com.gitplex.commons.wicket.component.EmphasizeAwareLabel;
public class FileHit extends QueryHit {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/QueryHit.java b/gitplex.search/src/main/java/com/gitplex/search/hit/QueryHit.java
similarity index 91%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/hit/QueryHit.java
rename to gitplex.search/src/main/java/com/gitplex/search/hit/QueryHit.java
index 71068857a0..f0713e8d2d 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/QueryHit.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/hit/QueryHit.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.hit;
+package com.gitplex.search.hit;
import java.io.Serializable;
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.request.resource.ResourceReference;
-import com.pmease.commons.lang.extractors.TokenPosition;
+import com.gitplex.commons.lang.extractors.TokenPosition;
public abstract class QueryHit implements Serializable, Comparable<QueryHit> {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/SymbolHit.java b/gitplex.search/src/main/java/com/gitplex/search/hit/SymbolHit.java
similarity index 87%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/hit/SymbolHit.java
rename to gitplex.search/src/main/java/com/gitplex/search/hit/SymbolHit.java
index 23b547929b..4b900b18f3 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/SymbolHit.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/hit/SymbolHit.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.search.hit;
+package com.gitplex.search.hit;
import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.request.resource.ResourceReference;
-import com.pmease.commons.lang.extractors.Symbol;
-import com.pmease.commons.util.Range;
+import com.gitplex.commons.lang.extractors.Symbol;
+import com.gitplex.commons.util.Range;
public class SymbolHit extends QueryHit {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/TextHit.java b/gitplex.search/src/main/java/com/gitplex/search/hit/TextHit.java
similarity index 88%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/hit/TextHit.java
rename to gitplex.search/src/main/java/com/gitplex/search/hit/TextHit.java
index 38933ad162..5444394e75 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/TextHit.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/hit/TextHit.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.search.hit;
+package com.gitplex.search.hit;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
-import com.pmease.commons.lang.extractors.TokenPosition;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.wicket.component.EmphasizeAwareLabel;
+import com.gitplex.commons.lang.extractors.TokenPosition;
+import com.gitplex.commons.util.Range;
+import com.gitplex.commons.wicket.component.EmphasizeAwareLabel;
public class TextHit extends QueryHit {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/bullet.gif b/gitplex.search/src/main/java/com/gitplex/search/hit/bullet.gif
similarity index 100%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/hit/bullet.gif
rename to gitplex.search/src/main/java/com/gitplex/search/hit/bullet.gif
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/hit/file.png b/gitplex.search/src/main/java/com/gitplex/search/hit/file.png
similarity index 100%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/hit/file.png
rename to gitplex.search/src/main/java/com/gitplex/search/hit/file.png
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/BlobQuery.java b/gitplex.search/src/main/java/com/gitplex/search/query/BlobQuery.java
similarity index 86%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/BlobQuery.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/BlobQuery.java
index 34d869b8a3..5ed6176270 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/BlobQuery.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/BlobQuery.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.search.query;
+package com.gitplex.search.query;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_PATH;
+import static com.gitplex.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.pmease.gitplex.search.hit.QueryHit;
+import com.gitplex.search.hit.QueryHit;
public abstract class BlobQuery {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/FileQuery.java b/gitplex.search/src/main/java/com/gitplex/search/query/FileQuery.java
similarity index 90%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/FileQuery.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/FileQuery.java
index 23631635cd..74e3908616 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/FileQuery.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/FileQuery.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.search.query;
+package com.gitplex.search.query;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_NAME;
+import static com.gitplex.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.pmease.commons.util.Range;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.gitplex.search.hit.FileHit;
-import com.pmease.gitplex.search.hit.QueryHit;
+import com.gitplex.commons.util.Range;
+import com.gitplex.commons.util.match.WildcardUtils;
public class FileQuery extends BlobQuery {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/NGramLuceneQuery.java b/gitplex.search/src/main/java/com/gitplex/search/query/NGramLuceneQuery.java
similarity index 95%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/NGramLuceneQuery.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/NGramLuceneQuery.java
index 1f384a379a..472ce65b02 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/NGramLuceneQuery.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/NGramLuceneQuery.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query;
+package com.gitplex.search.query;
import java.io.IOException;
import java.io.StringReader;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/SymbolQuery.java b/gitplex.search/src/main/java/com/gitplex/search/query/SymbolQuery.java
similarity index 83%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/SymbolQuery.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/SymbolQuery.java
index 363967c847..b458b12490 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/SymbolQuery.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/SymbolQuery.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.search.query;
+package com.gitplex.search.query;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_NAME;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_PRIMARY_SYMBOLS;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_SECONDARY_SYMBOLS;
-import static com.pmease.gitplex.search.IndexConstants.MAX_INDEXABLE_SIZE;
+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 java.io.IOException;
import java.util.List;
@@ -20,17 +20,17 @@ 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.google.common.base.Splitter;
-import com.pmease.commons.lang.extractors.ExtractException;
-import com.pmease.commons.lang.extractors.Extractor;
-import com.pmease.commons.lang.extractors.Extractors;
-import com.pmease.commons.lang.extractors.Symbol;
-import com.pmease.commons.util.ContentDetector;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.hit.SymbolHit;
+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.ContentDetector;
+import com.gitplex.commons.util.Range;
+import com.gitplex.commons.util.match.WildcardUtils;
public class SymbolQuery extends BlobQuery {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/TextQuery.java b/gitplex.search/src/main/java/com/gitplex/search/query/TextQuery.java
similarity index 87%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/TextQuery.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/TextQuery.java
index 5aab80cf2d..5bfc6bff5a 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/TextQuery.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/TextQuery.java
@@ -1,198 +1,198 @@
-package com.pmease.gitplex.search.query;
-
-import static com.pmease.gitplex.search.FieldConstants.BLOB_NAME;
-import static com.pmease.gitplex.search.FieldConstants.BLOB_TEXT;
-import static com.pmease.gitplex.search.IndexConstants.NGRAM_SIZE;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.CharUtils;
-import org.apache.lucene.index.Term;
-import org.apache.lucene.search.BooleanClause.Occur;
-import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Query;
-import org.apache.lucene.search.WildcardQuery;
-import org.eclipse.jgit.lib.ObjectLoader;
-import org.eclipse.jgit.treewalk.TreeWalk;
-
-import com.google.common.base.Splitter;
-import com.pmease.commons.lang.extractors.TokenPosition;
-import com.pmease.commons.util.ContentDetector;
-import com.pmease.commons.util.Range;
-import com.pmease.gitplex.search.IndexConstants;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.hit.TextHit;
-import com.pmease.gitplex.search.query.regex.RegexLiterals;
-
-public class TextQuery extends BlobQuery {
-
- private static int MAX_LINE_LEN = 1024;
-
- private final String term;
-
- private final boolean regex;
-
- private final boolean caseSensitive;
-
- private final boolean wholeWord;
-
- private final String directory;
-
- private final String fileNames;
-
- private transient Pattern pattern;
-
- public TextQuery(String term, boolean regex, boolean caseSensitive, boolean wordMatch,
- @Nullable String directory, @Nullable String fileNames, int count) {
- super(count);
-
- this.term = term;
- this.regex = regex;
- this.caseSensitive = caseSensitive;
- this.wholeWord = wordMatch;
- this.directory = directory;
- this.fileNames = fileNames;
- }
-
- @Nullable
- private Pattern getPattern() {
- if (regex) {
- if (pattern == null) {
- String expression = term;
- if (wholeWord) {
- if (!expression.startsWith("\\b"))
- expression = "\\b" + expression;
- if (!expression.endsWith("\\b"))
- expression = expression + "\\b";
- }
- if (caseSensitive)
- pattern = Pattern.compile(expression);
- else
- pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE);
- }
- return pattern;
- } else {
- return null;
- }
- }
-
- @Override
- public void collect(TreeWalk treeWalk, List<QueryHit> hits) {
- ObjectLoader objectLoader;
- try {
- objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));
- if (objectLoader.getSize() <= IndexConstants.MAX_INDEXABLE_SIZE) {
- String blobPath = treeWalk.getPathString();
- String content = ContentDetector.convertToText(objectLoader.getCachedBytes(), blobPath);
- if (content != null) {
- Pattern pattern = getPattern();
- if (pattern != null) {
- int lineNo = 0;
- for (String line: Splitter.on('\n').split(content)) {
- if (line.length() <= MAX_LINE_LEN) {
- Matcher matcher = pattern.matcher(line);
- while (matcher.find()) {
- Range range = new Range(matcher.start(), matcher.end());
- hits.add(new TextHit(blobPath, line, new TokenPosition(lineNo, range)));
- if (hits.size() >= getCount())
- break;
- }
- if (hits.size() >= getCount())
- break;
- }
- lineNo++;
- }
- } else {
- String normalizedTerm;
- if (!caseSensitive)
- normalizedTerm = term.toLowerCase();
- else
- normalizedTerm = term;
-
- int lineNo = 0;
- for (String line: Splitter.on('\n').split(content)) {
- if (line.length() <= MAX_LINE_LEN) {
- String normalizedLine;
- if (!caseSensitive)
- normalizedLine = line.toLowerCase();
- else
- normalizedLine = line;
-
- int start = normalizedLine.indexOf(normalizedTerm, 0);
- while (start != -1) {
- int end = start + normalizedTerm.length();
- if (wholeWord) {
- char beforeChar;
- if (start == 0)
- beforeChar = ' ';
- else
- beforeChar = line.charAt(start-1);
-
- char afterChar;
- if (end == line.length())
- afterChar = ' ';
- else
- afterChar = line.charAt(end);
-
- if (!isWordChar(beforeChar) && !isWordChar(afterChar)) {
- Range range = new Range(start, end);
- hits.add(new TextHit(blobPath, line, new TokenPosition(lineNo, range)));
- if (hits.size() >= getCount())
- break;
- }
- } else {
- Range range = new Range(start, end);
- hits.add(new TextHit(blobPath, line, new TokenPosition(lineNo, range)));
- if (hits.size() >= getCount())
- break;
- }
- start = normalizedLine.indexOf(normalizedTerm, end);
- }
- if (hits.size() >= getCount())
- break;
- }
- lineNo++;
- }
- }
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- private boolean isWordChar(char ch) {
- return CharUtils.isAsciiAlphanumeric(ch) || ch == '_';
- }
-
- @Override
- public Query asLuceneQuery() throws TooGeneralQueryException {
- BooleanQuery query = new BooleanQuery(true);
-
- if (directory != null)
- applyDirectory(query, directory);
-
- if (fileNames != null) {
- BooleanQuery subQuery = new BooleanQuery(true);
- for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))
- subQuery.add(new WildcardQuery(new Term(BLOB_NAME.name(), pattern)), Occur.SHOULD);
- if (subQuery.getClauses().length != 0)
- query.add(subQuery, Occur.MUST);
- }
-
- if (regex)
- query.add(new RegexLiterals(term).asNGramQuery(BLOB_TEXT.name(), NGRAM_SIZE), Occur.MUST);
- else if (term.length() >= NGRAM_SIZE)
- query.add(new NGramLuceneQuery(BLOB_TEXT.name(), term, NGRAM_SIZE), Occur.MUST);
- else
- throw new TooGeneralQueryException();
-
- return query;
- }
-
-}
+package com.gitplex.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 java.io.IOException;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.CharUtils;
+import org.apache.lucene.index.Term;
+import org.apache.lucene.search.BooleanClause.Occur;
+import org.apache.lucene.search.BooleanQuery;
+import org.apache.lucene.search.Query;
+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;
+
+public class TextQuery extends BlobQuery {
+
+ private static int MAX_LINE_LEN = 1024;
+
+ private final String term;
+
+ private final boolean regex;
+
+ private final boolean caseSensitive;
+
+ private final boolean wholeWord;
+
+ private final String directory;
+
+ private final String fileNames;
+
+ private transient Pattern pattern;
+
+ public TextQuery(String term, boolean regex, boolean caseSensitive, boolean wordMatch,
+ @Nullable String directory, @Nullable String fileNames, int count) {
+ super(count);
+
+ this.term = term;
+ this.regex = regex;
+ this.caseSensitive = caseSensitive;
+ this.wholeWord = wordMatch;
+ this.directory = directory;
+ this.fileNames = fileNames;
+ }
+
+ @Nullable
+ private Pattern getPattern() {
+ if (regex) {
+ if (pattern == null) {
+ String expression = term;
+ if (wholeWord) {
+ if (!expression.startsWith("\\b"))
+ expression = "\\b" + expression;
+ if (!expression.endsWith("\\b"))
+ expression = expression + "\\b";
+ }
+ if (caseSensitive)
+ pattern = Pattern.compile(expression);
+ else
+ pattern = Pattern.compile(expression, Pattern.CASE_INSENSITIVE);
+ }
+ return pattern;
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public void collect(TreeWalk treeWalk, List<QueryHit> hits) {
+ ObjectLoader objectLoader;
+ try {
+ objectLoader = treeWalk.getObjectReader().open(treeWalk.getObjectId(0));
+ if (objectLoader.getSize() <= IndexConstants.MAX_INDEXABLE_SIZE) {
+ String blobPath = treeWalk.getPathString();
+ String content = ContentDetector.convertToText(objectLoader.getCachedBytes(), blobPath);
+ if (content != null) {
+ Pattern pattern = getPattern();
+ if (pattern != null) {
+ int lineNo = 0;
+ for (String line: Splitter.on('\n').split(content)) {
+ if (line.length() <= MAX_LINE_LEN) {
+ Matcher matcher = pattern.matcher(line);
+ while (matcher.find()) {
+ Range range = new Range(matcher.start(), matcher.end());
+ hits.add(new TextHit(blobPath, line, new TokenPosition(lineNo, range)));
+ if (hits.size() >= getCount())
+ break;
+ }
+ if (hits.size() >= getCount())
+ break;
+ }
+ lineNo++;
+ }
+ } else {
+ String normalizedTerm;
+ if (!caseSensitive)
+ normalizedTerm = term.toLowerCase();
+ else
+ normalizedTerm = term;
+
+ int lineNo = 0;
+ for (String line: Splitter.on('\n').split(content)) {
+ if (line.length() <= MAX_LINE_LEN) {
+ String normalizedLine;
+ if (!caseSensitive)
+ normalizedLine = line.toLowerCase();
+ else
+ normalizedLine = line;
+
+ int start = normalizedLine.indexOf(normalizedTerm, 0);
+ while (start != -1) {
+ int end = start + normalizedTerm.length();
+ if (wholeWord) {
+ char beforeChar;
+ if (start == 0)
+ beforeChar = ' ';
+ else
+ beforeChar = line.charAt(start-1);
+
+ char afterChar;
+ if (end == line.length())
+ afterChar = ' ';
+ else
+ afterChar = line.charAt(end);
+
+ if (!isWordChar(beforeChar) && !isWordChar(afterChar)) {
+ Range range = new Range(start, end);
+ hits.add(new TextHit(blobPath, line, new TokenPosition(lineNo, range)));
+ if (hits.size() >= getCount())
+ break;
+ }
+ } else {
+ Range range = new Range(start, end);
+ hits.add(new TextHit(blobPath, line, new TokenPosition(lineNo, range)));
+ if (hits.size() >= getCount())
+ break;
+ }
+ start = normalizedLine.indexOf(normalizedTerm, end);
+ }
+ if (hits.size() >= getCount())
+ break;
+ }
+ lineNo++;
+ }
+ }
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private boolean isWordChar(char ch) {
+ return CharUtils.isAsciiAlphanumeric(ch) || ch == '_';
+ }
+
+ @Override
+ public Query asLuceneQuery() throws TooGeneralQueryException {
+ BooleanQuery query = new BooleanQuery(true);
+
+ if (directory != null)
+ applyDirectory(query, directory);
+
+ if (fileNames != null) {
+ BooleanQuery subQuery = new BooleanQuery(true);
+ for (String pattern: Splitter.on(",").omitEmptyStrings().trimResults().split(fileNames.toLowerCase()))
+ subQuery.add(new WildcardQuery(new Term(BLOB_NAME.name(), pattern)), Occur.SHOULD);
+ if (subQuery.getClauses().length != 0)
+ query.add(subQuery, Occur.MUST);
+ }
+
+ if (regex)
+ query.add(new RegexLiterals(term).asNGramQuery(BLOB_TEXT.name(), NGRAM_SIZE), Occur.MUST);
+ else if (term.length() >= NGRAM_SIZE)
+ query.add(new NGramLuceneQuery(BLOB_TEXT.name(), term, NGRAM_SIZE), Occur.MUST);
+ else
+ throw new TooGeneralQueryException();
+
+ return query;
+ }
+
+}
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/TooGeneralQueryException.java b/gitplex.search/src/main/java/com/gitplex/search/query/TooGeneralQueryException.java
similarity index 74%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/TooGeneralQueryException.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/TooGeneralQueryException.java
index 3c2eb2f13e..9f569b0837 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/TooGeneralQueryException.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/TooGeneralQueryException.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query;
+package com.gitplex.search.query;
public class TooGeneralQueryException extends RuntimeException {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/AndLiterals.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/AndLiterals.java
similarity index 98%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/AndLiterals.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/AndLiterals.java
index 4ae845a8eb..734deb8462 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/AndLiterals.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/AndLiterals.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.ArrayList;
import java.util.List;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LeafLiterals.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LeafLiterals.java
similarity index 96%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LeafLiterals.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/LeafLiterals.java
index 4331778f86..de2df81e5e 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LeafLiterals.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LeafLiterals.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.ArrayList;
import java.util.List;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LiteralUtils.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralUtils.java
similarity index 99%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LiteralUtils.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralUtils.java
index ba14266a2d..bca59c9cd9 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LiteralUtils.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralUtils.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.ArrayList;
import java.util.HashSet;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LiteralVisitor.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralVisitor.java
similarity index 86%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LiteralVisitor.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralVisitor.java
index 6ae46772a8..b9be3ff2df 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LiteralVisitor.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LiteralVisitor.java
@@ -1,17 +1,18 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
-import com.pmease.gitplex.search.query.regex.PCREParser.AlternationContext;
-import com.pmease.gitplex.search.query.regex.PCREParser.AtomContext;
-import com.pmease.gitplex.search.query.regex.PCREParser.Cc_atomContext;
-import com.pmease.gitplex.search.query.regex.PCREParser.ElementContext;
-import com.pmease.gitplex.search.query.regex.PCREParser.ExprContext;
-import com.pmease.gitplex.search.query.regex.PCREParser.ParseContext;
-import com.pmease.gitplex.search.query.regex.PCREParser.QuantifierContext;
+import com.gitplex.search.query.regex.PCREBaseVisitor;
+import com.gitplex.search.query.regex.PCREParser.AlternationContext;
+import com.gitplex.search.query.regex.PCREParser.AtomContext;
+import com.gitplex.search.query.regex.PCREParser.Cc_atomContext;
+import com.gitplex.search.query.regex.PCREParser.ElementContext;
+import com.gitplex.search.query.regex.PCREParser.ExprContext;
+import com.gitplex.search.query.regex.PCREParser.ParseContext;
+import com.gitplex.search.query.regex.PCREParser.QuantifierContext;
public class LiteralVisitor extends PCREBaseVisitor<Literals> {
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/Literals.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/Literals.java
similarity index 70%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/Literals.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/Literals.java
index 76f4b88977..3f5437f520 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/Literals.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/Literals.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.List;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LogicalLiterals.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LogicalLiterals.java
similarity index 93%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LogicalLiterals.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/LogicalLiterals.java
index dd8e5385e2..7657d487f3 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/LogicalLiterals.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/LogicalLiterals.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.Iterator;
import java.util.List;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/OrLiterals.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/OrLiterals.java
similarity index 91%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/OrLiterals.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/OrLiterals.java
index c165410b34..c6155e8a80 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/OrLiterals.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/OrLiterals.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
import java.util.ArrayList;
import java.util.List;
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/PCRE.g4 b/gitplex.search/src/main/java/com/gitplex/search/query/regex/PCRE.g4
similarity index 100%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/PCRE.g4
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/PCRE.g4
diff --git a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/RegexLiterals.java b/gitplex.search/src/main/java/com/gitplex/search/query/regex/RegexLiterals.java
similarity index 90%
rename from gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/RegexLiterals.java
rename to gitplex.search/src/main/java/com/gitplex/search/query/regex/RegexLiterals.java
index 9d05acadbd..c46fc9510e 100644
--- a/gitplex.search/src/main/java/com/pmease/gitplex/search/query/regex/RegexLiterals.java
+++ b/gitplex.search/src/main/java/com/gitplex/search/query/regex/RegexLiterals.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.search.query.regex;
-import static com.pmease.gitplex.search.IndexConstants.NGRAM_SIZE;
+import static com.gitplex.search.IndexConstants.NGRAM_SIZE;
import java.util.List;
@@ -15,9 +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.pmease.gitplex.search.query.NGramLuceneQuery;
-import com.pmease.gitplex.search.query.TooGeneralQueryException;
+import com.gitplex.search.query.regex.PCRELexer;
+import com.gitplex.search.query.regex.PCREParser;
public class RegexLiterals {
diff --git a/gitplex.search/src/test/java/com/pmease/gitplex/search/query/regex/RegexLiteralsTest.java b/gitplex.search/src/test/java/com/gitplex/search/query/regex/RegexLiteralsTest.java
similarity index 92%
rename from gitplex.search/src/test/java/com/pmease/gitplex/search/query/regex/RegexLiteralsTest.java
rename to gitplex.search/src/test/java/com/gitplex/search/query/regex/RegexLiteralsTest.java
index df9c0c68d1..912b2f563b 100644
--- a/gitplex.search/src/test/java/com/pmease/gitplex/search/query/regex/RegexLiteralsTest.java
+++ b/gitplex.search/src/test/java/com/gitplex/search/query/regex/RegexLiteralsTest.java
@@ -1,10 +1,11 @@
-package com.pmease.gitplex.search.query.regex;
+package com.gitplex.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.google.common.base.Splitter;
public class RegexLiteralsTest {
diff --git a/gitplex.web/pom.xml b/gitplex.web/pom.xml
index 4b138cdc39..71da319dc2 100644
--- a/gitplex.web/pom.xml
+++ b/gitplex.web/pom.xml
@@ -5,14 +5,14 @@
<artifactId>gitplex.web</artifactId>
<version>1.0.6</version>
<parent>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>parent.general</artifactId>
<version>1.0.31</version>
</parent>
<build>
<plugins>
<plugin>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>plugin.maven</artifactId>
</plugin>
<plugin>
@@ -29,22 +29,22 @@
</build>
<dependencies>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.core</artifactId>
<version>1.0.37</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.wicket</artifactId>
<version>1.0.34</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>commons.jetty</artifactId>
<version>1.0.34</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.rest</artifactId>
<version>1.0.6</version>
</dependency>
@@ -70,15 +70,15 @@
<version>3.2.4.Final</version>
</dependency>
<dependency>
- <groupId>com.pmease</groupId>
+ <groupId>com.gitplex</groupId>
<artifactId>gitplex.search</artifactId>
<version>1.0.6</version>
</dependency>
</dependencies>
<repositories>
<repository>
- <id>pmeaseRepo</id>
- <name>PMEase Repository</name>
+ <id>gitplexRepo</id>
+ <name>GitPlex Repository</name>
<releases>
<enabled>true</enabled>
<updatePolicy>never</updatePolicy>
@@ -89,11 +89,11 @@
<updatePolicy>always</updatePolicy>
<checksumPolicy>fail</checksumPolicy>
</snapshots>
- <url>http://artifact.pmease.com/</url>
+ <url>http://artifact.gitplex.com/</url>
</repository>
</repositories>
<properties>
- <moduleClass>com.pmease.gitplex.web.WebModule</moduleClass>
+ <moduleClass>com.gitplex.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/pmease/gitplex/web/Constants.java b/gitplex.web/src/main/java/com/gitplex/web/Constants.java
similarity index 96%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/Constants.java
rename to gitplex.web/src/main/java/com/gitplex/web/Constants.java
index 7310bef72a..4a9c457c6b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/Constants.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/Constants.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web;
+package com.gitplex.web;
import org.joda.time.format.DateTimeFormat;
import org.joda.time.format.DateTimeFormatter;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/ExpectedExceptionContribution.java b/gitplex.web/src/main/java/com/gitplex/web/ExpectedExceptionContribution.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/ExpectedExceptionContribution.java
rename to gitplex.web/src/main/java/com/gitplex/web/ExpectedExceptionContribution.java
index 151304cd9f..6eff87a849 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/ExpectedExceptionContribution.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/ExpectedExceptionContribution.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.web;
+package com.gitplex.web;
import java.util.Collection;
-import com.pmease.commons.loader.ExtensionPoint;
+import com.gitplex.commons.loader.ExtensionPoint;
@ExtensionPoint
public interface ExpectedExceptionContribution {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebAccountNameReservation.java b/gitplex.web/src/main/java/com/gitplex/web/WebAccountNameReservation.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WebAccountNameReservation.java
rename to gitplex.web/src/main/java/com/gitplex/web/WebAccountNameReservation.java
index e3823b2928..129fb20a85 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebAccountNameReservation.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WebAccountNameReservation.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web;
+package com.gitplex.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.pmease.commons.jetty.JettyPlugin;
-import com.pmease.commons.util.ReflectionUtils;
-import com.pmease.gitplex.core.util.validation.AccountNameReservation;
+import com.gitplex.commons.jetty.JettyPlugin;
+import com.gitplex.commons.util.ReflectionUtils;
public class WebAccountNameReservation implements AccountNameReservation {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebDepotNameReservation.java b/gitplex.web/src/main/java/com/gitplex/web/WebDepotNameReservation.java
similarity index 70%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WebDepotNameReservation.java
rename to gitplex.web/src/main/java/com/gitplex/web/WebDepotNameReservation.java
index a274ba3005..d2d129818d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebDepotNameReservation.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WebDepotNameReservation.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web;
-
-import java.util.Set;
-
-import com.google.common.collect.Sets;
-import com.pmease.gitplex.core.util.validation.DepotNameReservation;
-
-public class WebDepotNameReservation implements DepotNameReservation {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet("new"); // reserved for url segment when creating new depot
- }
-
-}
+package com.gitplex.web;
+
+import java.util.Set;
+
+import com.gitplex.core.util.validation.DepotNameReservation;
+import com.google.common.collect.Sets;
+
+public class WebDepotNameReservation implements DepotNameReservation {
+
+ @Override
+ public Set<String> getReserved() {
+ return Sets.newHashSet("new"); // reserved for url segment when creating new depot
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebModule.java b/gitplex.web/src/main/java/com/gitplex/web/WebModule.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WebModule.java
rename to gitplex.web/src/main/java/com/gitplex/web/WebModule.java
index 1fdc3ce62f..00756dbb35 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebModule.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WebModule.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web;
+package com.gitplex.web;
import java.util.Collection;
@@ -15,32 +15,32 @@ 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.pmease.commons.git.exception.GitException;
-import com.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.commons.loader.AbstractPluginModule;
-import com.pmease.commons.markdown.extensionpoint.HtmlTransformer;
-import com.pmease.commons.markdown.extensionpoint.MarkdownExtension;
-import com.pmease.commons.wicket.AbstractWicketConfig;
-import com.pmease.commons.wicket.ResourcePackScopeContribution;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.websocket.DefaultWebSocketManager;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.gitplex.core.manager.UrlManager;
-import com.pmease.gitplex.core.util.validation.AccountNameReservation;
-import com.pmease.gitplex.core.util.validation.DepotNameReservation;
-import com.pmease.gitplex.core.util.validation.TeamNameReservation;
-import com.pmease.gitplex.web.avatar.AvatarManager;
-import com.pmease.gitplex.web.avatar.DefaultAvatarManager;
-import com.pmease.gitplex.web.component.comment.MentionTransformer;
-import com.pmease.gitplex.web.component.comment.PullRequestTransformer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.diff.DiffRenderer;
-import com.pmease.gitplex.web.editable.EditSupportLocator;
-import com.pmease.gitplex.web.websocket.CodeCommentChangeBroadcaster;
-import com.pmease.gitplex.web.websocket.CommitIndexedBroadcaster;
-import com.pmease.gitplex.web.websocket.PullRequestChangeBroadcaster;
-import com.pmease.gitplex.web.websocket.TaskChangeBroadcaster;
+import com.gitplex.commons.git.exception.GitException;
+import com.gitplex.commons.jetty.ServletConfigurator;
+import com.gitplex.commons.loader.AbstractPluginModule;
+import com.gitplex.commons.markdown.extensionpoint.HtmlTransformer;
+import com.gitplex.commons.markdown.extensionpoint.MarkdownExtension;
+import com.gitplex.commons.wicket.AbstractWicketConfig;
+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 jersey.repackaged.com.google.common.collect.Sets;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebServletConfigurator.java b/gitplex.web/src/main/java/com/gitplex/web/WebServletConfigurator.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WebServletConfigurator.java
rename to gitplex.web/src/main/java/com/gitplex/web/WebServletConfigurator.java
index ad3db4bafd..3f6e5972e6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebServletConfigurator.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WebServletConfigurator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web;
+package com.gitplex.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.pmease.commons.jetty.ClasspathAssetServlet;
-import com.pmease.commons.jetty.ServletConfigurator;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.gitplex.web.assets.Assets;
+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;
@Singleton
public class WebServletConfigurator implements ServletConfigurator {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebSession.java b/gitplex.web/src/main/java/com/gitplex/web/WebSession.java
similarity index 95%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WebSession.java
rename to gitplex.web/src/main/java/com/gitplex/web/WebSession.java
index e5a6ffa53c..3d33199331 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebSession.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WebSession.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
+import com.gitplex.core.GitPlex;
public class WebSession extends org.apache.wicket.protocol.http.WebSession {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebTeamNameReservation.java b/gitplex.web/src/main/java/com/gitplex/web/WebTeamNameReservation.java
similarity index 70%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WebTeamNameReservation.java
rename to gitplex.web/src/main/java/com/gitplex/web/WebTeamNameReservation.java
index 21bcc58e7d..770f198853 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WebTeamNameReservation.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WebTeamNameReservation.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web;
-
-import java.util.Set;
-
-import com.google.common.collect.Sets;
-import com.pmease.gitplex.core.util.validation.TeamNameReservation;
-
-public class WebTeamNameReservation implements TeamNameReservation {
-
- @Override
- public Set<String> getReserved() {
- return Sets.newHashSet("new"); // reserved for url segment when creating new team
- }
-
-}
+package com.gitplex.web;
+
+import java.util.Set;
+
+import com.gitplex.core.util.validation.TeamNameReservation;
+import com.google.common.collect.Sets;
+
+public class WebTeamNameReservation implements TeamNameReservation {
+
+ @Override
+ public Set<String> getReserved() {
+ return Sets.newHashSet("new"); // reserved for url segment when creating new team
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WicketConfig.java b/gitplex.web/src/main/java/com/gitplex/web/WicketConfig.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WicketConfig.java
rename to gitplex.web/src/main/java/com/gitplex/web/WicketConfig.java
index 4ff50d3b42..f5e2374445 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WicketConfig.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WicketConfig.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web;
+package com.gitplex.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.pmease.commons.util.ExceptionUtils;
-import com.pmease.commons.wicket.AbstractWicketConfig;
-import com.pmease.gitplex.web.mapper.UrlMapper;
-import com.pmease.gitplex.web.page.error.BaseErrorPage;
-import com.pmease.gitplex.web.page.error.UnexpectedExceptionPage;
-import com.pmease.gitplex.web.page.error.ExpectedExceptionPage;
-import com.pmease.gitplex.web.page.home.DashboardPage;
+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;
@Singleton
public class WicketConfig extends AbstractWicketConfig {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/WicketUrlManager.java b/gitplex.web/src/main/java/com/gitplex/web/WicketUrlManager.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/WicketUrlManager.java
rename to gitplex.web/src/main/java/com/gitplex/web/WicketUrlManager.java
index 935b94fdf1..e5ae720935 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/WicketUrlManager.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/WicketUrlManager.java
@@ -1,17 +1,17 @@
-package com.pmease.gitplex.web;
+package com.gitplex.web;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.UrlManager;
+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;
@Singleton
public class WicketUrlManager implements UrlManager {
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.java
new file mode 100644
index 0000000000..d12a4bbb04
--- /dev/null
+++ b/gitplex.web/src/main/java/com/gitplex/web/assets/Assets.java
@@ -0,0 +1,5 @@
+package com.gitplex.web.assets;
+
+public class Assets {
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/AvatarGenerator.java b/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarGenerator.java
similarity index 99%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/AvatarGenerator.java
rename to gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarGenerator.java
index 76b5b4ac04..7bb1c7c1df 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/AvatarGenerator.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarGenerator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.avatar;
+package com.gitplex.web.avatar;
import java.awt.Color;
import java.awt.Font;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/AvatarManager.java b/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarManager.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/AvatarManager.java
rename to gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarManager.java
index 1acea43b00..dbaa0cfa1a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/AvatarManager.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/avatar/AvatarManager.java
@@ -1,36 +1,36 @@
-package com.pmease.gitplex.web.avatar;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.markup.html.form.upload.FileUpload;
-import org.eclipse.jgit.lib.PersonIdent;
-
-import com.pmease.gitplex.core.entity.Account;
-
-public interface AvatarManager {
-
- /**
- * Get URL of user avatar image.
- *
- * @param user
- * user to get avatar for
- * @return
- * url of avatar image. This url will be relative to context root if gravatar is disabled, or
- * a default avatar is returned when user is null
- */
- String getAvatarUrl(@Nullable Account user);
-
- /**
- * Get URL of avatar image of specified person.
- *
- * @param person
- * person to get avatar for
- * @return
- * url of avatar image. This url will be relative to context root if gravatar is disabled
- */
- String getAvatarUrl(PersonIdent person);
-
- void useAvatar(Account user, @Nullable FileUpload avatar);
-
-}
-
+package com.gitplex.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;
+
+public interface AvatarManager {
+
+ /**
+ * Get URL of user avatar image.
+ *
+ * @param user
+ * user to get avatar for
+ * @return
+ * url of avatar image. This url will be relative to context root if gravatar is disabled, or
+ * a default avatar is returned when user is null
+ */
+ String getAvatarUrl(@Nullable Account user);
+
+ /**
+ * Get URL of avatar image of specified person.
+ *
+ * @param person
+ * person to get avatar for
+ * @return
+ * url of avatar image. This url will be relative to context root if gravatar is disabled
+ */
+ String getAvatarUrl(PersonIdent person);
+
+ void useAvatar(Account user, @Nullable FileUpload avatar);
+
+}
+
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/DefaultAvatarManager.java b/gitplex.web/src/main/java/com/gitplex/web/avatar/DefaultAvatarManager.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/DefaultAvatarManager.java
rename to gitplex.web/src/main/java/com/gitplex/web/avatar/DefaultAvatarManager.java
index b2ce4cd583..6ae5e9cac0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/DefaultAvatarManager.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/avatar/DefaultAvatarManager.java
@@ -1,138 +1,138 @@
-package com.pmease.gitplex.web.avatar;
-
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
-import java.util.Date;
-import java.util.concurrent.locks.Lock;
-
-import javax.imageio.ImageIO;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.codec.binary.Hex;
-import org.apache.wicket.markup.html.form.upload.FileUpload;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.eclipse.jgit.lib.PersonIdent;
-
-import com.google.common.base.Splitter;
-import com.google.common.base.Throwables;
-import com.google.common.collect.Iterables;
-import com.pmease.commons.bootstrap.Bootstrap;
-import com.pmease.commons.hibernate.Transactional;
-import com.pmease.commons.util.LockUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-
-@Singleton
-public class DefaultAvatarManager implements AvatarManager {
-
- private static final int GRAVATAR_SIZE = 256;
-
- private static final String AVATARS_BASE_URL = "/site/avatars/";
-
- private final ConfigManager configManager;
-
- private final AccountManager accountManager;
-
- @Inject
- public DefaultAvatarManager(ConfigManager configManager, AccountManager accountManager) {
- this.configManager = configManager;
- this.accountManager = accountManager;
- }
-
- @Transactional
- @Override
- public String getAvatarUrl(Account account) {
- if (account == null)
- return AVATARS_BASE_URL + "default.png";
-
- if (account.getAvatarUploadDate() != null) {
- File avatarFile = new File(Bootstrap.getSiteDir(), "avatars/" + account.getId());
- if (avatarFile.exists()) {
- return AVATARS_BASE_URL + account.getId() + "?version=" + account.getAvatarUploadDate().getTime();
- } else {
- account.setAvatarUploadDate(null);
- accountManager.save(account, null);
- }
- }
-
- if (configManager.getSystemSetting().isGravatarEnabled() && !account.isOrganization())
- return Gravatar.getURL(account.getEmail(), GRAVATAR_SIZE);
- else
- return generateAvatar(account.getDisplayName(), account.getEmail());
- }
-
- private String generateAvatar(String primaryName, String secondaryName) {
- String encoded = Hex.encodeHexString((primaryName + ":" + AvatarGenerator.version()).getBytes());
-
- if (StringUtils.isBlank(primaryName))
- primaryName = "?";
- if (StringUtils.isBlank(secondaryName))
- secondaryName = primaryName;
-
- File avatarFile = new File(Bootstrap.getSiteDir(), "avatars/" + encoded);
- if (!avatarFile.exists()) {
- Lock avatarLock = LockUtils.getLock("avatars:" + encoded);
- avatarLock.lock();
- try {
- String letters = getLetter(primaryName);
- BufferedImage bi = AvatarGenerator.generate(letters, secondaryName);
- ImageIO.write(bi, "PNG", avatarFile);
- } catch (NoSuchAlgorithmException | IOException e) {
- throw new RuntimeException(e);
- } finally {
- avatarLock.unlock();
- }
- }
-
- return RequestCycle.get().getUrlRenderer().renderContextRelativeUrl(AVATARS_BASE_URL + encoded);
- }
-
- @Override
- public String getAvatarUrl(PersonIdent person) {
- if (configManager.getSystemSetting().isGravatarEnabled())
- return Gravatar.getURL(person.getEmailAddress(), GRAVATAR_SIZE);
- else
- return generateAvatar(person.getName(), person.getEmailAddress());
- }
-
- private String getLetter(String name) {
- String[] tokens = Iterables.toArray(Splitter.on(" ").split(name.trim()), String.class);
-
- char c = tokens[0].charAt(0);
- StringBuffer sb = new StringBuffer();
- sb.append(c);
-
- if (tokens.length > 1) {
- c = tokens[1].charAt(0);
- sb.append(c);
- }
-
- return sb.toString();
- }
-
- @Transactional
- @Override
- public void useAvatar(Account account, FileUpload upload) {
- if (upload != null) {
- Lock avatarLock = LockUtils.getLock("avatars:" + account.getId());
- avatarLock.lock();
- try {
- upload.writeTo(new File(Bootstrap.getSiteDir(), "avatars/" + account.getId()));
- } catch (Exception e) {
- throw Throwables.propagate(e);
- } finally {
- avatarLock.unlock();
- }
- account.setAvatarUploadDate(new Date());
- } else {
- account.setAvatarUploadDate(null);
- }
- accountManager.save(account, null);
- }
-
-}
+package com.gitplex.web.avatar;
+
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.security.NoSuchAlgorithmException;
+import java.util.Date;
+import java.util.concurrent.locks.Lock;
+
+import javax.imageio.ImageIO;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.codec.binary.Hex;
+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;
+import com.gitplex.commons.bootstrap.Bootstrap;
+import com.gitplex.commons.hibernate.Transactional;
+import com.gitplex.commons.util.LockUtils;
+import com.gitplex.commons.util.StringUtils;
+
+@Singleton
+public class DefaultAvatarManager implements AvatarManager {
+
+ private static final int GRAVATAR_SIZE = 256;
+
+ private static final String AVATARS_BASE_URL = "/site/avatars/";
+
+ private final ConfigManager configManager;
+
+ private final AccountManager accountManager;
+
+ @Inject
+ public DefaultAvatarManager(ConfigManager configManager, AccountManager accountManager) {
+ this.configManager = configManager;
+ this.accountManager = accountManager;
+ }
+
+ @Transactional
+ @Override
+ public String getAvatarUrl(Account account) {
+ if (account == null)
+ return AVATARS_BASE_URL + "default.png";
+
+ if (account.getAvatarUploadDate() != null) {
+ File avatarFile = new File(Bootstrap.getSiteDir(), "avatars/" + account.getId());
+ if (avatarFile.exists()) {
+ return AVATARS_BASE_URL + account.getId() + "?version=" + account.getAvatarUploadDate().getTime();
+ } else {
+ account.setAvatarUploadDate(null);
+ accountManager.save(account, null);
+ }
+ }
+
+ if (configManager.getSystemSetting().isGravatarEnabled() && !account.isOrganization())
+ return Gravatar.getURL(account.getEmail(), GRAVATAR_SIZE);
+ else
+ return generateAvatar(account.getDisplayName(), account.getEmail());
+ }
+
+ private String generateAvatar(String primaryName, String secondaryName) {
+ String encoded = Hex.encodeHexString((primaryName + ":" + AvatarGenerator.version()).getBytes());
+
+ if (StringUtils.isBlank(primaryName))
+ primaryName = "?";
+ if (StringUtils.isBlank(secondaryName))
+ secondaryName = primaryName;
+
+ File avatarFile = new File(Bootstrap.getSiteDir(), "avatars/" + encoded);
+ if (!avatarFile.exists()) {
+ Lock avatarLock = LockUtils.getLock("avatars:" + encoded);
+ avatarLock.lock();
+ try {
+ String letters = getLetter(primaryName);
+ BufferedImage bi = AvatarGenerator.generate(letters, secondaryName);
+ ImageIO.write(bi, "PNG", avatarFile);
+ } catch (NoSuchAlgorithmException | IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ avatarLock.unlock();
+ }
+ }
+
+ return RequestCycle.get().getUrlRenderer().renderContextRelativeUrl(AVATARS_BASE_URL + encoded);
+ }
+
+ @Override
+ public String getAvatarUrl(PersonIdent person) {
+ if (configManager.getSystemSetting().isGravatarEnabled())
+ return Gravatar.getURL(person.getEmailAddress(), GRAVATAR_SIZE);
+ else
+ return generateAvatar(person.getName(), person.getEmailAddress());
+ }
+
+ private String getLetter(String name) {
+ String[] tokens = Iterables.toArray(Splitter.on(" ").split(name.trim()), String.class);
+
+ char c = tokens[0].charAt(0);
+ StringBuffer sb = new StringBuffer();
+ sb.append(c);
+
+ if (tokens.length > 1) {
+ c = tokens[1].charAt(0);
+ sb.append(c);
+ }
+
+ return sb.toString();
+ }
+
+ @Transactional
+ @Override
+ public void useAvatar(Account account, FileUpload upload) {
+ if (upload != null) {
+ Lock avatarLock = LockUtils.getLock("avatars:" + account.getId());
+ avatarLock.lock();
+ try {
+ upload.writeTo(new File(Bootstrap.getSiteDir(), "avatars/" + account.getId()));
+ } catch (Exception e) {
+ throw Throwables.propagate(e);
+ } finally {
+ avatarLock.unlock();
+ }
+ account.setAvatarUploadDate(new Date());
+ } else {
+ account.setAvatarUploadDate(null);
+ }
+ accountManager.save(account, null);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/Gravatar.java b/gitplex.web/src/main/java/com/gitplex/web/avatar/Gravatar.java
similarity index 99%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/Gravatar.java
rename to gitplex.web/src/main/java/com/gitplex/web/avatar/Gravatar.java
index 45b1be67a7..36c751719c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/avatar/Gravatar.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/avatar/Gravatar.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.avatar;
+package com.gitplex.web.avatar;
import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageBehavior.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageBehavior.java
index d051a1b065..1ecbb1ef9a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageBehavior.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.behavior;
+package com.gitplex.web.behavior;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -10,9 +10,9 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.eclipse.jgit.revwalk.RevCommit;
import org.unbescape.javascript.JavaScriptEscape;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.util.DateUtils;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageCssResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageCssResourceReference.java
similarity index 69%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageCssResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageCssResourceReference.java
index 961f2df219..633d587711 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageCssResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageCssResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.behavior;
+package com.gitplex.web.behavior;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
public class BlameMessageCssResourceReference extends BaseDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageResourceReference.java
index a95e138f1d..02cfdc5c68 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/BlameMessageResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/behavior/BlameMessageResourceReference.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.behavior;
+package com.gitplex.web.behavior;
import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class BlameMessageResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/blame-message.css b/gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/blame-message.css
rename to gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/blame-message.js b/gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/behavior/blame-message.js
rename to gitplex.web/src/main/java/com/gitplex/web/behavior/blame-message.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/AccountLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/AccountLink.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/AccountLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/AccountLink.java
index 6308a2c712..ffe4d2cf7f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/AccountLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/AccountLink.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.page.account.AccountPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+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;
@SuppressWarnings("serial")
public class AccountLink extends BookmarkablePageLink<Void> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/BlobIcon.java b/gitplex.web/src/main/java/com/gitplex/web/component/BlobIcon.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/BlobIcon.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/BlobIcon.java
index 539dd0d164..8903a7e366 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/BlobIcon.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/BlobIcon.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.component;
+package com.gitplex.web.component;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.pmease.commons.git.BlobIdent;
+import com.gitplex.commons.git.BlobIdent;
@SuppressWarnings("serial")
public class BlobIcon extends WebComponent {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/BranchLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/BranchLink.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/BranchLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/BranchLink.java
index 03dc9cee13..1176ba9d1d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/BranchLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/BranchLink.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component;
+package com.gitplex.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.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+import com.gitplex.core.entity.support.DepotAndBranch;
+import com.gitplex.web.page.depot.DepotPage;
+import com.gitplex.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
public class BranchLink extends BookmarkablePageLink<Void> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/DepotPicker.java b/gitplex.web/src/main/java/com/gitplex/web/component/DepotPicker.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/DepotPicker.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/DepotPicker.java
index 91d19f916f..a279ee0ae7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/DepotPicker.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/DepotPicker.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.depotselector.DepotSelector;
+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;
@SuppressWarnings("serial")
public abstract class DepotPicker extends DropdownLink {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/EmailLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/EmailLink.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/EmailLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/EmailLink.java
index 437236e94a..ac352ea59c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/EmailLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/EmailLink.java
@@ -1,37 +1,37 @@
-package com.pmease.gitplex.web.component;
-
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.MarkupStream;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.model.IModel;
-
-@SuppressWarnings("serial")
-public class EmailLink extends WebMarkupContainer {
-
- private final IModel<String> emailModel;
-
- public EmailLink(String id, IModel<String> emailModel) {
- super(id);
- this.emailModel = emailModel;
- }
-
- @Override
- public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
- replaceComponentTagBody(markupStream, openTag, emailModel.getObject());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(AttributeAppender.append("href", "mailto:" + emailModel.getObject()));
- }
-
- @Override
- protected void onDetach() {
- emailModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.MarkupStream;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.model.IModel;
+
+@SuppressWarnings("serial")
+public class EmailLink extends WebMarkupContainer {
+
+ private final IModel<String> emailModel;
+
+ public EmailLink(String id, IModel<String> emailModel) {
+ super(id);
+ this.emailModel = emailModel;
+ }
+
+ @Override
+ public void onComponentTagBody(MarkupStream markupStream, ComponentTag openTag) {
+ replaceComponentTagBody(markupStream, openTag, emailModel.getObject());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(AttributeAppender.append("href", "mailto:" + emailModel.getObject()));
+ }
+
+ @Override
+ protected void onDetach() {
+ emailModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java
index 002d2bbf65..4c3ba41412 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AbstractAccountChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.avatar.AvatarManager;
+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
public abstract class AbstractAccountChoiceProvider extends ChoiceProvider<Account> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceProvider.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceProvider.java
index f538b075ed..e298715d6e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountchoice;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.Constants;
+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;
public class AccountChoiceProvider extends AbstractAccountChoiceProvider {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java
index def6ba8d18..716b83fc3c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountChoiceResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountchoice;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class AccountChoiceResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountMultiChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountMultiChoice.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountMultiChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountMultiChoice.java
index e48b95f535..bac84a1d2c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountMultiChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountMultiChoice.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.Select2MultiChoice;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.core.entity.Account;
+import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
public class AccountMultiChoice extends Select2MultiChoice<Account> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountSingleChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountSingleChoice.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountSingleChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountSingleChoice.java
index 195f6621d2..ba299f0ad7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AccountSingleChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AccountSingleChoice.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.component.accountchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.Select2Choice;
-import com.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
+import com.gitplex.commons.wicket.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class AccountSingleChoice extends Select2Choice<Account> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
index 89954166d7..616deab800 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/AdministrativeAccountChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
+import com.gitplex.commons.wicket.component.select2.Response;
+import com.gitplex.commons.wicket.component.select2.ResponseFiller;
public class AdministrativeAccountChoiceProvider extends AbstractAccountChoiceProvider {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/account-choice.css b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/account-choice.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/account-choice.js b/gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountchoice/account-choice.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountchoice/account-choice.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelector.html b/gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelector.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelector.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelector.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelector.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelector.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelector.java
index 2e38f150c1..40f3030e7c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelector.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelector.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountselector;
+package com.gitplex.web.component.accountselector;
import java.util.Collections;
import java.util.List;
@@ -19,10 +19,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.core.entity.Account;
+import com.gitplex.web.component.avatar.Avatar;
+import com.gitplex.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
public abstract class OrganizationSelector extends GenericPanel<Account> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelectorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelectorResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelectorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelectorResourceReference.java
index d8eef4b4b8..2578600758 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/OrganizationSelectorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/accountselector/OrganizationSelectorResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.accountselector;
+package com.gitplex.web.component.accountselector;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/organization-selector.css b/gitplex.web/src/main/java/com/gitplex/web/component/accountselector/organization-selector.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/accountselector/organization-selector.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/accountselector/organization-selector.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/archivemenulink/ArchiveMenuLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/archivemenulink/ArchiveMenuLink.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/archivemenulink/ArchiveMenuLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/archivemenulink/ArchiveMenuLink.java
index f57ad760d6..977fd0b73f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/archivemenulink/ArchiveMenuLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/archivemenulink/ArchiveMenuLink.java
@@ -1,91 +1,91 @@
-package com.pmease.gitplex.web.component.archivemenulink;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.markup.html.link.AbstractLink;
-import org.apache.wicket.markup.html.link.ResourceLink;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.wicket.component.menu.MenuItem;
-import com.pmease.commons.wicket.component.menu.MenuLink;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.resource.ArchiveResource;
-import com.pmease.gitplex.web.resource.ArchiveResourceReference;
-
-@SuppressWarnings("serial")
-public abstract class ArchiveMenuLink extends MenuLink {
-
- private final IModel<Depot> depotModel;
-
- public ArchiveMenuLink(String id, IModel<Depot> depotModel) {
- super(id);
- this.depotModel = depotModel;
- }
-
- @Override
- protected List<MenuItem> getMenuItems() {
- List<MenuItem> menuItems = new ArrayList<>();
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "zip";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new ResourceLink<Void>(id, new ArchiveResourceReference(),
- ArchiveResource.paramsOf(depotModel.getObject(), getRevision(), ArchiveResource.FORMAT_ZIP)) {
-
- @Override
- protected CharSequence getOnClickScript(CharSequence url) {
- return closeBeforeClick(super.getOnClickScript(url));
- }
-
- };
- }
-
- });
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "tar.gz";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new ResourceLink<Void>(id, new ArchiveResourceReference(),
- ArchiveResource.paramsOf(depotModel.getObject(), getRevision(), ArchiveResource.FORMAT_TGZ)) {
-
- @Override
- protected CharSequence getOnClickScript(CharSequence url) {
- return closeBeforeClick(super.getOnClickScript(url));
- }
-
- };
- }
-
- });
- return menuItems;
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
- protected abstract String getRevision();
-}
+package com.gitplex.web.component.archivemenulink;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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;
+
+@SuppressWarnings("serial")
+public abstract class ArchiveMenuLink extends MenuLink {
+
+ private final IModel<Depot> depotModel;
+
+ public ArchiveMenuLink(String id, IModel<Depot> depotModel) {
+ super(id);
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected List<MenuItem> getMenuItems() {
+ List<MenuItem> menuItems = new ArrayList<>();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "zip";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new ResourceLink<Void>(id, new ArchiveResourceReference(),
+ ArchiveResource.paramsOf(depotModel.getObject(), getRevision(), ArchiveResource.FORMAT_ZIP)) {
+
+ @Override
+ protected CharSequence getOnClickScript(CharSequence url) {
+ return closeBeforeClick(super.getOnClickScript(url));
+ }
+
+ };
+ }
+
+ });
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "tar.gz";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new ResourceLink<Void>(id, new ArchiveResourceReference(),
+ ArchiveResource.paramsOf(depotModel.getObject(), getRevision(), ArchiveResource.FORMAT_TGZ)) {
+
+ @Override
+ protected CharSequence getOnClickScript(CharSequence url) {
+ return closeBeforeClick(super.getOnClickScript(url));
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+ protected abstract String getRevision();
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/Avatar.java b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/Avatar.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/Avatar.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/Avatar.java
index 5178cc87f5..bfc700ff76 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/Avatar.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/Avatar.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.avatar;
+package com.gitplex.web.component.avatar;
import javax.annotation.Nullable;
@@ -10,11 +10,11 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.model.Model;
import org.eclipse.jgit.lib.PersonIdent;
-import com.pmease.commons.wicket.behavior.TooltipBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.avatar.AvatarManager;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarChanged.java b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarChanged.java
similarity index 63%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarChanged.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarChanged.java
index 17ae3c9f2d..ef927eed40 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarChanged.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarChanged.java
@@ -1,22 +1,22 @@
-package com.pmease.gitplex.web.component.avatar;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import com.pmease.commons.wicket.AjaxEvent;
-import com.pmease.gitplex.core.entity.Account;
-
-public class AvatarChanged extends AjaxEvent {
-
- private final Account user;
-
- public AvatarChanged(AjaxRequestTarget target, Account user) {
- super(target);
-
- this.user = user;
- }
-
- public Account getUser() {
- return user;
- }
-
+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 user;
+
+ public AvatarChanged(AjaxRequestTarget target, Account user) {
+ super(target);
+
+ this.user = user;
+ }
+
+ public Account getUser() {
+ return user;
+ }
+
}
\ No newline at end of file
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarLink.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarLink.java
index 6a4fe0f77a..bb28b4dff0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarLink.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.avatar;
+package com.gitplex.web.component.avatar;
import javax.annotation.Nullable;
@@ -12,13 +12,13 @@ import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.PersonIdent;
-import com.pmease.commons.wicket.behavior.TooltipBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.avatar.AvatarManager;
-import com.pmease.gitplex.web.page.account.AccountPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarResourceReference.java
index 89133dc69a..03abb67352 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/AvatarResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/AvatarResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.avatar;
+package com.gitplex.web.component.avatar;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/ContributorAvatars.html b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/ContributorAvatars.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/ContributorAvatars.java b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/ContributorAvatars.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.java
index 102e2d502e..77d74842f4 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/ContributorAvatars.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/ContributorAvatars.java
@@ -1,53 +1,53 @@
-package com.pmease.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.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/pmease/gitplex/web/component/avatar/RemoveableAvatar.html b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/RemoveableAvatar.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/RemoveableAvatar.java b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/RemoveableAvatar.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.java
index 9b7041121a..6d94711803 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/RemoveableAvatar.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/RemoveableAvatar.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.avatar;
+package com.gitplex.web.component.avatar;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -9,10 +9,10 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.pmease.commons.wicket.behavior.TooltipBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.avatar.AvatarManager;
+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> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/avatar.css b/gitplex.web/src/main/java/com/gitplex/web/component/avatar/avatar.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/avatar/avatar.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/avatar/avatar.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceProvider.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceProvider.java
index 526f2b8fb5..f63359c11b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchchoice;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.Constants;
+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;
@SuppressWarnings("serial")
public class BranchChoiceProvider extends ChoiceProvider<String> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java
index 607b36bc94..9f2773163b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchChoiceResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchchoice;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class BranchChoiceResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchMultiChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchMultiChoice.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchMultiChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchMultiChoice.java
index 83786f209a..80b9a09760 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchMultiChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchMultiChoice.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchchoice;
+package com.gitplex.web.component.branchchoice;
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.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.commons.wicket.component.select2.Select2MultiChoice;
+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
+import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
@SuppressWarnings("serial")
public class BranchMultiChoice extends Select2MultiChoice<String> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchSingleChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchSingleChoice.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchSingleChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchSingleChoice.java
index d60a937375..4329bb39b2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/BranchSingleChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/BranchSingleChoice.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.component.branchchoice;
+package com.gitplex.web.component.branchchoice;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.commons.wicket.component.select2.Select2Choice;
+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
+import com.gitplex.commons.wicket.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class BranchSingleChoice extends Select2Choice<String> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/branch-choice.css b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/branch-choice.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/branch-choice.js b/gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchchoice/branch-choice.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchchoice/branch-choice.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchmatch/BranchMatchBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchBehavior.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchmatch/BranchMatchBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchBehavior.java
index 86887e0b26..72e71b63f5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchmatch/BranchMatchBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchBehavior.java
@@ -1,83 +1,83 @@
-package com.pmease.gitplex.web.component.branchmatch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.antlr.codeassist.FenceAware;
-import com.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.antlr.codeassist.ParentedElement;
-import com.pmease.commons.antlr.grammar.ElementSpec;
-import com.pmease.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.pmease.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser;
-import com.pmease.gitplex.web.util.SuggestionUtils;
-
-@SuppressWarnings("serial")
-public class BranchMatchBehavior extends ANTLRAssistBehavior {
-
- private final IModel<Depot> depotModel;
-
- private static final String VALUE_OPEN = "(";
-
- private static final String VALUE_CLOSE = ")";
-
- public BranchMatchBehavior(IModel<Depot> depotModel) {
- super(IncludeExcludeParser.class, "match");
- this.depotModel = depotModel;
- }
-
- @Override
- public void detach(Component component) {
- super.detach(component);
- depotModel.detach();
- }
-
- @Override
- protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith, int count) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
-
- @Override
- protected List<InputSuggestion> match(String unfencedMatchWith, int count) {
- return SuggestionUtils.suggestBranch(depotModel.getObject(), unfencedMatchWith, count,
- null, "any branch");
- }
-
- @Override
- protected String getFencingDescription() {
- return "value needs to be enclosed in brackets";
- }
-
- }.suggest(expectedElement.getSpec(), matchWith, count);
- }
- }
- return null;
- }
-
- @Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- List<String> hints = new ArrayList<>();
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
- hints.add("Use * to match any part of branch");
- }
- }
- return hints;
- }
-
- @Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
-}
+package com.gitplex.web.component.branchmatch;
+
+import java.util.ArrayList;
+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;
+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;
+
+@SuppressWarnings("serial")
+public class BranchMatchBehavior extends ANTLRAssistBehavior {
+
+ private final IModel<Depot> depotModel;
+
+ private static final String VALUE_OPEN = "(";
+
+ private static final String VALUE_CLOSE = ")";
+
+ public BranchMatchBehavior(IModel<Depot> depotModel) {
+ super(IncludeExcludeParser.class, "match");
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ public void detach(Component component) {
+ super.detach(component);
+ depotModel.detach();
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith, int count) {
+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ if (spec.getRuleName().equals("Value")) {
+ return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith, int count) {
+ return SuggestionUtils.suggestBranch(depotModel.getObject(), unfencedMatchWith, count,
+ null, "any branch");
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "value needs to be enclosed in brackets";
+ }
+
+ }.suggest(expectedElement.getSpec(), matchWith, count);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
+ List<String> hints = new ArrayList<>();
+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
+ hints.add("Use * to match any part of branch");
+ }
+ }
+ return hints;
+ }
+
+ @Override
+ protected int getEndOfMatch(ElementSpec spec, String content) {
+ if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
+ return 2;
+ else
+ return super.getEndOfMatch(spec, content);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchmatch/BranchMatchInput.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchInput.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchmatch/BranchMatchInput.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchInput.java
index 1e2eabda5f..7fe98e4e96 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchmatch/BranchMatchInput.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchmatch/BranchMatchInput.java
@@ -1,62 +1,62 @@
-package com.pmease.gitplex.web.component.branchmatch;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
-import org.apache.wicket.validation.IValidator;
-
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
-
-@SuppressWarnings("serial")
-public class BranchMatchInput extends TextField<String> {
-
- private final IModel<Depot> depotModel;
-
- public BranchMatchInput(String id, IModel<Depot> depotModel, IModel<String> branchMatchModel) {
- super(id, branchMatchModel);
-
- this.depotModel = depotModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new BranchMatchBehavior(depotModel));
- add(new IValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- try {
- IncludeExcludeUtils.parse(validatable.getValue());
- } catch (Exception e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- if (StringUtils.isNotBlank(e.getMessage()))
- return e.getMessage();
- else
- return "Syntax error";
- }
-
- });
- }
- }
-
- });
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.branchmatch;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.validation.IErrorMessageSource;
+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;
+
+@SuppressWarnings("serial")
+public class BranchMatchInput extends TextField<String> {
+
+ private final IModel<Depot> depotModel;
+
+ public BranchMatchInput(String id, IModel<Depot> depotModel, IModel<String> branchMatchModel) {
+ super(id, branchMatchModel);
+
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new BranchMatchBehavior(depotModel));
+ add(new IValidator<String>() {
+
+ @Override
+ public void validate(IValidatable<String> validatable) {
+ try {
+ IncludeExcludeUtils.parse(validatable.getValue());
+ } catch (Exception e) {
+ validatable.error(new IValidationError() {
+
+ @Override
+ public Serializable getErrorMessage(IErrorMessageSource messageSource) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ return e.getMessage();
+ else
+ return "Syntax error";
+ }
+
+ });
+ }
+ }
+
+ });
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/AffinalBranchPicker.html b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/AffinalBranchPicker.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/AffinalBranchPicker.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/AffinalBranchPicker.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.java
index 664533b3dc..468998d158 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/AffinalBranchPicker.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/AffinalBranchPicker.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchpicker;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.DepotPicker;
-import com.pmease.gitplex.web.model.AffinalDepotsModel;
+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;
@SuppressWarnings("serial")
public abstract class AffinalBranchPicker extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchPicker.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPicker.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchPicker.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPicker.java
index d5f17f7ea5..00073d040b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchPicker.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPicker.java
@@ -1,62 +1,62 @@
-package com.pmease.gitplex.web.component.branchpicker;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.unbescape.html.HtmlEscape;
-
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.entity.Depot;
-
-@SuppressWarnings("serial")
-public abstract class BranchPicker extends DropdownLink {
-
- private final IModel<Depot> depotModel;
-
- private String branch;
-
- public BranchPicker(String id, IModel<Depot> depotModel, String branch) {
- super(id);
-
- this.depotModel = depotModel;
- this.branch = branch;
- }
-
- @Override
- protected Component newContent(String id) {
- return new BranchSelector(id, depotModel, branch) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, String branch) {
- close();
- BranchPicker.this.branch = branch;
- target.add(BranchPicker.this);
-
- BranchPicker.this.onSelect(target, branch);
- }
-
- };
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- setEscapeModelStrings(false);
- }
-
- @Override
- public IModel<?> getBody() {
- return Model.of(String.format("<i class='fa fa-code-fork'></i> <span>%s</span> <i class='fa fa-caret-down'></i>",
- HtmlEscape.escapeHtml5(branch)));
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
- protected abstract void onSelect(AjaxRequestTarget target, String branch);
-}
+package com.gitplex.web.component.branchpicker;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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;
+
+@SuppressWarnings("serial")
+public abstract class BranchPicker extends DropdownLink {
+
+ private final IModel<Depot> depotModel;
+
+ private String branch;
+
+ public BranchPicker(String id, IModel<Depot> depotModel, String branch) {
+ super(id);
+
+ this.depotModel = depotModel;
+ this.branch = branch;
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new BranchSelector(id, depotModel, branch) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, String branch) {
+ close();
+ BranchPicker.this.branch = branch;
+ target.add(BranchPicker.this);
+
+ BranchPicker.this.onSelect(target, branch);
+ }
+
+ };
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ setEscapeModelStrings(false);
+ }
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(String.format("<i class='fa fa-code-fork'></i> <span>%s</span> <i class='fa fa-caret-down'></i>",
+ HtmlEscape.escapeHtml5(branch)));
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, String branch);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchPickerResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPickerResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchPickerResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPickerResourceReference.java
index 28622230dd..4fbfb37b0b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchPickerResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchPickerResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchpicker;
+package com.gitplex.web.component.branchpicker;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelector.html b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelector.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelector.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.java
index 452be1bd5e..1d27f4e5ed 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelector.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelector.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchpicker;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.behavior.InputChangeBehavior;
-import com.pmease.gitplex.core.entity.Depot;
+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;
@SuppressWarnings("serial")
public abstract class BranchSelector extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java
index b895f53694..a5f8f8d486 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/BranchSelectorResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.branchpicker;
+package com.gitplex.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.pmease.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
public class BranchSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/branch-picker.css b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-picker.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/branch-picker.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-picker.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/branch-selector.css b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/branch-selector.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/branch-selector.js b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/branch-selector.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/branch-selector.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/search.gif b/gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/search.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/branchpicker/search.gif
rename to gitplex.web/src/main/java/com/gitplex/web/component/branchpicker/search.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentAware.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentAware.java
similarity index 66%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentAware.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentAware.java
index e61d2a4f05..d181e698c5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentAware.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentAware.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.web.component.comment;
import java.util.List;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentFilter.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentFilter.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentFilter.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentFilter.java
index b8b12fefc1..b509c73582 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentFilter.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentFilter.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.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.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.annotation.AccountChoice;
-import com.pmease.gitplex.core.annotation.FileChoice;
-import com.pmease.gitplex.core.entity.CodeComment;
+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;
@Editable
public class CodeCommentFilter implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.java
index a9eaa42199..fb63deeb37 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.util.DateUtils;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListResourceReference.java
index 3729860e5f..7240139cc2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentListResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentListResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.web.component.comment;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.java
index 66daadfe17..b42d50896d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.web.component.comment;
import java.io.Serializable;
import java.util.ArrayList;
@@ -31,34 +31,34 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.StaleStateException;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.util.ClassUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmListener;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentReply;
-import com.pmease.gitplex.core.entity.CodeCommentStatusChange;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.entity.support.DepotAndRevision;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.CodeCommentReplyManager;
-import com.pmease.gitplex.core.manager.CodeCommentStatusChangeManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.util.DateUtils;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentResourceReference.java
index 64ffc4cd70..a9f57132cf 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CodeCommentResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CodeCommentResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.web.component.comment;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInput.html b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInput.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInput.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInput.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.java
index 1090d927e8..8b67d9ace8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInput.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInput.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.behavior.markdown.MarkdownBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.web.avatar.AvatarManager;
+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;
@SuppressWarnings("serial")
public abstract class CommentInput extends TextArea<String> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInputResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInputResourceReference.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInputResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInputResourceReference.java
index 4fe732db27..c8a427aa4f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/CommentInputResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/CommentInputResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.web.component.comment;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class CommentInputResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/DepotAttachmentSupport.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/DepotAttachmentSupport.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/DepotAttachmentSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/DepotAttachmentSupport.java
index e73751ed20..5d5ed01d0b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/DepotAttachmentSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/DepotAttachmentSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.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.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AttachmentManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.resource.AttachmentResource;
-import com.pmease.gitplex.web.resource.AttachmentResourceReference;
+import com.gitplex.commons.util.FileUtils;
+import com.gitplex.commons.util.StringUtils;
+import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
import jersey.repackaged.com.google.common.base.Throwables;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/MentionTransformer.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/MentionTransformer.java
similarity index 64%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/MentionTransformer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/MentionTransformer.java
index 916a3cce6d..5430931e1d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/MentionTransformer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/MentionTransformer.java
@@ -1,29 +1,29 @@
-package com.pmease.gitplex.web.component.comment;
-
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.jsoup.nodes.Element;
-
-import com.pmease.commons.markdown.extensionpoint.HtmlTransformer;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.util.markdown.MentionParser;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-
-public class MentionTransformer extends MentionParser implements HtmlTransformer {
-
- @Override
- public Element transform(Element body) {
- parseMentions(body);
- return body;
- }
-
- @Override
- protected String toHtml(Account user) {
- if (RequestCycle.get() != null) {
- return String.format("<a href='%s' class='mention'>@%s</a>",
- RequestCycle.get().urlFor(AccountOverviewPage.class, AccountOverviewPage.paramsOf(user)), user.getName());
- } else {
- return super.toHtml(user);
- }
- }
-
-}
+package com.gitplex.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;
+
+public class MentionTransformer extends MentionParser implements HtmlTransformer {
+
+ @Override
+ public Element transform(Element body) {
+ parseMentions(body);
+ return body;
+ }
+
+ @Override
+ protected String toHtml(Account user) {
+ if (RequestCycle.get() != null) {
+ return String.format("<a href='%s' class='mention'>@%s</a>",
+ RequestCycle.get().urlFor(AccountOverviewPage.class, AccountOverviewPage.paramsOf(user)), user.getName());
+ } else {
+ return super.toHtml(user);
+ }
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/PullRequestTransformer.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/PullRequestTransformer.java
similarity index 62%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/PullRequestTransformer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/PullRequestTransformer.java
index f468040df1..9e4f9523bf 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/PullRequestTransformer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/PullRequestTransformer.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.web.component.comment;
+package com.gitplex.web.component.comment;
import org.apache.wicket.request.cycle.RequestCycle;
import org.jsoup.nodes.Element;
-import com.pmease.commons.markdown.extensionpoint.HtmlTransformer;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.util.markdown.PullRequestParser;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
+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;
public class PullRequestTransformer extends PullRequestParser implements HtmlTransformer {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/code-comment-list.css b/gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment-list.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/code-comment-list.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment-list.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/code-comment.css b/gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/code-comment.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/code-comment.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comment-input.js b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comment-input.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comment-input.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/comment-input.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.java
index 6d562837d9..3a6b82b43d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.comment.comparecontext;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.DepotAndRevision;
-import com.pmease.gitplex.web.component.revisionpicker.RevisionSelector;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
+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;
@SuppressWarnings("serial")
public class CompareContextPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java
similarity index 65%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java
index b7730316f7..3730e3e58b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/CompareContextResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.component.comment.comparecontext;
+package com.gitplex.web.component.comment.comparecontext;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
public class CompareContextResourceReference extends BaseDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/compare-context.css b/gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/compare-context.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/comment/comparecontext/compare-context.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/comment/comparecontext/compare-context.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/CommitGraphResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/CommitGraphResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphResourceReference.java
index aac41c7843..7391688d66 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/CommitGraphResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.commitgraph;
+package com.gitplex.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.pmease.commons.wicket.assets.snapsvg.SnapSvgResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.snapsvg.SnapSvgResourceReference;
public class CommitGraphResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/CommitGraphUtils.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphUtils.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/CommitGraphUtils.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphUtils.java
index da694397c3..944068a6fa 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/CommitGraphUtils.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/CommitGraphUtils.java
@@ -1,84 +1,84 @@
-package com.pmease.gitplex.web.component.commitgraph;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.pmease.gitplex.core.GitPlex;
-
-public class CommitGraphUtils {
-
- public static void sort(List<RevCommit> commits, int from) {
- final Map<String, Long> hash2index = new HashMap<>();
- Map<String, RevCommit> hash2commit = new HashMap<>();
- for (int i=0; i<commits.size(); i++) {
- RevCommit commit = commits.get(i);
- hash2index.put(commit.name(), 1L*i*commits.size());
- hash2commit.put(commit.name(), commit);
- }
-
- Stack<RevCommit> stack = new Stack<>();
-
- for (int i=commits.size()-1; i>=from; i--)
- stack.push(commits.get(i));
-
- // commits are nearly ordered, so this should be fast
- while (!stack.isEmpty()) {
- RevCommit commit = stack.pop();
- long commitIndex = hash2index.get(commit.name());
- int count = 1;
- for (RevCommit parent: commit.getParents()) {
- String parentHash = parent.name();
- Long parentIndex = hash2index.get(parentHash);
- if (parentIndex != null && parentIndex.longValue()<commitIndex) {
- stack.push(hash2commit.get(parentHash));
- hash2index.put(parentHash, commitIndex+(count++));
- }
- }
- }
-
- commits.sort((o1, o2) -> {
- long value = hash2index.get(o1.name()) - hash2index.get(o2.name());
- if (value < 0)
- return -1;
- else if (value > 0)
- return 1;
- else
- return 0;
- });
- }
-
- public static String asJSON(List<RevCommit> commits) {
- Map<String, Integer> hash2index = new HashMap<>();
- int commitIndex = 0;
- for (int i=0; i<commits.size(); i++) {
- RevCommit commit = commits.get(i);
- if (commit != null)
- hash2index.put(commit.name(), commitIndex++);
- }
- List<List<Integer>> commitIndexes = new ArrayList<>();
- for (RevCommit commit: commits) {
- if (commit != null) {
- List<Integer> parentIndexes = new ArrayList<>();
- for (RevCommit parent: commit.getParents()) {
- Integer parentIndex = hash2index.get(parent.name());
- if (parentIndex != null)
- parentIndexes.add(parentIndex);
- }
- commitIndexes.add(parentIndexes);
- }
- }
- try {
- return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commitIndexes);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
+package com.gitplex.web.component.commitgraph;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.gitplex.core.GitPlex;
+
+public class CommitGraphUtils {
+
+ public static void sort(List<RevCommit> commits, int from) {
+ final Map<String, Long> hash2index = new HashMap<>();
+ Map<String, RevCommit> hash2commit = new HashMap<>();
+ for (int i=0; i<commits.size(); i++) {
+ RevCommit commit = commits.get(i);
+ hash2index.put(commit.name(), 1L*i*commits.size());
+ hash2commit.put(commit.name(), commit);
+ }
+
+ Stack<RevCommit> stack = new Stack<>();
+
+ for (int i=commits.size()-1; i>=from; i--)
+ stack.push(commits.get(i));
+
+ // commits are nearly ordered, so this should be fast
+ while (!stack.isEmpty()) {
+ RevCommit commit = stack.pop();
+ long commitIndex = hash2index.get(commit.name());
+ int count = 1;
+ for (RevCommit parent: commit.getParents()) {
+ String parentHash = parent.name();
+ Long parentIndex = hash2index.get(parentHash);
+ if (parentIndex != null && parentIndex.longValue()<commitIndex) {
+ stack.push(hash2commit.get(parentHash));
+ hash2index.put(parentHash, commitIndex+(count++));
+ }
+ }
+ }
+
+ commits.sort((o1, o2) -> {
+ long value = hash2index.get(o1.name()) - hash2index.get(o2.name());
+ if (value < 0)
+ return -1;
+ else if (value > 0)
+ return 1;
+ else
+ return 0;
+ });
+ }
+
+ public static String asJSON(List<RevCommit> commits) {
+ Map<String, Integer> hash2index = new HashMap<>();
+ int commitIndex = 0;
+ for (int i=0; i<commits.size(); i++) {
+ RevCommit commit = commits.get(i);
+ if (commit != null)
+ hash2index.put(commit.name(), commitIndex++);
+ }
+ List<List<Integer>> commitIndexes = new ArrayList<>();
+ for (RevCommit commit: commits) {
+ if (commit != null) {
+ List<Integer> parentIndexes = new ArrayList<>();
+ for (RevCommit parent: commit.getParents()) {
+ Integer parentIndex = hash2index.get(parent.name());
+ if (parentIndex != null)
+ parentIndexes.add(parentIndex);
+ }
+ commitIndexes.add(parentIndexes);
+ }
+ }
+ try {
+ return GitPlex.getInstance(ObjectMapper.class).writeValueAsString(commitIndexes);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/commit-graph.css b/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/commit-graph.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/commit-graph.js b/gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitgraph/commit-graph.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitgraph/commit-graph.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.java
index 08eb95a332..f2f4a6286e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashPanel.java
@@ -1,33 +1,33 @@
-package com.pmease.gitplex.web.component.commithash;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.Model;
-
-@SuppressWarnings("serial")
-public class CommitHashPanel extends Panel {
-
- private final String commitHash;
-
- public CommitHashPanel(String id, String commitHash) {
- super(id);
-
- this.commitHash = commitHash;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new TextField<String>("hash", Model.of(commitHash)));
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new CommitHashResourceReference()));
- }
-
-}
+package com.gitplex.web.component.commithash;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+@SuppressWarnings("serial")
+public class CommitHashPanel extends Panel {
+
+ private final String commitHash;
+
+ public CommitHashPanel(String id, String commitHash) {
+ super(id);
+
+ this.commitHash = commitHash;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new TextField<String>("hash", Model.of(commitHash)));
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new CommitHashResourceReference()));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashResourceReference.java
index 643d19592a..63e9fe3d71 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/CommitHashResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commithash/CommitHashResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.commithash;
+package com.gitplex.web.component.commithash;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/commit-hash.css b/gitplex.web/src/main/java/com/gitplex/web/component/commithash/commit-hash.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commithash/commit-hash.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/commithash/commit-hash.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.java
index c2e97f5c78..2df1cdb998 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.commitlist;
+package com.gitplex.web.component.commitlist;
import java.util.ArrayList;
import java.util.List;
@@ -27,19 +27,19 @@ import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.revwalk.RevCommit;
import org.joda.time.DateTime;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.ContributorAvatars;
-import com.pmease.gitplex.web.component.commitgraph.CommitGraphResourceReference;
-import com.pmease.gitplex.web.component.commitgraph.CommitGraphUtils;
-import com.pmease.gitplex.web.component.commitmessage.ExpandableCommitMessagePanel;
-import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;
-import com.pmease.gitplex.web.model.CommitRefsModel;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListResourceReference.java
index 0fd05625bb..aea5d0f39c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/CommitListResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/CommitListResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.commitlist;
+package com.gitplex.web.component.commitlist;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/commit-list.css b/gitplex.web/src/main/java/com/gitplex/web/component/commitlist/commit-list.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitlist/commit-list.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitlist/commit-list.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/CommitMessageLabel.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageLabel.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/CommitMessageLabel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageLabel.java
index 23e91cbbf9..6891114465 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/CommitMessageLabel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageLabel.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.component.commitmessage;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.commitmessagetransform.CommitMessageTransformer;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.GitPlex;
+import com.gitplex.core.commitmessagetransform.CommitMessageTransformer;
+import com.gitplex.core.entity.Depot;
@SuppressWarnings("serial")
public class CommitMessageLabel extends Label {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/CommitMessageResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/CommitMessageResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageResourceReference.java
index 2b59ba85dd..2c659e69dc 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/CommitMessageResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/CommitMessageResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.commitmessage;
+package com.gitplex.web.component.commitmessage;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java
index abd3318bfb..acaa1c5d30 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/ExpandableCommitMessagePanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.commitmessage;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.util.Highlighter;
-import com.pmease.commons.util.Transformer;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
+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;
@SuppressWarnings("serial")
public class ExpandableCommitMessagePanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/commit-message.css b/gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/commit-message.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/commitmessage/commit-message.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/commitmessage/commit-message.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java
index d9c04ac10c..af66ff2f7a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteAccountModal.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.web.component.confirmdelete;
+package com.gitplex.web.component.confirmdelete;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
+import com.gitplex.core.GitPlex;
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.manager.AccountManager;
@SuppressWarnings("serial")
public abstract class ConfirmDeleteAccountModal extends ConfirmDeleteModal {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java
index ffb40a9e25..f87efdf911 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteDepotModal.java
@@ -1,41 +1,41 @@
-package com.pmease.gitplex.web.component.confirmdelete;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-
-@SuppressWarnings("serial")
-public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {
-
- public ConfirmDeleteDepotModal(AjaxRequestTarget target) {
- super(target);
- }
-
- @Override
- protected void doDelete(AjaxRequestTarget target) {
- Depot depot = getDepot();
-
- GitPlex.getInstance(DepotManager.class).delete(depot);
- getSession().success("Repository has been deleted");
-
- onDeleted(target);
- }
-
- protected abstract void onDeleted(AjaxRequestTarget target);
-
- @Override
- protected String getWarningMessage() {
- return "Everything inside this repository will be deleted and can not be recovered, "
- + "please input repository name below to confirm deletion.";
- }
-
- @Override
- protected String getConfirmInput() {
- return getDepot().getName();
- }
-
- protected abstract Depot getDepot();
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public abstract class ConfirmDeleteDepotModal extends ConfirmDeleteModal {
+
+ public ConfirmDeleteDepotModal(AjaxRequestTarget target) {
+ super(target);
+ }
+
+ @Override
+ protected void doDelete(AjaxRequestTarget target) {
+ Depot depot = getDepot();
+
+ GitPlex.getInstance(DepotManager.class).delete(depot);
+ getSession().success("Repository has been deleted");
+
+ onDeleted(target);
+ }
+
+ protected abstract void onDeleted(AjaxRequestTarget target);
+
+ @Override
+ protected String getWarningMessage() {
+ return "Everything inside this repository will be deleted and can not be recovered, "
+ + "please input repository name below to confirm deletion.";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return getDepot().getName();
+ }
+
+ protected abstract Depot getDepot();
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java
index 2c6f2226d0..6c015832d2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteModal.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.component.confirmdelete;
+package com.gitplex.web.component.confirmdelete;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.pmease.commons.wicket.component.modal.ModalPanel;
+import com.gitplex.commons.wicket.component.modal.ModalPanel;
@SuppressWarnings("serial")
public abstract class ConfirmDeleteModal extends ModalPanel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeletePanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeletePanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java
index ffe89243d2..e07be825aa 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeletePanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.confirmdelete;
+package com.gitplex.web.component.confirmdelete;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -9,7 +9,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
abstract class ConfirmDeletePanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java
index b86d608323..eb682ea286 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/ConfirmDeleteResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.confirmdelete;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class ConfirmDeleteResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/confirm-delete.css b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/confirm-delete.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/confirm-delete.js b/gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/confirmdelete/confirm-delete.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/confirmdelete/confirm-delete.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.java
index 9a23ef3e0f..89fd962688 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.contributorpanel;
+package com.gitplex.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.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.util.DateUtils;
+import com.gitplex.web.component.AccountLink;
+import com.gitplex.web.util.DateUtils;
@SuppressWarnings("serial")
public class ContributorPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorResourceReference.java
index 2f559c076f..039f7682e6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/ContributorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/ContributorResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.contributorpanel;
+package com.gitplex.web.component.contributorpanel;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/contributor.css b/gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/contributor.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/contributorpanel/contributor.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/contributorpanel/contributor.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchLink.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchLink.java
index 8e30673c9d..e03b6bb573 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchLink.java
@@ -1,61 +1,61 @@
-package com.pmease.gitplex.web.component.createbranch;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
-
-@SuppressWarnings("serial")
-public abstract class CreateBranchLink extends ModalLink {
-
- private final IModel<Depot> depotModel;
-
- private final String revision;
-
- public CreateBranchLink(String id, IModel<Depot> depotModel, String revision) {
- super(id);
-
- this.depotModel = depotModel;
- this.revision = revision;
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- ObjectId commitId = depotModel.getObject().getRevCommit(revision);
- setVisible(SecurityUtils.canPushRef(depotModel.getObject(), Constants.R_HEADS, ObjectId.zeroId(), commitId));
- }
-
- @Override
- protected Component newContent(String id) {
- return new CreateBranchPanel(id, depotModel, revision) {
-
- @Override
- protected void onCreate(AjaxRequestTarget target, String branch) {
- close(target);
- CreateBranchLink.this.onCreate(target, branch);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- };
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
-
- super.onDetach();
- }
-
- protected abstract void onCreate(AjaxRequestTarget target, String branch);
-}
+package com.gitplex.web.component.createbranch;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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;
+
+@SuppressWarnings("serial")
+public abstract class CreateBranchLink extends ModalLink {
+
+ private final IModel<Depot> depotModel;
+
+ private final String revision;
+
+ public CreateBranchLink(String id, IModel<Depot> depotModel, String revision) {
+ super(id);
+
+ this.depotModel = depotModel;
+ this.revision = revision;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ ObjectId commitId = depotModel.getObject().getRevCommit(revision);
+ setVisible(SecurityUtils.canPushRef(depotModel.getObject(), Constants.R_HEADS, ObjectId.zeroId(), commitId));
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new CreateBranchPanel(id, depotModel, revision) {
+
+ @Override
+ protected void onCreate(AjaxRequestTarget target, String branch) {
+ close(target);
+ CreateBranchLink.this.onCreate(target, branch);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ };
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+
+ super.onDetach();
+ }
+
+ protected abstract void onCreate(AjaxRequestTarget target, String branch);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.java
index eb28e9d3fa..86634b409e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createbranch/CreateBranchPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/createbranch/CreateBranchPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.createbranch;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.security.SecurityUtils;
+import com.gitplex.commons.git.GitUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagLink.java b/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagLink.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagLink.java
index 0f1825b300..fd5ed1e310 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagLink.java
@@ -1,62 +1,62 @@
-package com.pmease.gitplex.web.component.createtag;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.model.IModel;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.ObjectId;
-
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
-
-@SuppressWarnings("serial")
-public abstract class CreateTagLink extends ModalLink {
-
- private final IModel<Depot> depotModel;
-
- private final String revision;
-
- public CreateTagLink(String id, IModel<Depot> depotModel, String revision) {
- super(id);
-
- this.depotModel = depotModel;
- this.revision = revision;
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- ObjectId commit = depotModel.getObject().getRevCommit(revision);
- setVisible(SecurityUtils.canPushRef(depotModel.getObject(), Constants.R_TAGS,
- ObjectId.zeroId(), commit));
- }
-
- @Override
- protected Component newContent(String id) {
- return new CreateTagPanel(id, depotModel, revision) {
-
- @Override
- protected void onCreate(AjaxRequestTarget target, String tag) {
- close(target);
- CreateTagLink.this.onCreate(target, tag);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- };
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
-
- super.onDetach();
- }
-
- protected abstract void onCreate(AjaxRequestTarget target, String tag);
-}
+package com.gitplex.web.component.createtag;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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;
+
+@SuppressWarnings("serial")
+public abstract class CreateTagLink extends ModalLink {
+
+ private final IModel<Depot> depotModel;
+
+ private final String revision;
+
+ public CreateTagLink(String id, IModel<Depot> depotModel, String revision) {
+ super(id);
+
+ this.depotModel = depotModel;
+ this.revision = revision;
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ ObjectId commit = depotModel.getObject().getRevCommit(revision);
+ setVisible(SecurityUtils.canPushRef(depotModel.getObject(), Constants.R_TAGS,
+ ObjectId.zeroId(), commit));
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new CreateTagPanel(id, depotModel, revision) {
+
+ @Override
+ protected void onCreate(AjaxRequestTarget target, String tag) {
+ close(target);
+ CreateTagLink.this.onCreate(target, tag);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ };
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+
+ super.onDetach();
+ }
+
+ protected abstract void onCreate(AjaxRequestTarget target, String tag);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.java
index a627b89dd5..cdd8075ae2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/createtag/CreateTagPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/createtag/CreateTagPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.createtag;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.checkresult.GateCheckResult;
-import com.pmease.gitplex.core.security.SecurityUtils;
+import com.gitplex.commons.git.GitUtils;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/AbstractDepotChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoice.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/AbstractDepotChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoice.java
index 78933a4f84..2b39ceac9d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/AbstractDepotChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoice.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.component.depotchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.Select2Choice;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.commons.wicket.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class AbstractDepotChoice extends Select2Choice<Depot> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java
index 972a9ad33b..59ae49b632 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/AbstractDepotChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
@SuppressWarnings("serial")
public abstract class AbstractDepotChoiceProvider extends ChoiceProvider<Depot> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java
similarity index 66%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java
index bcafe42cec..5839dfdf7c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/DepotChoiceResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.component.depotchoice;
+package com.gitplex.web.component.depotchoice;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class DepotChoiceResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/depot-choice.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/depot-choice.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotchoice/depot-choice.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotchoice/depot-choice.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
index a1f2b9e893..6b1176efd1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.advanced;
+package com.gitplex.web.component.depotfile.blobsearch.advanced;
import java.io.Serializable;
import java.util.ArrayList;
@@ -37,22 +37,22 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.behavior.RunTaskBehavior;
-import com.pmease.commons.wicket.component.tabbable.AjaxActionTab;
-import com.pmease.commons.wicket.component.tabbable.Tab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.search.SearchManager;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.query.BlobQuery;
-import com.pmease.gitplex.search.query.FileQuery;
-import com.pmease.gitplex.search.query.SymbolQuery;
-import com.pmease.gitplex.search.query.TextQuery;
-import com.pmease.gitplex.search.query.TooGeneralQueryException;
-import com.pmease.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;
+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.commons.git.BlobIdent;
+import com.gitplex.commons.util.StringUtils;
+import com.gitplex.commons.wicket.behavior.RunTaskBehavior;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java
index bf39e25a7b..6eab68b0bb 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/AdvancedSearchResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.advanced;
+package com.gitplex.web.component.depotfile.blobsearch.advanced;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/advanced-search.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/advanced-search.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/advanced/advanced-search.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/advanced/advanced-search.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
index 5e1d22a2dd..fd8c3a8fae 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.instant;
+package com.gitplex.web.component.depotfile.blobsearch.instant;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -30,25 +30,25 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.ResourceReference;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.behavior.RunTaskBehavior;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.component.floating.AlignPlacement;
-import com.pmease.commons.wicket.component.floating.ComponentTarget;
-import com.pmease.commons.wicket.component.floating.FloatingPanel;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.search.SearchManager;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.query.BlobQuery;
-import com.pmease.gitplex.search.query.FileQuery;
-import com.pmease.gitplex.search.query.SymbolQuery;
-import com.pmease.gitplex.search.query.TooGeneralQueryException;
-import com.pmease.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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.commons.util.StringUtils;
+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.commons.wicket.behavior.RunTaskBehavior;
+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
+import com.gitplex.commons.wicket.component.floating.AlignPlacement;
+import com.gitplex.commons.wicket.component.floating.ComponentTarget;
+import com.gitplex.commons.wicket.component.floating.FloatingPanel;
@SuppressWarnings("serial")
public abstract class InstantSearchPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
similarity index 69%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
index f8aa062c0e..a1be5d5c56 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/InstantSearchResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.instant;
+package com.gitplex.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.pmease.commons.wicket.assets.doneevents.DoneEventsResourceReference;
-import com.pmease.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.pmease.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+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;
public class InstantSearchResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/instant-search.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/instant-search.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/instant-search.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/instant-search.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/instant-search.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/point.png b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/point.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/instant/point.png
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/instant/point.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java
similarity index 95%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java
index 3663408b9f..e420775d9e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/ConfirmSwitchFileListener.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.result;
+package com.gitplex.web.component.depotfile.blobsearch.result;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.wicket.Component;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java
index c3ace3ad7e..251bf22cd2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/MatchedBlob.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.result;
+package com.gitplex.web.component.depotfile.blobsearch.result;
import java.io.Serializable;
import java.util.List;
-import com.pmease.commons.util.Range;
-import com.pmease.gitplex.search.hit.QueryHit;
+import com.gitplex.search.hit.QueryHit;
+import com.gitplex.commons.util.Range;
public class MatchedBlob implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java
similarity index 96%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java
index c21f8e8c9e..d32e813966 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.result;
+package com.gitplex.web.component.depotfile.blobsearch.result;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -26,15 +26,15 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.wicket.component.EmphasizeAwareLabel;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.search.hit.FileHit;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.hit.TextHit;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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.commons.git.BlobIdent;
+import com.gitplex.commons.wicket.component.EmphasizeAwareLabel;
+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
public abstract class SearchResultPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
index d18fab3810..57b3ca952d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/SearchResultResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobsearch.result;
+package com.gitplex.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.pmease.commons.wicket.assets.uri.URIResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.uri.URIResourceReference;
public class SearchResultResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/search-result.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/search-result.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/search-result.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobsearch/result/search-result.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobsearch/result/search-result.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java
index bf8f2d3125..a4a70e0548 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobNameChangeCallback.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview;
+package com.gitplex.web.component.depotfile.blobview;
import java.io.Serializable;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobRenderer.java
similarity index 59%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobRenderer.java
index bca62f98fa..f2bf122146 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobRenderer.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.web.component.depotfile.blobview;
+package com.gitplex.web.component.depotfile.blobview;
import javax.annotation.Nullable;
-import com.pmease.commons.loader.ExtensionPoint;
+import com.gitplex.commons.loader.ExtensionPoint;
@ExtensionPoint
public interface BlobRenderer {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewContext.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewContext.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewContext.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewContext.java
index 088f7d100c..5ceb5b9317 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewContext.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewContext.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview;
+package com.gitplex.web.component.depotfile.blobview;
import java.io.Serializable;
import java.util.List;
@@ -8,12 +8,12 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.eclipse.jgit.revwalk.RevCommit;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.lang.extractors.TokenPosition;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.search.hit.QueryHit;
+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.commons.git.BlobIdent;
+import com.gitplex.commons.lang.extractors.TokenPosition;
public interface BlobViewContext extends Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.java
index fc8af94883..8d2197ac87 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewPanel.java
@@ -1,179 +1,179 @@
-package com.pmease.gitplex.web.component.depotfile.blobview;
-
-import javax.annotation.Nullable;
-
-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.core.request.handler.IPartialPageRequestHandler;
-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.ResourceLink;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.component.ViewStateAwareAjaxLink;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.resource.BlobResource;
-import com.pmease.gitplex.web.resource.BlobResourceReference;
-
-@SuppressWarnings("serial")
-public abstract class BlobViewPanel extends Panel {
-
- protected final BlobViewContext context;
-
- public BlobViewPanel(String id, BlobViewContext context) {
- super(id);
-
- BlobIdent blobIdent = context.getBlobIdent();
- Preconditions.checkArgument(blobIdent.revision != null
- && blobIdent.path != null && blobIdent.mode != null);
-
- this.context = context;
- }
-
- protected WebMarkupContainer newOptions(String id) {
- return new WebMarkupContainer(id);
- }
-
- protected WebMarkupContainer newAdditionalActions(String id) {
- return new WebMarkupContainer(id);
- }
-
- private void newChangeActions(@Nullable IPartialPageRequestHandler target) {
- WebMarkupContainer changeActions = new WebMarkupContainer("changeActions");
- changeActions.setVisible(SecurityUtils.canModify(context.getDepot(), context.getBlobIdent().revision, context.getBlobIdent().path)
- && (context.isOnBranch()));
- changeActions.setOutputMarkupId(true);
-
- if (context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {
- if (context.isOnBranch()) {
- AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("edit") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target, String viewState) {
- RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);
- context.onEdit(target);
- }
- };
- link.add(AttributeAppender.append("title", "Edit on branch " + context.getBlobIdent().revision));
- changeActions.add(link);
- } else {
- changeActions.add(new WebMarkupContainer("edit").setVisible(false));
- }
- } else {
- changeActions.add(new WebMarkupContainer("edit").setVisible(false));
- }
-
- if (context.isOnBranch()) {
- AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- context.onDelete(target);
- }
-
- };
- link.add(AttributeAppender.append("title", "Delete from branch " + context.getBlobIdent().revision));
- changeActions.add(link);
- } else {
- changeActions.add(new WebMarkupContainer("delete").setVisible(false));
- }
-
- if (target != null) {
- replace(changeActions);
- target.add(changeActions);
- } else {
- add(changeActions);
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new Label("lines", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return context.getDepot().getBlob(context.getBlobIdent()).getText().getLines().size() + " lines";
- }
-
- }) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);
- }
-
- });
-
- add(new Label("charset", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return context.getDepot().getBlob(context.getBlobIdent()).getText().getCharset().displayName();
- }
-
- }) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);
- }
-
- });
-
- add(new Label("size", FileUtils.byteCountToDisplaySize(context.getDepot().getBlob(context.getBlobIdent()).getSize())));
-
- add(newOptions("options"));
-
- add(new ResourceLink<Void>("raw", new BlobResourceReference(),
- BlobResource.paramsOf(context.getDepot(), context.getBlobIdent())));
- add(newAdditionalActions("additionalActions"));
- newChangeActions(null);
-
- setOutputMarkupId(true);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new BlobViewResourceReference()));
-
- response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.blobView('%s');", getMarkupId())));
- }
-
- public BlobViewContext getContext() {
- return context;
- }
-
-}
+package com.gitplex.web.component.depotfile.blobview;
+
+import javax.annotation.Nullable;
+
+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.core.request.handler.IPartialPageRequestHandler;
+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.ResourceLink;
+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;
+
+@SuppressWarnings("serial")
+public abstract class BlobViewPanel extends Panel {
+
+ protected final BlobViewContext context;
+
+ public BlobViewPanel(String id, BlobViewContext context) {
+ super(id);
+
+ BlobIdent blobIdent = context.getBlobIdent();
+ Preconditions.checkArgument(blobIdent.revision != null
+ && blobIdent.path != null && blobIdent.mode != null);
+
+ this.context = context;
+ }
+
+ protected WebMarkupContainer newOptions(String id) {
+ return new WebMarkupContainer(id);
+ }
+
+ protected WebMarkupContainer newAdditionalActions(String id) {
+ return new WebMarkupContainer(id);
+ }
+
+ private void newChangeActions(@Nullable IPartialPageRequestHandler target) {
+ WebMarkupContainer changeActions = new WebMarkupContainer("changeActions");
+ changeActions.setVisible(SecurityUtils.canModify(context.getDepot(), context.getBlobIdent().revision, context.getBlobIdent().path)
+ && (context.isOnBranch()));
+ changeActions.setOutputMarkupId(true);
+
+ if (context.getDepot().getBlob(context.getBlobIdent()).getText() != null) {
+ if (context.isOnBranch()) {
+ AjaxLink<Void> link = new ViewStateAwareAjaxLink<Void>("edit") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target, String viewState) {
+ RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);
+ context.onEdit(target);
+ }
+ };
+ link.add(AttributeAppender.append("title", "Edit on branch " + context.getBlobIdent().revision));
+ changeActions.add(link);
+ } else {
+ changeActions.add(new WebMarkupContainer("edit").setVisible(false));
+ }
+ } else {
+ changeActions.add(new WebMarkupContainer("edit").setVisible(false));
+ }
+
+ if (context.isOnBranch()) {
+ AjaxLink<Void> link = new PreventDefaultAjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ context.onDelete(target);
+ }
+
+ };
+ link.add(AttributeAppender.append("title", "Delete from branch " + context.getBlobIdent().revision));
+ changeActions.add(link);
+ } else {
+ changeActions.add(new WebMarkupContainer("delete").setVisible(false));
+ }
+
+ if (target != null) {
+ replace(changeActions);
+ target.add(changeActions);
+ } else {
+ add(changeActions);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new Label("lines", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return context.getDepot().getBlob(context.getBlobIdent()).getText().getLines().size() + " lines";
+ }
+
+ }) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);
+ }
+
+ });
+
+ add(new Label("charset", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return context.getDepot().getBlob(context.getBlobIdent()).getText().getCharset().displayName();
+ }
+
+ }) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(context.getDepot().getBlob(context.getBlobIdent()).getText() != null);
+ }
+
+ });
+
+ add(new Label("size", FileUtils.byteCountToDisplaySize(context.getDepot().getBlob(context.getBlobIdent()).getSize())));
+
+ add(newOptions("options"));
+
+ add(new ResourceLink<Void>("raw", new BlobResourceReference(),
+ BlobResource.paramsOf(context.getDepot(), context.getBlobIdent())));
+ add(newAdditionalActions("additionalActions"));
+ newChangeActions(null);
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new BlobViewResourceReference()));
+
+ response.render(OnDomReadyHeaderItem.forScript(String.format("gitplex.blobView('%s');", getMarkupId())));
+ }
+
+ public BlobViewContext getContext() {
+ return context;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java
index 2bb97c4ffa..388c43f928 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/BlobViewResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class BlobViewResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java
similarity index 54%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java
index 99ce914bae..5843654e2a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryRenderer.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.binary;
+package com.gitplex.web.component.depotfile.blobview.binary;
-import com.pmease.commons.git.Blob;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
+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;
public class BinaryRenderer implements BlobRenderer {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java
index cbc7c7966d..0c4c4fa6ea 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewPanel.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.binary;
+package com.gitplex.web.component.depotfile.blobview.binary;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
+import com.gitplex.web.component.depotfile.blobview.BlobViewContext;
+import com.gitplex.web.component.depotfile.blobview.BlobViewPanel;
@SuppressWarnings("serial")
public class BinaryViewPanel extends BlobViewPanel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java
index 27e407c877..1be87afdae 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/BinaryViewResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.binary;
+package com.gitplex.web.component.depotfile.blobview.binary;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/binary-view.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/binary-view.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/binary/binary-view.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/binary/binary-view.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/blob-view.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/blob-view.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/blob-view.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/blob-view.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/blob-view.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
index 6c9430c2b8..c60659819a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.gitlink;
+package com.gitplex.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.pmease.commons.git.Blob;
-import com.pmease.commons.git.Submodule;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
+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;
@SuppressWarnings("serial")
public class GitLinkPanel extends BlobViewPanel {
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.java
new file mode 100644
index 0000000000..3a0bb48e2c
--- /dev/null
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java
@@ -0,0 +1,17 @@
+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/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java
index 30a83b244d..43475fbbc1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/GitLinkResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.gitlink;
+package com.gitplex.web.component.depotfile.blobview.gitlink;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/git-link.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/git-link.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/git-link.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/gitlink/git-link.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java
similarity index 51%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java
index 2a5a11401a..a02cf1b8c4 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageRenderer.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.image;
+package com.gitplex.web.component.depotfile.blobview.image;
-import com.pmease.commons.git.Blob;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
+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;
public class ImageRenderer implements BlobRenderer {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java
similarity index 68%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java
index f343b4b270..58b8b6f712 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewPanel.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.image;
+package com.gitplex.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.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
-import com.pmease.gitplex.web.resource.BlobResource;
-import com.pmease.gitplex.web.resource.BlobResourceReference;
+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;
@SuppressWarnings("serial")
public class ImageViewPanel extends BlobViewPanel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java
index bdb8fb8666..1e65cb62ea 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/ImageViewResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.image;
+package com.gitplex.web.component.depotfile.blobview.image;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/image-view.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/image-view.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/image/image-view.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/image/image-view.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
index db6d0fdf82..15d466e8aa 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFilePanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.markdown;
+package com.gitplex.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.pmease.commons.git.Blob;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
+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;
@SuppressWarnings("serial")
public class MarkdownFilePanel extends BlobViewPanel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java
index 61aa1efca7..f3baa5dbe9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownFileResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.markdown;
+package com.gitplex.web.component.depotfile.blobview.markdown;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
similarity index 52%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
index d8be84f7d3..78a8e39d1d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/MarkdownRenderer.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.markdown;
+package com.gitplex.web.component.depotfile.blobview.markdown;
-import com.pmease.commons.git.Blob;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
-import com.pmease.gitplex.web.component.depotfile.blobview.source.SourceViewPanel;
+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;
public class MarkdownRenderer implements BlobRenderer {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/markdown-file.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/markdown-file.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/markdown/markdown-file.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/markdown/markdown-file.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java
similarity index 56%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java
index 2045d2e0e8..6690a9a28c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceRenderer.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.source;
+package com.gitplex.web.component.depotfile.blobview.source;
-import com.pmease.commons.git.Blob;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
+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;
public class SourceRenderer implements BlobRenderer {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java
index eaed02286a..f57d839f70 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.source;
+package com.gitplex.web.component.depotfile.blobview.source;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -49,46 +49,46 @@ 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.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.pmease.commons.git.Blame;
-import com.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.command.BlameCommand;
-import com.pmease.commons.lang.extractors.ExtractException;
-import com.pmease.commons.lang.extractors.Extractor;
-import com.pmease.commons.lang.extractors.Extractors;
-import com.pmease.commons.lang.extractors.Symbol;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.web.behavior.BlameMessageBehavior;
-import com.pmease.gitplex.web.component.comment.CodeCommentPanel;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.component.comment.comparecontext.CompareContextPanel;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
-import com.pmease.gitplex.web.component.sourceformat.OptionChangeCallback;
-import com.pmease.gitplex.web.component.sourceformat.SourceFormatPanel;
-import com.pmease.gitplex.web.component.symboltooltip.SymbolTooltipPanel;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.util.DateUtils;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java
similarity index 66%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java
index 1e72b5d1d7..41007cac5f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/SourceViewResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.source;
+package com.gitplex.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.pmease.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
-import com.pmease.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.pmease.commons.wicket.assets.hover.HoverResourceReference;
-import com.pmease.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
-import com.pmease.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+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;
public class SourceViewResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/source-view.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/source-view.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/source-view.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/source-view.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/source-view.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/vgrabber.png b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/vgrabber.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/source/vgrabber.png
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/source/vgrabber.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
index 4c829c4442..3067415371 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.symbollink;
+package com.gitplex.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.pmease.commons.git.Blob;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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;
@SuppressWarnings("serial")
public class SymbolLinkPanel extends BlobViewPanel {
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.java
new file mode 100644
index 0000000000..021079a9ee
--- /dev/null
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java
@@ -0,0 +1,17 @@
+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/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java
index 02484baff3..2466a6a527 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.symbollink;
+package com.gitplex.web.component.depotfile.blobview.symbollink;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/symbol-link.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/symbol-link.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/symbol-link.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/blobview/symbollink/symbol-link.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/CancelListener.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/CancelListener.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/CancelListener.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/CancelListener.java
index 4ffff2f389..98e61de386 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/CancelListener.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/CancelListener.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.editsave;
+package com.gitplex.web.component.depotfile.editsave;
import java.io.Serializable;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSavePanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSavePanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSavePanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSavePanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.java
index 29ed3b525c..cc326f9be2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSavePanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSavePanel.java
@@ -1,407 +1,407 @@
-package com.pmease.gitplex.web.component.depotfile.editsave;
-
-import java.io.IOException;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-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.form.TextArea;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.treewalk.TreeWalk;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobChange;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.FileEdit;
-import com.pmease.commons.git.PathAndContent;
-import com.pmease.commons.git.exception.GitObjectAlreadyExistsException;
-import com.pmease.commons.git.exception.NotGitTreeException;
-import com.pmease.commons.git.exception.ObsoleteCommitException;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.component.diff.blob.BlobDiffPanel;
-import com.pmease.gitplex.web.component.diff.revision.DiffViewMode;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import jersey.repackaged.com.google.common.base.Objects;
-
-@SuppressWarnings("serial")
-public abstract class EditSavePanel extends Panel {
-
- private final IModel<Depot> depotModel;
-
- private final String refName;
-
- private FileEdit fileEdit;
-
- private final CancelListener cancelListener;
-
- private ObjectId prevCommitId;
-
- private ObjectId currentCommitId;
-
- private String summaryCommitMessage;
-
- private String detailCommitMessage;
-
- private BlobChange change;
-
- private boolean saveInProgress;
-
- public EditSavePanel(String id, IModel<Depot> depotModel, String refName,
- @Nullable String oldPath, @Nullable PathAndContent newFile,
- ObjectId prevCommitId, @Nullable CancelListener cancelListener) {
- super(id);
-
- this.depotModel = depotModel;
- this.refName = refName;
- this.fileEdit = new FileEdit(oldPath, newFile);
- this.cancelListener = cancelListener;
- this.prevCommitId = prevCommitId;
- }
-
- private String getDefaultCommitMessage() {
- String oldPath = fileEdit.getOldPath();
- String oldName;
- if (oldPath != null && oldPath.contains("/"))
- oldName = StringUtils.substringAfterLast(oldPath, "/");
- else
- oldName = oldPath;
-
- PathAndContent newFile = fileEdit.getNewFile();
- if (newFile == null) {
- return "Delete " + oldName;
- } else {
- String newPath = newFile.getPath();
-
- String newName;
- if (newPath != null && newPath.contains("/"))
- newName = StringUtils.substringAfterLast(newPath, "/");
- else
- newName = newPath;
-
- if (oldPath == null) {
- if (newName != null)
- return "Add " + newName;
- else
- return "Add new file";
- } else if (oldPath.equals(newPath)) {
- return "Edit " + oldName;
- } else {
- return "Rename " + oldName;
- }
- }
-
- }
-
- private void newChangedContainer(@Nullable AjaxRequestTarget target) {
- WebMarkupContainer changedContainer = new WebMarkupContainer("changed");
- changedContainer.setVisible(change != null);
- changedContainer.setOutputMarkupPlaceholderTag(true);
- if (change != null) {
- changedContainer.add(new BlobDiffPanel("changes", depotModel,
- new Model<PullRequest>(null), change, DiffViewMode.UNIFIED, null, null));
- } else {
- changedContainer.add(new WebMarkupContainer("changes"));
- }
- if (target != null) {
- replace(changedContainer);
- target.add(changedContainer);
- if (change != null) {
- String script = String.format("$('#%s .edit-save input[type=submit]').val('Commit and overwrite');",
- getMarkupId());
- target.appendJavaScript(script);
- }
- } else {
- add(changedContainer);
- }
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- final NotificationPanel feedback = new NotificationPanel("feedback", this);
- feedback.setOutputMarkupPlaceholderTag(true);
- add(feedback);
-
- newChangedContainer(null);
-
- Form<?> form = new Form<Void>("form");
- add(form);
-
- form.add(new TextField<String>("summaryCommitMessage", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return summaryCommitMessage;
- }
-
- @Override
- public void setObject(String object) {
- summaryCommitMessage = object;
- }
-
- }) {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("placeholder", getDefaultCommitMessage());
- }
-
- });
-
- form.add(new TextArea<String>("detailCommitMessage", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return detailCommitMessage;
- }
-
- @Override
- public void setObject(String object) {
- detailCommitMessage = object;
- }
-
- }));
-
- AjaxButton saveButton = new AjaxButton("save") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.setMethod(Method.POST);
-
- String script = String.format(""
- + "var viewState = $('#%s').data('viewState');"
- + "return viewState?JSON.stringify(viewState):'';", EditSavePanel.this.getMarkupId());
- attributes.getDynamicExtraParameters().add("return {view_state: function() {" + script + "}}");
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- if (saveInProgress || (fileEdit.getOldPath() != null && fileEdit.getNewFile() != null))
- tag.put("disabled", "disabled");
- if (saveInProgress)
- tag.put("value", "Please wait...");
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- save(target, feedback);
- saveInProgress = true;
- target.add(this);
- target.appendJavaScript("pmease.commons.form.markClean($('form'));");
- }
-
- };
- saveButton.setOutputMarkupId(true);
- form.add(saveButton);
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(cancelListener != null);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- cancelListener.onCancel(target);
- }
-
- });
-
- setOutputMarkupId(true);
- }
-
- private void save(AjaxRequestTarget target, FeedbackPanel feedback) {
- String viewState = RequestCycle.get().getRequest().getPostParameters()
- .getParameterValue("view_state").toString();
- RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);
-
- change = null;
-
- PathAndContent newFile = fileEdit.getNewFile();
- if (newFile != null && StringUtils.isBlank(newFile.getPath())) {
- EditSavePanel.this.error("Please specify file name.");
- target.add(feedback);
- } else {
- String commitMessage = summaryCommitMessage;
- if (StringUtils.isBlank(commitMessage))
- commitMessage = getDefaultCommitMessage();
- if (StringUtils.isNotBlank(detailCommitMessage))
- commitMessage += "\n\n" + detailCommitMessage;
- Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).getCurrent());
-
- Repository repository = depotModel.getObject().getRepository();
- ObjectId newCommitId = null;
- while(newCommitId == null) {
- try {
- newCommitId = fileEdit.commit(repository, refName,
- prevCommitId, prevCommitId, user.asPerson(), commitMessage);
- } catch (ObsoleteCommitException e) {
- currentCommitId = e.getOldCommitId();
- try (RevWalk revWalk = new RevWalk(repository)) {
- RevCommit prevCommit = revWalk.parseCommit(prevCommitId);
- RevCommit currentCommit = revWalk.parseCommit(currentCommitId);
- prevCommitId = currentCommitId;
-
- String oldPath = fileEdit.getOldPath();
- if (oldPath != null) {
- TreeWalk treeWalk = TreeWalk.forPath(repository, oldPath,
- prevCommit.getTree().getId(), currentCommit.getTree().getId());
- if (treeWalk != null) {
- if (!treeWalk.getObjectId(0).equals(treeWalk.getObjectId(1))
- || !treeWalk.getFileMode(0).equals(treeWalk.getFileMode(1))) {
- // mark changed if original file exists and content or mode has been modified
- // by others
- if (treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {
- if (newFile != null) {
- fileEdit = new FileEdit(null, newFile);
- change = getChange(treeWalk, prevCommit, currentCommit);
- break;
- } else {
- newCommitId = currentCommitId;
- break;
- }
- } else {
- change = getChange(treeWalk, prevCommit, currentCommit);
- break;
- }
- }
- }
- }
- if (newFile != null && !newFile.getPath().equals(oldPath)) {
- TreeWalk treeWalk = TreeWalk.forPath(repository, newFile.getPath(),
- prevCommit.getTree().getId(), currentCommit.getTree().getId());
- if (treeWalk != null) {
- if (!treeWalk.getObjectId(0).equals(treeWalk.getObjectId(1))
- || !treeWalk.getFileMode(0).equals(treeWalk.getFileMode(1))) {
- // if added/renamed file exists and content or mode has been modified
- // by others
- change = getChange(treeWalk, prevCommit, currentCommit);
- break;
- }
- }
- }
- } catch (IOException e2) {
- throw new RuntimeException(e2);
- }
- } catch (GitObjectAlreadyExistsException e) {
- EditSavePanel.this.error("A file with same name already exists. "
- + "Please choose a different name and try again.");
- target.add(feedback);
- break;
- } catch (NotGitTreeException e) {
- EditSavePanel.this.error("A file exists where you’re trying to create a subdirectory. "
- + "Choose a new path and try again..");
- target.add(feedback);
- break;
- }
- }
- if (newCommitId != null)
- onCommitted(target, prevCommitId, newCommitId);
- else
- newChangedContainer(target);
- }
- }
-
- private BlobChange getChange(TreeWalk treeWalk, RevCommit oldCommit, RevCommit newCommit) {
- DiffEntry.ChangeType changeType = DiffEntry.ChangeType.MODIFY;
- BlobIdent oldBlobIdent = new BlobIdent();
- oldBlobIdent.revision = oldCommit.name();
- if (!treeWalk.getObjectId(0).equals(ObjectId.zeroId())) {
- oldBlobIdent.path = treeWalk.getPathString();
- oldBlobIdent.mode = treeWalk.getRawMode(0);
- } else {
- changeType = DiffEntry.ChangeType.ADD;
- }
-
- BlobIdent newBlobIdent = new BlobIdent();
- newBlobIdent.revision = newCommit.name();
- if (!treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {
- newBlobIdent.path = treeWalk.getPathString();
- newBlobIdent.mode = treeWalk.getRawMode(1);
- } else {
- changeType = DiffEntry.ChangeType.DELETE;
- }
-
- return new BlobChange(changeType, oldBlobIdent, newBlobIdent, WhitespaceOption.DEFAULT) {
-
- @Override
- public Blob getBlob(BlobIdent blobIdent) {
- return depotModel.getObject().getBlob(blobIdent);
- }
-
- };
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new EditSaveResourceReference()));
-
- String script = String.format("gitplex.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);",
- getMarkupId(), StringEscapeUtils.escapeEcmaScript(getDefaultCommitMessage()),
- Objects.equal(fileEdit.getNewFile().getPath(), fileEdit.getOldPath()));
- target.appendJavaScript(script);
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
-
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.depotfile.editsave;
+
+import java.io.IOException;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes.Method;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+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.form.TextArea;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.FeedbackPanel;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+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;
+import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.commons.git.FileEdit;
+import com.gitplex.commons.git.PathAndContent;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import jersey.repackaged.com.google.common.base.Objects;
+
+@SuppressWarnings("serial")
+public abstract class EditSavePanel extends Panel {
+
+ private final IModel<Depot> depotModel;
+
+ private final String refName;
+
+ private FileEdit fileEdit;
+
+ private final CancelListener cancelListener;
+
+ private ObjectId prevCommitId;
+
+ private ObjectId currentCommitId;
+
+ private String summaryCommitMessage;
+
+ private String detailCommitMessage;
+
+ private BlobChange change;
+
+ private boolean saveInProgress;
+
+ public EditSavePanel(String id, IModel<Depot> depotModel, String refName,
+ @Nullable String oldPath, @Nullable PathAndContent newFile,
+ ObjectId prevCommitId, @Nullable CancelListener cancelListener) {
+ super(id);
+
+ this.depotModel = depotModel;
+ this.refName = refName;
+ this.fileEdit = new FileEdit(oldPath, newFile);
+ this.cancelListener = cancelListener;
+ this.prevCommitId = prevCommitId;
+ }
+
+ private String getDefaultCommitMessage() {
+ String oldPath = fileEdit.getOldPath();
+ String oldName;
+ if (oldPath != null && oldPath.contains("/"))
+ oldName = StringUtils.substringAfterLast(oldPath, "/");
+ else
+ oldName = oldPath;
+
+ PathAndContent newFile = fileEdit.getNewFile();
+ if (newFile == null) {
+ return "Delete " + oldName;
+ } else {
+ String newPath = newFile.getPath();
+
+ String newName;
+ if (newPath != null && newPath.contains("/"))
+ newName = StringUtils.substringAfterLast(newPath, "/");
+ else
+ newName = newPath;
+
+ if (oldPath == null) {
+ if (newName != null)
+ return "Add " + newName;
+ else
+ return "Add new file";
+ } else if (oldPath.equals(newPath)) {
+ return "Edit " + oldName;
+ } else {
+ return "Rename " + oldName;
+ }
+ }
+
+ }
+
+ private void newChangedContainer(@Nullable AjaxRequestTarget target) {
+ WebMarkupContainer changedContainer = new WebMarkupContainer("changed");
+ changedContainer.setVisible(change != null);
+ changedContainer.setOutputMarkupPlaceholderTag(true);
+ if (change != null) {
+ changedContainer.add(new BlobDiffPanel("changes", depotModel,
+ new Model<PullRequest>(null), change, DiffViewMode.UNIFIED, null, null));
+ } else {
+ changedContainer.add(new WebMarkupContainer("changes"));
+ }
+ if (target != null) {
+ replace(changedContainer);
+ target.add(changedContainer);
+ if (change != null) {
+ String script = String.format("$('#%s .edit-save input[type=submit]').val('Commit and overwrite');",
+ getMarkupId());
+ target.appendJavaScript(script);
+ }
+ } else {
+ add(changedContainer);
+ }
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ final NotificationPanel feedback = new NotificationPanel("feedback", this);
+ feedback.setOutputMarkupPlaceholderTag(true);
+ add(feedback);
+
+ newChangedContainer(null);
+
+ Form<?> form = new Form<Void>("form");
+ add(form);
+
+ form.add(new TextField<String>("summaryCommitMessage", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return summaryCommitMessage;
+ }
+
+ @Override
+ public void setObject(String object) {
+ summaryCommitMessage = object;
+ }
+
+ }) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("placeholder", getDefaultCommitMessage());
+ }
+
+ });
+
+ form.add(new TextArea<String>("detailCommitMessage", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return detailCommitMessage;
+ }
+
+ @Override
+ public void setObject(String object) {
+ detailCommitMessage = object;
+ }
+
+ }));
+
+ AjaxButton saveButton = new AjaxButton("save") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.setMethod(Method.POST);
+
+ String script = String.format(""
+ + "var viewState = $('#%s').data('viewState');"
+ + "return viewState?JSON.stringify(viewState):'';", EditSavePanel.this.getMarkupId());
+ attributes.getDynamicExtraParameters().add("return {view_state: function() {" + script + "}}");
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ if (saveInProgress || (fileEdit.getOldPath() != null && fileEdit.getNewFile() != null))
+ tag.put("disabled", "disabled");
+ if (saveInProgress)
+ tag.put("value", "Please wait...");
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ save(target, feedback);
+ saveInProgress = true;
+ target.add(this);
+ target.appendJavaScript("gitplex.commons.form.markClean($('form'));");
+ }
+
+ };
+ saveButton.setOutputMarkupId(true);
+ form.add(saveButton);
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(cancelListener != null);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ cancelListener.onCancel(target);
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ private void save(AjaxRequestTarget target, FeedbackPanel feedback) {
+ String viewState = RequestCycle.get().getRequest().getPostParameters()
+ .getParameterValue("view_state").toString();
+ RequestCycle.get().setMetaData(DepotFilePage.VIEW_STATE_KEY, viewState);
+
+ change = null;
+
+ PathAndContent newFile = fileEdit.getNewFile();
+ if (newFile != null && StringUtils.isBlank(newFile.getPath())) {
+ EditSavePanel.this.error("Please specify file name.");
+ target.add(feedback);
+ } else {
+ String commitMessage = summaryCommitMessage;
+ if (StringUtils.isBlank(commitMessage))
+ commitMessage = getDefaultCommitMessage();
+ if (StringUtils.isNotBlank(detailCommitMessage))
+ commitMessage += "\n\n" + detailCommitMessage;
+ Account user = Preconditions.checkNotNull(GitPlex.getInstance(AccountManager.class).getCurrent());
+
+ Repository repository = depotModel.getObject().getRepository();
+ ObjectId newCommitId = null;
+ while(newCommitId == null) {
+ try {
+ newCommitId = fileEdit.commit(repository, refName,
+ prevCommitId, prevCommitId, user.asPerson(), commitMessage);
+ } catch (ObsoleteCommitException e) {
+ currentCommitId = e.getOldCommitId();
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ RevCommit prevCommit = revWalk.parseCommit(prevCommitId);
+ RevCommit currentCommit = revWalk.parseCommit(currentCommitId);
+ prevCommitId = currentCommitId;
+
+ String oldPath = fileEdit.getOldPath();
+ if (oldPath != null) {
+ TreeWalk treeWalk = TreeWalk.forPath(repository, oldPath,
+ prevCommit.getTree().getId(), currentCommit.getTree().getId());
+ if (treeWalk != null) {
+ if (!treeWalk.getObjectId(0).equals(treeWalk.getObjectId(1))
+ || !treeWalk.getFileMode(0).equals(treeWalk.getFileMode(1))) {
+ // mark changed if original file exists and content or mode has been modified
+ // by others
+ if (treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {
+ if (newFile != null) {
+ fileEdit = new FileEdit(null, newFile);
+ change = getChange(treeWalk, prevCommit, currentCommit);
+ break;
+ } else {
+ newCommitId = currentCommitId;
+ break;
+ }
+ } else {
+ change = getChange(treeWalk, prevCommit, currentCommit);
+ break;
+ }
+ }
+ }
+ }
+ if (newFile != null && !newFile.getPath().equals(oldPath)) {
+ TreeWalk treeWalk = TreeWalk.forPath(repository, newFile.getPath(),
+ prevCommit.getTree().getId(), currentCommit.getTree().getId());
+ if (treeWalk != null) {
+ if (!treeWalk.getObjectId(0).equals(treeWalk.getObjectId(1))
+ || !treeWalk.getFileMode(0).equals(treeWalk.getFileMode(1))) {
+ // if added/renamed file exists and content or mode has been modified
+ // by others
+ change = getChange(treeWalk, prevCommit, currentCommit);
+ break;
+ }
+ }
+ }
+ } catch (IOException e2) {
+ throw new RuntimeException(e2);
+ }
+ } catch (GitObjectAlreadyExistsException e) {
+ EditSavePanel.this.error("A file with same name already exists. "
+ + "Please choose a different name and try again.");
+ target.add(feedback);
+ break;
+ } catch (NotGitTreeException e) {
+ EditSavePanel.this.error("A file exists where you’re trying to create a subdirectory. "
+ + "Choose a new path and try again..");
+ target.add(feedback);
+ break;
+ }
+ }
+ if (newCommitId != null)
+ onCommitted(target, prevCommitId, newCommitId);
+ else
+ newChangedContainer(target);
+ }
+ }
+
+ private BlobChange getChange(TreeWalk treeWalk, RevCommit oldCommit, RevCommit newCommit) {
+ DiffEntry.ChangeType changeType = DiffEntry.ChangeType.MODIFY;
+ BlobIdent oldBlobIdent = new BlobIdent();
+ oldBlobIdent.revision = oldCommit.name();
+ if (!treeWalk.getObjectId(0).equals(ObjectId.zeroId())) {
+ oldBlobIdent.path = treeWalk.getPathString();
+ oldBlobIdent.mode = treeWalk.getRawMode(0);
+ } else {
+ changeType = DiffEntry.ChangeType.ADD;
+ }
+
+ BlobIdent newBlobIdent = new BlobIdent();
+ newBlobIdent.revision = newCommit.name();
+ if (!treeWalk.getObjectId(1).equals(ObjectId.zeroId())) {
+ newBlobIdent.path = treeWalk.getPathString();
+ newBlobIdent.mode = treeWalk.getRawMode(1);
+ } else {
+ changeType = DiffEntry.ChangeType.DELETE;
+ }
+
+ return new BlobChange(changeType, oldBlobIdent, newBlobIdent, WhitespaceOption.DEFAULT) {
+
+ @Override
+ public Blob getBlob(BlobIdent blobIdent) {
+ return depotModel.getObject().getBlob(blobIdent);
+ }
+
+ };
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new EditSaveResourceReference()));
+
+ String script = String.format("gitplex.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);",
+ getMarkupId(), StringEscapeUtils.escapeEcmaScript(getDefaultCommitMessage()),
+ Objects.equal(fileEdit.getNewFile().getPath(), fileEdit.getOldPath()));
+ target.appendJavaScript(script);
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java
index d77b77f316..ed2e54d125 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/EditSaveResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.editsave;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class EditSaveResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/edit-save.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/edit-save.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/edit-save.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/editsave/edit-save.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/editsave/edit-save.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.java
index 14eb3248f0..2bf64bd48c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.fileedit;
+package com.gitplex.web.component.depotfile.fileedit;
import javax.annotation.Nullable;
@@ -22,26 +22,26 @@ 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.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobChange;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.PathAndContent;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.component.ViewStateAwareAjaxLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.web.component.depotfile.editsave.EditSavePanel;
-import com.pmease.gitplex.web.component.diff.blob.BlobDiffPanel;
-import com.pmease.gitplex.web.component.diff.revision.DiffViewMode;
-import com.pmease.gitplex.web.component.sourceformat.OptionChangeCallback;
-import com.pmease.gitplex.web.component.sourceformat.SourceFormatPanel;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+import com.gitplex.commons.git.Blob;
+import com.gitplex.commons.git.BlobChange;
+import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.git.PathAndContent;
+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;
@SuppressWarnings("serial")
public abstract class FileEditPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java
index ee4e8b6a77..3c72eb1b03 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/FileEditResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.fileedit;
+package com.gitplex.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.pmease.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
-import com.pmease.commons.wicket.assets.diffmatchpatch.DiffMatchPatchResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.codemirror.CodeMirrorResourceReference;
+import com.gitplex.commons.wicket.assets.diffmatchpatch.DiffMatchPatchResourceReference;
public class FileEditResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/file-edit.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/file-edit.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/file-edit.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/fileedit/file-edit.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/fileedit/file-edit.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.java
index e562001dab..8faa46e4e7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListPanel.java
@@ -1,280 +1,280 @@
-package com.pmease.gitplex.web.component.depotfile.filelist;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-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.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-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.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevTree;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.treewalk.TreeWalk;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-
-@SuppressWarnings("serial")
-public abstract class FileListPanel extends Panel {
-
- public static final String README_NAME = "readme";
-
- private final IModel<Depot> depotModel;
-
- private final BlobIdent directory;
-
- private final IModel<List<BlobIdent>> childrenModel = new LoadableDetachableModel<List<BlobIdent>>() {
-
- @Override
- protected List<BlobIdent> load() {
- Repository repository = depotModel.getObject().getRepository();
- try (RevWalk revWalk = new RevWalk(repository)) {
- RevTree revTree = revWalk.parseCommit(getCommitId()).getTree();
- TreeWalk treeWalk;
- if (directory.path != null) {
- treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, directory.path, revTree));
- treeWalk.enterSubtree();
- } else {
- treeWalk = new TreeWalk(repository);
- treeWalk.addTree(revTree);
- }
- List<BlobIdent> children = new ArrayList<>();
- while (treeWalk.next())
- children.add(new BlobIdent(directory.revision, treeWalk.getPathString(), treeWalk.getRawMode(0)));
- for (int i=0; i<children.size(); i++) {
- BlobIdent child = children.get(i);
- while (child.isTree()) {
- treeWalk = TreeWalk.forPath(repository, child.path, revTree);
- Preconditions.checkNotNull(treeWalk);
- treeWalk.enterSubtree();
- if (treeWalk.next()) {
- BlobIdent grandChild = new BlobIdent(directory.revision,
- treeWalk.getPathString(), treeWalk.getRawMode(0));
- if (treeWalk.next() || !grandChild.isTree())
- break;
- else
- child = grandChild;
- } else {
- break;
- }
- }
- children.set(i, child);
- }
-
- Collections.sort(children);
- return children;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- };
-
- private final IModel<BlobIdent> readmeModel = new LoadableDetachableModel<BlobIdent>() {
-
- @Override
- protected BlobIdent load() {
- for (BlobIdent blobIdent: childrenModel.getObject()) {
- String readme = StringUtils.substringBefore(blobIdent.getName(), ".");
- if (readme.equalsIgnoreCase(README_NAME))
- return blobIdent;
- }
- return null;
- }
-
- };
-
- public FileListPanel(String id, IModel<Depot> depotModel, BlobIdent directory) {
- super(id);
-
- this.depotModel = depotModel;
- this.directory = directory;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer parent = new WebMarkupContainer("parent") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(directory.path != null);
- }
-
- };
-
- final BlobIdent parentIdent;
- if (directory.path == null) {
- parentIdent = null;
- } else if (directory.path.indexOf('/') != -1) {
- parentIdent = new BlobIdent(
- directory.revision,
- StringUtils.substringBeforeLast(directory.path, "/"),
- FileMode.TREE.getBits());
- } else {
- parentIdent = new BlobIdent(directory.revision, null, FileMode.TREE.getBits());
- }
- parent.add(new PreventDefaultAjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, parentIdent);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- DepotFilePage.State state = new DepotFilePage.State();
- state.blobIdent = parentIdent;
- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);
- tag.put("href", urlFor(DepotFilePage.class, params));
- }
-
- });
- add(parent);
-
- add(new ListView<BlobIdent>("children", childrenModel) {
-
- @Override
- protected void populateItem(ListItem<BlobIdent> item) {
- final BlobIdent blobIdent = item.getModelObject();
-
- WebMarkupContainer pathIcon = new WebMarkupContainer("pathIcon");
- String iconClass;
- if (blobIdent.isTree())
- iconClass = "fa fa-folder-o";
- else if (blobIdent.isGitLink())
- iconClass = "fa fa-ext fa-folder-submodule-o";
- else if (blobIdent.isSymbolLink())
- iconClass = "fa fa-ext fa-folder-symbol-link-o";
- else
- iconClass = "fa fa-file-text-o";
- pathIcon.add(AttributeModifier.append("class", iconClass));
-
- item.add(pathIcon);
-
- AjaxLink<Void> pathLink = new PreventDefaultAjaxLink<Void>("pathLink") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
-
- DepotFilePage.State state = new DepotFilePage.State();
- state.blobIdent = blobIdent;
- PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);
- tag.put("href", urlFor(DepotFilePage.class, params));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, blobIdent);
- }
-
- };
-
- if (directory.path != null)
- pathLink.add(new Label("label", blobIdent.path.substring(directory.path.length()+1)));
- else
- pathLink.add(new Label("label", blobIdent.path));
- item.add(pathLink);
-
- if (item.getIndex() == 0)
- item.add(new Label("lastCommit", "Loading last commit info..."));
- else
- item.add(new Label("lastCommit"));
- }
-
- });
-
- WebMarkupContainer readmeContainer = new WebMarkupContainer("readme") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(readmeModel.getObject() != null);
- }
-
- };
- readmeContainer.add(new Label("title", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return readmeModel.getObject().getName();
- }
-
- }));
- readmeContainer.add(new MarkdownPanel("body", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- Blob blob = depotModel.getObject().getBlob(readmeModel.getObject());
- Blob.Text text = blob.getText();
- if (text != null)
- return text.getContent();
- else
- return "This seems like a binary file!";
- }
-
- }, null));
-
- add(readmeContainer);
-
- setOutputMarkupId(true);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new FileListResourceReference()));
-
- PageParameters params = LastCommitsResource.paramsOf(depotModel.getObject(),
- directory.revision, directory.path);
- String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString();
- response.render(OnDomReadyHeaderItem.forScript(
- String.format("gitplex.filelist.init('%s', '%s')", getMarkupId(), lastCommitsUrl)));
- }
-
- protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);
-
- private ObjectId getCommitId() {
- return depotModel.getObject().getObjectId(directory.revision);
- }
-
- @Override
- protected void onDetach() {
- childrenModel.detach();
- readmeModel.detach();
- depotModel.detach();
-
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.depotfile.filelist;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+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.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+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.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+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;
+
+@SuppressWarnings("serial")
+public abstract class FileListPanel extends Panel {
+
+ public static final String README_NAME = "readme";
+
+ private final IModel<Depot> depotModel;
+
+ private final BlobIdent directory;
+
+ private final IModel<List<BlobIdent>> childrenModel = new LoadableDetachableModel<List<BlobIdent>>() {
+
+ @Override
+ protected List<BlobIdent> load() {
+ Repository repository = depotModel.getObject().getRepository();
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ RevTree revTree = revWalk.parseCommit(getCommitId()).getTree();
+ TreeWalk treeWalk;
+ if (directory.path != null) {
+ treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, directory.path, revTree));
+ treeWalk.enterSubtree();
+ } else {
+ treeWalk = new TreeWalk(repository);
+ treeWalk.addTree(revTree);
+ }
+ List<BlobIdent> children = new ArrayList<>();
+ while (treeWalk.next())
+ children.add(new BlobIdent(directory.revision, treeWalk.getPathString(), treeWalk.getRawMode(0)));
+ for (int i=0; i<children.size(); i++) {
+ BlobIdent child = children.get(i);
+ while (child.isTree()) {
+ treeWalk = TreeWalk.forPath(repository, child.path, revTree);
+ Preconditions.checkNotNull(treeWalk);
+ treeWalk.enterSubtree();
+ if (treeWalk.next()) {
+ BlobIdent grandChild = new BlobIdent(directory.revision,
+ treeWalk.getPathString(), treeWalk.getRawMode(0));
+ if (treeWalk.next() || !grandChild.isTree())
+ break;
+ else
+ child = grandChild;
+ } else {
+ break;
+ }
+ }
+ children.set(i, child);
+ }
+
+ Collections.sort(children);
+ return children;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ };
+
+ private final IModel<BlobIdent> readmeModel = new LoadableDetachableModel<BlobIdent>() {
+
+ @Override
+ protected BlobIdent load() {
+ for (BlobIdent blobIdent: childrenModel.getObject()) {
+ String readme = StringUtils.substringBefore(blobIdent.getName(), ".");
+ if (readme.equalsIgnoreCase(README_NAME))
+ return blobIdent;
+ }
+ return null;
+ }
+
+ };
+
+ public FileListPanel(String id, IModel<Depot> depotModel, BlobIdent directory) {
+ super(id);
+
+ this.depotModel = depotModel;
+ this.directory = directory;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebMarkupContainer parent = new WebMarkupContainer("parent") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(directory.path != null);
+ }
+
+ };
+
+ final BlobIdent parentIdent;
+ if (directory.path == null) {
+ parentIdent = null;
+ } else if (directory.path.indexOf('/') != -1) {
+ parentIdent = new BlobIdent(
+ directory.revision,
+ StringUtils.substringBeforeLast(directory.path, "/"),
+ FileMode.TREE.getBits());
+ } else {
+ parentIdent = new BlobIdent(directory.revision, null, FileMode.TREE.getBits());
+ }
+ parent.add(new PreventDefaultAjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, parentIdent);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ DepotFilePage.State state = new DepotFilePage.State();
+ state.blobIdent = parentIdent;
+ PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);
+ tag.put("href", urlFor(DepotFilePage.class, params));
+ }
+
+ });
+ add(parent);
+
+ add(new ListView<BlobIdent>("children", childrenModel) {
+
+ @Override
+ protected void populateItem(ListItem<BlobIdent> item) {
+ final BlobIdent blobIdent = item.getModelObject();
+
+ WebMarkupContainer pathIcon = new WebMarkupContainer("pathIcon");
+ String iconClass;
+ if (blobIdent.isTree())
+ iconClass = "fa fa-folder-o";
+ else if (blobIdent.isGitLink())
+ iconClass = "fa fa-ext fa-folder-submodule-o";
+ else if (blobIdent.isSymbolLink())
+ iconClass = "fa fa-ext fa-folder-symbol-link-o";
+ else
+ iconClass = "fa fa-file-text-o";
+ pathIcon.add(AttributeModifier.append("class", iconClass));
+
+ item.add(pathIcon);
+
+ AjaxLink<Void> pathLink = new PreventDefaultAjaxLink<Void>("pathLink") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ DepotFilePage.State state = new DepotFilePage.State();
+ state.blobIdent = blobIdent;
+ PageParameters params = DepotFilePage.paramsOf(depotModel.getObject(), state);
+ tag.put("href", urlFor(DepotFilePage.class, params));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, blobIdent);
+ }
+
+ };
+
+ if (directory.path != null)
+ pathLink.add(new Label("label", blobIdent.path.substring(directory.path.length()+1)));
+ else
+ pathLink.add(new Label("label", blobIdent.path));
+ item.add(pathLink);
+
+ if (item.getIndex() == 0)
+ item.add(new Label("lastCommit", "Loading last commit info..."));
+ else
+ item.add(new Label("lastCommit"));
+ }
+
+ });
+
+ WebMarkupContainer readmeContainer = new WebMarkupContainer("readme") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(readmeModel.getObject() != null);
+ }
+
+ };
+ readmeContainer.add(new Label("title", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return readmeModel.getObject().getName();
+ }
+
+ }));
+ readmeContainer.add(new MarkdownPanel("body", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ Blob blob = depotModel.getObject().getBlob(readmeModel.getObject());
+ Blob.Text text = blob.getText();
+ if (text != null)
+ return text.getContent();
+ else
+ return "This seems like a binary file!";
+ }
+
+ }, null));
+
+ add(readmeContainer);
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new FileListResourceReference()));
+
+ PageParameters params = LastCommitsResource.paramsOf(depotModel.getObject(),
+ directory.revision, directory.path);
+ String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString();
+ response.render(OnDomReadyHeaderItem.forScript(
+ String.format("gitplex.filelist.init('%s', '%s')", getMarkupId(), lastCommitsUrl)));
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, BlobIdent blobIdent);
+
+ private ObjectId getCommitId() {
+ return depotModel.getObject().getObjectId(directory.revision);
+ }
+
+ @Override
+ protected void onDetach() {
+ childrenModel.detach();
+ readmeModel.detach();
+ depotModel.detach();
+
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListResourceReference.java
index eea0ef4b62..769c96110e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/FileListResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/FileListResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.filelist;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class FileListResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/LastCommitsResource.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResource.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/LastCommitsResource.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResource.java
index 349df8d884..512c47684a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/LastCommitsResource.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResource.java
@@ -1,135 +1,135 @@
-package com.pmease.gitplex.web.component.depotfile.filelist;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringEscapeUtils;
-import org.apache.shiro.authz.UnauthorizedException;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.request.resource.AbstractResource;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
-import org.unbescape.html.HtmlEscape;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.avatar.AvatarManager;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.util.DateUtils;
-
-/**
- * Loading commits of children may take some time, and we do this via resource loading to avoid blocking
- * other Wicket based ajax requests.
- *
- * @author robin
- *
- */
-class LastCommitsResource extends AbstractResource {
-
- private static final long serialVersionUID = 1L;
-
- private static final String PARAM_REPO = "repo";
-
- private static final String PARAM_REVISION = "revision";
-
- private static final String PARAM_PATH = "path";
-
- @Override
- protected ResourceResponse newResourceResponse(Attributes attributes) {
- PageParameters params = attributes.getParameters();
- final Long repoId = params.get(PARAM_REPO).toLong();
- final String revision = params.get(PARAM_REVISION).toString();
- final String path = params.get(PARAM_PATH).toOptionalString();
-
- ResourceResponse response = new ResourceResponse();
- response.setContentType("application/json");
- response.setWriteCallback(new WriteCallback() {
-
- @Override
- public void writeData(Attributes attributes) throws IOException {
- Depot repo = GitPlex.getInstance(Dao.class).load(Depot.class, repoId);
-
- if (!SecurityUtils.canRead(repo))
- throw new UnauthorizedException();
-
- LastCommitsOfChildren lastCommits = repo.getLastCommitsOfChildren(revision, path);
-
- AccountManager userManager = GitPlex.getInstance(AccountManager.class);
- AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);
-
- Map<String, LastCommitInfo> map = new HashMap<>();
- for (Map.Entry<String, LastCommitsOfChildren.Value> entry: lastCommits.entrySet()) {
- LastCommitInfo info = new LastCommitInfo();
-
- LastCommitsOfChildren.Value value = entry.getValue();
- PageParameters params = CommitDetailPage.paramsOf(repo, value.getId().name());
- info.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
- info.summary = StringEscapeUtils.escapeHtml4(value.getSummary());
- info.when = DateUtils.formatAge(value.getCommitDate());
-
- PersonIdent author = value.getAuthor();
- Account user = userManager.find(author);
- if (user != null) {
- info.authorName = HtmlEscape.escapeHtml5(user.getDisplayName());
- info.authorAvatarUrl = avatarManager.getAvatarUrl(user);
- params = AccountOverviewPage.paramsOf(user);
- info.authorUrl = RequestCycle.get().urlFor(AccountOverviewPage.class, params).toString();
- } else {
- info.authorName = HtmlEscape.escapeHtml5(author.getName());
- info.authorAvatarUrl = avatarManager.getAvatarUrl(author);
- }
-
- map.put(entry.getKey(), info);
- }
- String json;
- try {
- json = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(map);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- attributes.getResponse().write(json);
- }
-
- });
-
- return response;
- }
-
- public static PageParameters paramsOf(Depot depot, String revision, @Nullable String path) {
- PageParameters params = new PageParameters();
- params.set(PARAM_REPO, depot.getId());
- params.set(PARAM_REVISION, revision);
- if (path != null)
- params.set(PARAM_PATH, path);
-
- return params;
- }
-
- @SuppressWarnings("unused")
- private static class LastCommitInfo {
- String url;
-
- String summary;
-
- String when;
-
- String authorAvatarUrl;
-
- String authorName;
-
- @Nullable
- String authorUrl;
- }
-
-}
+package com.gitplex.web.component.depotfile.filelist;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.revwalk.LastCommitsOfChildren;
+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;
+
+/**
+ * Loading commits of children may take some time, and we do this via resource loading to avoid blocking
+ * other Wicket based ajax requests.
+ *
+ * @author robin
+ *
+ */
+class LastCommitsResource extends AbstractResource {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String PARAM_REPO = "repo";
+
+ private static final String PARAM_REVISION = "revision";
+
+ private static final String PARAM_PATH = "path";
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ PageParameters params = attributes.getParameters();
+ final Long repoId = params.get(PARAM_REPO).toLong();
+ final String revision = params.get(PARAM_REVISION).toString();
+ final String path = params.get(PARAM_PATH).toOptionalString();
+
+ ResourceResponse response = new ResourceResponse();
+ response.setContentType("application/json");
+ response.setWriteCallback(new WriteCallback() {
+
+ @Override
+ public void writeData(Attributes attributes) throws IOException {
+ Depot repo = GitPlex.getInstance(Dao.class).load(Depot.class, repoId);
+
+ if (!SecurityUtils.canRead(repo))
+ throw new UnauthorizedException();
+
+ LastCommitsOfChildren lastCommits = repo.getLastCommitsOfChildren(revision, path);
+
+ AccountManager userManager = GitPlex.getInstance(AccountManager.class);
+ AvatarManager avatarManager = GitPlex.getInstance(AvatarManager.class);
+
+ Map<String, LastCommitInfo> map = new HashMap<>();
+ for (Map.Entry<String, LastCommitsOfChildren.Value> entry: lastCommits.entrySet()) {
+ LastCommitInfo info = new LastCommitInfo();
+
+ LastCommitsOfChildren.Value value = entry.getValue();
+ PageParameters params = CommitDetailPage.paramsOf(repo, value.getId().name());
+ info.url = RequestCycle.get().urlFor(CommitDetailPage.class, params).toString();
+ info.summary = StringEscapeUtils.escapeHtml4(value.getSummary());
+ info.when = DateUtils.formatAge(value.getCommitDate());
+
+ PersonIdent author = value.getAuthor();
+ Account user = userManager.find(author);
+ if (user != null) {
+ info.authorName = HtmlEscape.escapeHtml5(user.getDisplayName());
+ info.authorAvatarUrl = avatarManager.getAvatarUrl(user);
+ params = AccountOverviewPage.paramsOf(user);
+ info.authorUrl = RequestCycle.get().urlFor(AccountOverviewPage.class, params).toString();
+ } else {
+ info.authorName = HtmlEscape.escapeHtml5(author.getName());
+ info.authorAvatarUrl = avatarManager.getAvatarUrl(author);
+ }
+
+ map.put(entry.getKey(), info);
+ }
+ String json;
+ try {
+ json = GitPlex.getInstance(ObjectMapper.class).writeValueAsString(map);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ attributes.getResponse().write(json);
+ }
+
+ });
+
+ return response;
+ }
+
+ public static PageParameters paramsOf(Depot depot, String revision, @Nullable String path) {
+ PageParameters params = new PageParameters();
+ params.set(PARAM_REPO, depot.getId());
+ params.set(PARAM_REVISION, revision);
+ if (path != null)
+ params.set(PARAM_PATH, path);
+
+ return params;
+ }
+
+ @SuppressWarnings("unused")
+ private static class LastCommitInfo {
+ String url;
+
+ String summary;
+
+ String when;
+
+ String authorAvatarUrl;
+
+ String authorName;
+
+ @Nullable
+ String authorUrl;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java
index 774e977645..d2154490eb 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/LastCommitsResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.filelist;
+package com.gitplex.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/pmease/gitplex/web/component/depotfile/filelist/book.png b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/book.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/book.png
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/book.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/file-list.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/file-list.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/file-list.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filelist/file-list.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filelist/file-list.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigator.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigator.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigator.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigator.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.java
index 31652a985e..ea99468162 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigator.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigator.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotfile.filenavigator;
+package com.gitplex.web.component.depotfile.filenavigator;
import java.io.IOException;
import java.util.ArrayList;
@@ -39,20 +39,20 @@ 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.pmease.commons.git.BlobIdent;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.component.floating.AlignPlacement;
-import com.pmease.commons.wicket.component.floating.FloatingPanel;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.BlobIcon;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobNameChangeCallback;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.commons.util.StringUtils;
+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
+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;
@SuppressWarnings("serial")
public abstract class FileNavigator extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java
similarity index 64%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java
index 484fa2e80a..2bc95509ae 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/FileNavigatorResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.component.depotfile.filenavigator;
+package com.gitplex.web.component.depotfile.filenavigator;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
public class FileNavigatorResourceReference extends BaseDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/arrow-down.png b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-down.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/arrow-down.png
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-down.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/arrow-right.png b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-right.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/arrow-right.png
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/arrow-right.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/file-navigator.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/file-navigator.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/filenavigator/file-navigator.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotfile/filenavigator/file-navigator.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelector.html b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelector.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelector.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java
index d54db46b46..29c75ddcb4 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelector.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelector.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotselector;
+package com.gitplex.web.component.depotselector;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,13 +26,13 @@ import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.behavior.InputChangeBehavior;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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;
+import com.gitplex.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.commons.wicket.behavior.InputChangeBehavior;
+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
public abstract class DepotSelector extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelectorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelectorResourceReference.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelectorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelectorResourceReference.java
index 9f32487d53..bb6031ebb8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/DepotSelectorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/DepotSelectorResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.depotselector;
+package com.gitplex.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.pmease.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.pmease.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
+import com.gitplex.commons.wicket.assets.scrollintoview.ScrollIntoViewResourceReference;
public class DepotSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/depot-selector.css b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/depot-selector.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/depot-selector.js b/gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotselector/depot-selector.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/depotselector/depot-selector.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/DiffRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/DiffRenderer.java
similarity index 62%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/DiffRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/DiffRenderer.java
index dd7644f951..458d27059c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/DiffRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/DiffRenderer.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.component.diff;
-
-import javax.annotation.Nullable;
-
-import org.apache.tika.mime.MediaType;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.pmease.commons.git.BlobChange;
-import com.pmease.commons.loader.ExtensionPoint;
-
-@ExtensionPoint
-public interface DiffRenderer {
- @Nullable Panel render(String panelId, MediaType mediaType, BlobChange change);
-}
+package com.gitplex.web.component.diff;
+
+import javax.annotation.Nullable;
+
+import org.apache.tika.mime.MediaType;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import com.gitplex.commons.git.BlobChange;
+import com.gitplex.commons.loader.ExtensionPoint;
+
+@ExtensionPoint
+public interface DiffRenderer {
+ @Nullable Panel render(String panelId, MediaType mediaType, BlobChange change);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.java
index d16ef921b6..d982530576 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.blob;
+package com.gitplex.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.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobChange;
-import com.pmease.commons.lang.diff.DiffUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.diff.DiffRenderer;
-import com.pmease.gitplex.web.component.diff.blob.text.TextDiffPanel;
-import com.pmease.gitplex.web.component.diff.difftitle.BlobDiffTitle;
-import com.pmease.gitplex.web.component.diff.revision.BlobCommentSupport;
-import com.pmease.gitplex.web.component.diff.revision.DiffViewMode;
+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;
@SuppressWarnings("serial")
public class BlobDiffPanel extends Panel implements SourceAware {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffResourceReference.java
index d6803faf33..dc3d0d1c41 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/BlobDiffResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/BlobDiffResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.blob;
+package com.gitplex.web.component.diff.blob;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/SourceAware.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/SourceAware.java
similarity index 73%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/SourceAware.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/SourceAware.java
index 23a884f1af..01b5e40f28 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/SourceAware.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/SourceAware.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.component.diff.blob;
+package com.gitplex.web.component.diff.blob;
import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.support.CommentPos;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.core.entity.support.CommentPos;
public interface SourceAware {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/blob-diff.css b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/blob-diff.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/blob-diff.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/blob-diff.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.java
similarity index 66%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.java
index 465057677b..62d02e8e4c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffPanel.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.web.component.diff.blob.image;
+package com.gitplex.web.component.diff.blob.image;
import org.apache.wicket.markup.html.panel.Panel;
-import com.pmease.commons.git.BlobChange;
+import com.gitplex.commons.git.BlobChange;
@SuppressWarnings("serial")
public class ImageDiffPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java
index 351a93403e..5e4f054e6f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/image/ImageDiffRenderer.java
@@ -1,19 +1,19 @@
-package com.pmease.gitplex.web.component.diff.blob.image;
-
-import org.apache.tika.mime.MediaType;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.pmease.commons.git.BlobChange;
-import com.pmease.gitplex.web.component.diff.DiffRenderer;
-
-public class ImageDiffRenderer implements DiffRenderer {
-
- @Override
- public Panel render(String panelId, MediaType mediaType, BlobChange change) {
- if (mediaType.getType().equalsIgnoreCase("image"))
- return new ImageDiffPanel(panelId, change);
- else
- return null;
- }
-
-}
+package com.gitplex.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;
+
+public class ImageDiffRenderer implements DiffRenderer {
+
+ @Override
+ public Panel render(String panelId, MediaType mediaType, BlobChange change) {
+ if (mediaType.getType().equalsIgnoreCase("image"))
+ return new ImageDiffPanel(panelId, change);
+ else
+ return null;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java
index 92c7b8a4da..0a052cdd19 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/MarkAwareDiffBlock.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.component.diff.blob.text;
+package com.gitplex.web.component.diff.blob.text;
import java.io.Serializable;
import java.util.List;
-import com.pmease.commons.lang.tokenizers.CmToken;
+import com.gitplex.commons.lang.tokenizers.CmToken;
public class MarkAwareDiffBlock implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java
similarity index 95%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java
index 1045e24945..43e08124ca 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.blob.text;
+package com.gitplex.web.component.diff.blob.text;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -36,45 +36,45 @@ 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.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.pmease.commons.git.Blame;
-import com.pmease.commons.git.BlobChange;
-import com.pmease.commons.git.BriefCommit;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.command.BlameCommand;
-import com.pmease.commons.lang.diff.DiffBlock;
-import com.pmease.commons.lang.diff.DiffMatchPatch.Operation;
-import com.pmease.commons.lang.diff.DiffUtils;
-import com.pmease.commons.lang.diff.LineDiff;
-import com.pmease.commons.lang.tokenizers.CmToken;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.util.RangeUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.behavior.BlameMessageBehavior;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext.Mode;
-import com.pmease.gitplex.web.component.diff.blob.SourceAware;
-import com.pmease.gitplex.web.component.diff.blob.text.MarkAwareDiffBlock.Type;
-import com.pmease.gitplex.web.component.diff.diffstat.DiffStatBar;
-import com.pmease.gitplex.web.component.diff.difftitle.BlobDiffTitle;
-import com.pmease.gitplex.web.component.diff.revision.BlobCommentSupport;
-import com.pmease.gitplex.web.component.diff.revision.DiffViewMode;
-import com.pmease.gitplex.web.component.symboltooltip.SymbolTooltipPanel;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.file.RequestCompareInfo;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.util.DateUtils;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java
index 48c0c1cfd4..93f9560686 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/TextDiffResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.blob.text;
+package com.gitplex.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.pmease.commons.wicket.assets.hover.HoverResourceReference;
-import com.pmease.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.hover.HoverResourceReference;
+import com.gitplex.commons.wicket.assets.selectionpopover.SelectionPopoverResourceReference;
import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/ajax-indicator.gif b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/ajax-indicator.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/ajax-indicator.gif
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/ajax-indicator.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/text-diff.css b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/text-diff.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/text-diff.js b/gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/blob/text/text-diff.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/blob/text/text-diff.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBar.html b/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBar.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBar.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.java
similarity index 96%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBar.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.java
index cf49227fb9..f6bfea9981 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBar.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBar.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.diffstat;
+package com.gitplex.web.component.diff.diffstat;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -7,7 +7,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import com.pmease.commons.wicket.behavior.TooltipBehavior;
+import com.gitplex.commons.wicket.behavior.TooltipBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java
index 68ba5280f0..5747d4feea 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/DiffStatBarResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.diffstat;
+package com.gitplex.web.component.diff.diffstat;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/diff-stat-bar.css b/gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/diff-stat-bar.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/diffstat/diff-stat-bar.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/diffstat/diff-stat-bar.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/BlobDiffTitle.html b/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/BlobDiffTitle.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/BlobDiffTitle.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/BlobDiffTitle.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.java
index 17af72eb72..48b0f99b6c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/BlobDiffTitle.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/BlobDiffTitle.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.difftitle;
+package com.gitplex.web.component.diff.difftitle;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import com.pmease.commons.git.BlobChange;
+import com.gitplex.commons.git.BlobChange;
@SuppressWarnings("serial")
public class BlobDiffTitle extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java
index 75afdfc2a7..6a15b1d623 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/DiffTitleResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.difftitle;
+package com.gitplex.web.component.diff.difftitle;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/diff-title.css b/gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/diff-title.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/difftitle/diff-title.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/difftitle/diff-title.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/BlobCommentSupport.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/BlobCommentSupport.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/BlobCommentSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/BlobCommentSupport.java
index e1b710ebc4..990036ba4d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/BlobCommentSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/BlobCommentSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.revision;
+package com.gitplex.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.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.support.CommentPos;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.core.entity.support.CommentPos;
public interface BlobCommentSupport extends Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/CommentSupport.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/CommentSupport.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/CommentSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/CommentSupport.java
index 78c2ec28c6..604240e3cc 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/CommentSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/CommentSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.revision;
+package com.gitplex.web.component.diff.revision;
import java.io.Serializable;
@@ -6,8 +6,8 @@ import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.support.CommentPos;
+import com.gitplex.core.entity.CodeComment;
+import com.gitplex.core.entity.support.CommentPos;
public interface CommentSupport extends Serializable {
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.java
new file mode 100644
index 0000000000..c4170cfa8a
--- /dev/null
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/DiffViewMode.java
@@ -0,0 +1,5 @@
+package com.gitplex.web.component.diff.revision;
+
+public enum DiffViewMode {
+ UNIFIED, SPLIT
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.java
similarity index 95%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.java
index a6f1c2da5c..be6f108109 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.revision;
+package com.gitplex.web.component.diff.revision;
import java.nio.file.Paths;
import java.util.ArrayList;
@@ -53,41 +53,41 @@ 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.pmease.commons.antlr.codeassist.InputCompletion;
-import com.pmease.commons.antlr.codeassist.InputStatus;
-import com.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobChange;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.lang.diff.DiffUtils;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.inputassist.InputAssistBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.menu.MenuItem;
-import com.pmease.commons.wicket.component.menu.MenuLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.comment.CodeCommentPanel;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.component.comment.comparecontext.CompareContextPanel;
-import com.pmease.gitplex.web.component.diff.blob.BlobDiffPanel;
-import com.pmease.gitplex.web.component.diff.blob.SourceAware;
-import com.pmease.gitplex.web.component.diff.diffstat.DiffStatBar;
-import com.pmease.gitplex.web.util.SuggestionUtils;
+import com.gitplex.commons.antlr.codeassist.InputCompletion;
+import com.gitplex.commons.antlr.codeassist.InputStatus;
+import com.gitplex.commons.antlr.codeassist.InputSuggestion;
+import com.gitplex.commons.git.Blob;
+import com.gitplex.commons.git.BlobChange;
+import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.commons.lang.diff.DiffUtils;
+import com.gitplex.commons.lang.diff.WhitespaceOption;
+import com.gitplex.commons.util.Range;
+import com.gitplex.commons.util.StringUtils;
+import com.gitplex.commons.util.match.WildcardUtils;
+import com.gitplex.commons.wicket.ajaxlistener.ConfirmLeaveListener;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java
similarity index 72%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java
index 85f85e7d0d..c3d5942f08 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/RevisionDiffResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.diff.revision;
+package com.gitplex.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.pmease.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.pmease.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+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;
public class RevisionDiffResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/revision-diff.css b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/revision-diff.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/revision-diff.js b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/revision-diff.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/revision-diff.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/vgrabber.png b/gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/vgrabber.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/vgrabber.png
rename to gitplex.web/src/main/java/com/gitplex/web/component/diff/revision/vgrabber.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java
index db126cd040..3569bf8f82 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchBehavior.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.fullbranchmatch;
+package com.gitplex.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.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.antlr.codeassist.ParentedElement;
-import com.pmease.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.pmease.commons.antlr.parser.Element;
-import com.pmease.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchParser;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.util.SuggestionUtils;
+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;
@SuppressWarnings("serial")
public class FullBranchMatchBehavior extends ANTLRAssistBehavior {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java b/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java
index f3d87f570f..57bf7a03ac 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/fullbranchmatch/FullBranchMatchInput.java
@@ -1,62 +1,62 @@
-package com.pmease.gitplex.web.component.fullbranchmatch;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
-import org.apache.wicket.validation.IValidator;
-
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.fullbranchmatch.FullBranchMatchUtils;
-
-@SuppressWarnings("serial")
-public class FullBranchMatchInput extends TextField<String> {
-
- private final IModel<Depot> depotModel;
-
- public FullBranchMatchInput(String id, IModel<Depot> depotModel, IModel<String> fullBranchMatchModel) {
- super(id, fullBranchMatchModel);
-
- this.depotModel = depotModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new FullBranchMatchBehavior(depotModel));
- add(new IValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- try {
- FullBranchMatchUtils.validate(validatable.getValue());
- } catch (final Exception e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- if (StringUtils.isNotBlank(e.getMessage()))
- return e.getMessage();
- else
- return "Syntax error";
- }
-
- });
- }
- }
-
- });
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.fullbranchmatch;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.validation.IErrorMessageSource;
+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;
+
+@SuppressWarnings("serial")
+public class FullBranchMatchInput extends TextField<String> {
+
+ private final IModel<Depot> depotModel;
+
+ public FullBranchMatchInput(String id, IModel<Depot> depotModel, IModel<String> fullBranchMatchModel) {
+ super(id, fullBranchMatchModel);
+
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new FullBranchMatchBehavior(depotModel));
+ add(new IValidator<String>() {
+
+ @Override
+ public void validate(IValidatable<String> validatable) {
+ try {
+ FullBranchMatchUtils.validate(validatable.getValue());
+ } catch (final Exception e) {
+ validatable.error(new IValidationError() {
+
+ @Override
+ public Serializable getErrorMessage(IErrorMessageSource messageSource) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ return e.getMessage();
+ else
+ return "Syntax error";
+ }
+
+ });
+ }
+ }
+
+ });
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java
index 3780b46bd8..ba6b391002 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.greaterprivilege;
+package com.gitplex.web.component.greaterprivilege;
import java.util.ArrayList;
import java.util.List;
@@ -17,16 +17,16 @@ 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;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.account.members.MemberEffectivePrivilegePage;
-import com.pmease.gitplex.web.page.account.members.MemberPrivilegeSourcePage;
@SuppressWarnings("serial")
public abstract class GreaterPrivilegesPanel extends GenericPanel<TeamAuthorization> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java
index 2afa2c6c96..10875397c7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/GreaterPrivilegesResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.greaterprivilege;
+package com.gitplex.web.component.greaterprivilege;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/greater-privileges.css b/gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/greater-privileges.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/greaterprivilege/greater-privileges.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/greaterprivilege/greater-privileges.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathmatch/PathMatchBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchBehavior.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathmatch/PathMatchBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchBehavior.java
index e64f988694..6b659c61c3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathmatch/PathMatchBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchBehavior.java
@@ -1,83 +1,83 @@
-package com.pmease.gitplex.web.component.pathmatch;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.antlr.codeassist.FenceAware;
-import com.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.antlr.codeassist.ParentedElement;
-import com.pmease.commons.antlr.grammar.ElementSpec;
-import com.pmease.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.pmease.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser;
-import com.pmease.gitplex.web.util.SuggestionUtils;
-
-@SuppressWarnings("serial")
-public class PathMatchBehavior extends ANTLRAssistBehavior {
-
- private final IModel<Depot> depotModel;
-
- private static final String VALUE_OPEN = "(";
-
- private static final String VALUE_CLOSE = ")";
-
- public PathMatchBehavior(IModel<Depot> depotModel) {
- super(IncludeExcludeParser.class, "match");
- this.depotModel = depotModel;
- }
-
- @Override
- public void detach(Component component) {
- super.detach(component);
- depotModel.detach();
- }
-
- @Override
- protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith, int count) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
-
- @Override
- protected List<InputSuggestion> match(String unfencedMatchWith, int count) {
- return SuggestionUtils.suggestPath(depotModel.getObject(), unfencedMatchWith, count);
- }
-
- @Override
- protected String getFencingDescription() {
- return "value needs to be enclosed in brackets";
- }
-
- }.suggest(expectedElement.getSpec(), matchWith, count);
- }
- }
- return null;
- }
-
- @Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- List<String> hints = new ArrayList<>();
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
- hints.add("Use * to match any part of path");
- hints.add("Folder (path ending with '/') matches all files under it");
- }
- }
- return hints;
- }
-
- @Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
-}
+package com.gitplex.web.component.pathmatch;
+
+import java.util.ArrayList;
+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;
+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;
+
+@SuppressWarnings("serial")
+public class PathMatchBehavior extends ANTLRAssistBehavior {
+
+ private final IModel<Depot> depotModel;
+
+ private static final String VALUE_OPEN = "(";
+
+ private static final String VALUE_CLOSE = ")";
+
+ public PathMatchBehavior(IModel<Depot> depotModel) {
+ super(IncludeExcludeParser.class, "match");
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ public void detach(Component component) {
+ super.detach(component);
+ depotModel.detach();
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith, int count) {
+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ if (spec.getRuleName().equals("Value")) {
+ return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith, int count) {
+ return SuggestionUtils.suggestPath(depotModel.getObject(), unfencedMatchWith, count);
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "value needs to be enclosed in brackets";
+ }
+
+ }.suggest(expectedElement.getSpec(), matchWith, count);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
+ List<String> hints = new ArrayList<>();
+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
+ hints.add("Use * to match any part of path");
+ hints.add("Folder (path ending with '/') matches all files under it");
+ }
+ }
+ return hints;
+ }
+
+ @Override
+ protected int getEndOfMatch(ElementSpec spec, String content) {
+ if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
+ return 2;
+ else
+ return super.getEndOfMatch(spec, content);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathmatch/PathMatchInput.java b/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchInput.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathmatch/PathMatchInput.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchInput.java
index 8291520f1c..c7862a4c74 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathmatch/PathMatchInput.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pathmatch/PathMatchInput.java
@@ -1,62 +1,62 @@
-package com.pmease.gitplex.web.component.pathmatch;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
-import org.apache.wicket.validation.IValidator;
-
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
-
-@SuppressWarnings("serial")
-public class PathMatchInput extends TextField<String> {
-
- private final IModel<Depot> depotModel;
-
- public PathMatchInput(String id, IModel<Depot> depotModel, IModel<String> pathMatchModel) {
- super(id, pathMatchModel);
-
- this.depotModel = depotModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new PathMatchBehavior(depotModel));
- add(new IValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- try {
- IncludeExcludeUtils.parse(validatable.getValue());
- } catch (final Exception e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- if (StringUtils.isNotBlank(e.getMessage()))
- return e.getMessage();
- else
- return "Syntax error";
- }
-
- });
- }
- }
-
- });
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.pathmatch;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.validation.IErrorMessageSource;
+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;
+
+@SuppressWarnings("serial")
+public class PathMatchInput extends TextField<String> {
+
+ private final IModel<Depot> depotModel;
+
+ public PathMatchInput(String id, IModel<Depot> depotModel, IModel<String> pathMatchModel) {
+ super(id, pathMatchModel);
+
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new PathMatchBehavior(depotModel));
+ add(new IValidator<String>() {
+
+ @Override
+ public void validate(IValidatable<String> validatable) {
+ try {
+ IncludeExcludeUtils.parse(validatable.getValue());
+ } catch (final Exception e) {
+ validatable.error(new IValidationError() {
+
+ @Override
+ public Serializable getErrorMessage(IErrorMessageSource messageSource) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ return e.getMessage();
+ else
+ return "Syntax error";
+ }
+
+ });
+ }
+ }
+
+ });
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelector.html b/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelector.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelector.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.java
index 5e0cbcd01a..d96bb64687 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelector.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelector.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pathselector;
+package com.gitplex.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.pmease.commons.git.BlobIdent;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.BlobIcon;
+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;
@SuppressWarnings("serial")
public abstract class PathSelector extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelectorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelectorResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelectorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelectorResourceReference.java
index ad9841fb19..d44b84233d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/PathSelectorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/PathSelectorResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pathselector;
+package com.gitplex.web.component.pathselector;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/path-selector.css b/gitplex.web/src/main/java/com/gitplex/web/component/pathselector/path-selector.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pathselector/path-selector.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/pathselector/path-selector.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java
index 6b09b11e52..bf635d09f0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/privilegeselection/PrivilegeSelectionPanel.java
@@ -1,83 +1,83 @@
-package com.pmease.gitplex.web.component.privilegeselection;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-@SuppressWarnings("serial")
-public abstract class PrivilegeSelectionPanel extends Panel {
-
- private final boolean withAdmin;
-
- private final DepotPrivilege currentPrivilege;
-
- public PrivilegeSelectionPanel(String id, boolean withAdmin, @Nullable DepotPrivilege currentPrivilege) {
- super(id);
- this.withAdmin = withAdmin;
- this.currentPrivilege = currentPrivilege;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new AjaxLink<Void>("read") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (currentPrivilege == DepotPrivilege.READ)
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, DepotPrivilege.READ);
- }
-
- });
- add(new AjaxLink<Void>("write") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (currentPrivilege == DepotPrivilege.WRITE)
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, DepotPrivilege.WRITE);
- }
-
- });
- add(new AjaxLink<Void>("admin") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (currentPrivilege == DepotPrivilege.ADMIN)
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(withAdmin);
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, DepotPrivilege.ADMIN);
- }
-
- });
- }
-
- protected abstract void onSelect(AjaxRequestTarget target, DepotPrivilege privilege);
-
-}
+package com.gitplex.web.component.privilegeselection;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import com.gitplex.core.security.privilege.DepotPrivilege;
+
+@SuppressWarnings("serial")
+public abstract class PrivilegeSelectionPanel extends Panel {
+
+ private final boolean withAdmin;
+
+ private final DepotPrivilege currentPrivilege;
+
+ public PrivilegeSelectionPanel(String id, boolean withAdmin, @Nullable DepotPrivilege currentPrivilege) {
+ super(id);
+ this.withAdmin = withAdmin;
+ this.currentPrivilege = currentPrivilege;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new AjaxLink<Void>("read") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == DepotPrivilege.READ)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, DepotPrivilege.READ);
+ }
+
+ });
+ add(new AjaxLink<Void>("write") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == DepotPrivilege.WRITE)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, DepotPrivilege.WRITE);
+ }
+
+ });
+ add(new AjaxLink<Void>("admin") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (currentPrivilege == DepotPrivilege.ADMIN)
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(withAdmin);
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, DepotPrivilege.ADMIN);
+ }
+
+ });
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, DepotPrivilege privilege);
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegesource/PrivilegeSourcePanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegesource/PrivilegeSourcePanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java
index b75bfff06c..0dd4d6aba9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/privilegesource/PrivilegeSourcePanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.privilegesource;
+package com.gitplex.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.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.depotaccess.PrivilegeSource;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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;
@SuppressWarnings("serial")
public class PrivilegeSourcePanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/Assignee.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/Assignee.java
similarity index 73%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/Assignee.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/Assignee.java
index 7c63e9d52f..55b8d22b3b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/Assignee.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/Assignee.java
@@ -1,30 +1,30 @@
-package com.pmease.gitplex.web.component.pullrequest.requestassignee;
-
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-
-import com.pmease.gitplex.core.entity.Account;
-
-@SuppressWarnings("serial")
-public class Assignee implements Serializable {
-
- private final Account user;
-
- private final String alias;
-
- public Assignee(Account user, @Nullable String alias) {
- this.user = user;
- this.alias = alias;
- }
-
- public Account getUser() {
- return user;
- }
-
- @Nullable
- public String getAlias() {
- return alias;
- }
-
-}
+package com.gitplex.web.component.pullrequest.requestassignee;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import com.gitplex.core.entity.Account;
+
+@SuppressWarnings("serial")
+public class Assignee implements Serializable {
+
+ private final Account user;
+
+ private final String alias;
+
+ public Assignee(Account user, @Nullable String alias) {
+ this.user = user;
+ this.alias = alias;
+ }
+
+ public Account getUser() {
+ return user;
+ }
+
+ @Nullable
+ public String getAlias() {
+ return alias;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java
index 2f8ad66f4f..fb9a330b58 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeChoice.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.component.pullrequest.requestassignee;
+package com.gitplex.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.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
-import com.pmease.commons.wicket.component.select2.Select2Choice;
-import com.pmease.gitplex.core.entity.Account;
+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;
@SuppressWarnings("serial")
public class AssigneeChoice extends Select2Choice<Assignee> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java
index 7bdb2d81e5..e9f24e9143 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestassignee/AssigneeProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.requestassignee;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.ObjectPermission;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.avatar.AvatarManager;
+import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
+import com.gitplex.commons.wicket.component.select2.Response;
public class AssigneeProvider extends ChoiceProvider<Assignee> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
index 7851a6aa4e..d308c36db7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerAvatar.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.requestreviewer;
+package com.gitplex.web.component.pullrequest.requestreviewer;
import java.util.Date;
import java.util.HashSet;
@@ -7,15 +7,15 @@ import java.util.Set;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.model.IModel;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.manager.PullRequestReviewInvitationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.avatar.RemoveableAvatar;
-import com.pmease.gitplex.web.model.EntityModel;
-import com.pmease.gitplex.web.model.UserModel;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java
index a47ab77756..c4dfeb70a6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerChoice.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.requestreviewer;
+package com.gitplex.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.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.manager.PullRequestReviewInvitationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
+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;
@SuppressWarnings("serial")
public abstract class ReviewerChoice extends SelectToAddChoice<Account> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java
index 9636e61c97..39aceaa8ed 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requestreviewer/ReviewerProvider.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web.component.pullrequest.requestreviewer;
+package com.gitplex.web.component.pullrequest.requestreviewer;
import java.util.Iterator;
import java.util.List;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.accountchoice.AbstractAccountChoiceProvider;
+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;
public class ReviewerProvider extends AbstractAccountChoiceProvider {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java
index 31b5cfde65..a8419efea9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/requeststatus/RequestStatusPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.requeststatus;
+package com.gitplex.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.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.Status;
-import com.pmease.gitplex.core.entity.support.CloseInfo;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.PullRequest.Status;
+import com.gitplex.core.entity.support.CloseInfo;
@SuppressWarnings("serial")
public class RequestStatusPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java
index b47ffe8f26..0be0dda8ae 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultIcon.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.reviewresult;
+package com.gitplex.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.pmease.commons.wicket.behavior.dropdown.DropdownHover;
-import com.pmease.commons.wicket.component.floating.AlignPlacement;
-import com.pmease.gitplex.core.entity.PullRequestReview;
+import com.gitplex.core.entity.PullRequestReview;
+import com.gitplex.commons.wicket.behavior.dropdown.DropdownHover;
+import com.gitplex.commons.wicket.component.floating.AlignPlacement;
@SuppressWarnings("serial")
public class ReviewResultIcon extends WebComponent {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java
index ffd7e70c16..2dd1a1e302 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.reviewresult;
+package com.gitplex.web.component.pullrequest.reviewresult;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.html b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
index 484e66ef69..553d9051a1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/ReviewResultTooltip.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web.component.pullrequest.reviewresult;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.manager.PullRequestReviewManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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;
@SuppressWarnings("serial")
class ReviewResultTooltip extends GenericPanel<PullRequestReview> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/review-result.css b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/review-result.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/reviewresult/review-result.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/reviewresult/review-result.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
index 342aef75ae..aa117910a0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusPanel.java
@@ -1,176 +1,176 @@
-package com.pmease.gitplex.web.component.pullrequest.verificationstatus;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-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.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.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestVerification;
-
-@SuppressWarnings("serial")
-public class VerificationStatusPanel extends Panel {
-
- private final IModel<PullRequest> requestModel;
-
- private final IModel<String> commitHashModel;
-
- public VerificationStatusPanel(String id, IModel<PullRequest> requestModel, IModel<String> commitHashModel) {
- super(id);
-
- this.requestModel = requestModel;
- this.commitHashModel = commitHashModel;
- }
-
- private List<PullRequestVerification> getVerifications() {
- List<PullRequestVerification> verifications = new ArrayList<>();
- for (PullRequestVerification verification: requestModel.getObject().getVerifications()) {
- if (verification.getCommit().equals(commitHashModel.getObject()))
- verifications.add(verification);
- }
- return verifications;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- DropdownLink link = new DropdownLink("link") {
-
- @Override
- protected Component newContent(String id) {
- Fragment fragment = new Fragment(id, "detailFrag", VerificationStatusPanel.this);
-
- IModel<List<PullRequestVerification>> model = new AbstractReadOnlyModel<List<PullRequestVerification>>() {
-
- @Override
- public List<PullRequestVerification> getObject() {
- return getVerifications();
- }
-
- };
- fragment.add(new ListView<PullRequestVerification>("verifications", model) {
-
- @Override
- protected void populateItem(ListItem<PullRequestVerification> item) {
- PullRequestVerification verification = item.getModelObject();
- item.add(new Label("configuration", verification.getConfiguration()));
- item.add(new Label("message", verification.getMessage()).setEscapeModelStrings(false));
-
- if (verification.getStatus() == PullRequestVerification.Status.FAILED)
- item.add(AttributeAppender.append("class", "failed"));
- else if (verification.getStatus() == PullRequestVerification.Status.SUCCESSFUL)
- item.add(AttributeAppender.append("class", "successful"));
- else
- item.add(AttributeAppender.append("class", "running"));
- }
-
- });
-
- return fragment;
- }
-
- };
- add(link);
-
- link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- PullRequestVerification.Status overallStatus = getOverallStatus();
- if (overallStatus == PullRequestVerification.Status.SUCCESSFUL) {
- return "successful";
- } else if (overallStatus == PullRequestVerification.Status.FAILED) {
- return "failed";
- } else {
- return "running";
- }
- }
-
- }));
- link.add(AttributeAppender.append("title", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- PullRequestVerification.Status overallStatus = getOverallStatus();
- if (overallStatus == PullRequestVerification.Status.SUCCESSFUL) {
- return "Builds are successful";
- } else if (overallStatus == PullRequestVerification.Status.FAILED) {
- return "At least one build is failed";
- } else {
- return "Builds are running";
- }
- }
-
- }));
-
- WebMarkupContainer icon = new WebMarkupContainer("icon");
- link.add(icon);
- icon.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- PullRequestVerification.Status overallStatus = getOverallStatus();
- if (overallStatus == PullRequestVerification.Status.SUCCESSFUL) {
- return "fa fa-check";
- } else if (overallStatus == PullRequestVerification.Status.FAILED) {
- return "fa fa-times";
- } else {
- return "fa fa-clock-o";
- }
- }
-
- }));
-
- setOutputMarkupPlaceholderTag(true);
- }
-
- private PullRequestVerification.Status getOverallStatus() {
- PullRequestVerification.Status overallStatus = null;
- for (PullRequestVerification verification: getVerifications()) {
- if (verification.getStatus() == PullRequestVerification.Status.FAILED) {
- overallStatus = PullRequestVerification.Status.FAILED;
- break;
- } else if (verification.getStatus() == PullRequestVerification.Status.RUNNING) {
- overallStatus = PullRequestVerification.Status.RUNNING;
- } else if (overallStatus == null) {
- overallStatus = PullRequestVerification.Status.SUCCESSFUL;
- }
- }
- return overallStatus;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new VerificationStatusResourceReference()));
- }
-
- @Override
- protected void onDetach() {
- requestModel.detach();
- commitHashModel.detach();
- super.onDetach();
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(!getVerifications().isEmpty());
- }
-
-}
+package com.gitplex.web.component.pullrequest.verificationstatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+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.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.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;
+
+@SuppressWarnings("serial")
+public class VerificationStatusPanel extends Panel {
+
+ private final IModel<PullRequest> requestModel;
+
+ private final IModel<String> commitHashModel;
+
+ public VerificationStatusPanel(String id, IModel<PullRequest> requestModel, IModel<String> commitHashModel) {
+ super(id);
+
+ this.requestModel = requestModel;
+ this.commitHashModel = commitHashModel;
+ }
+
+ private List<PullRequestVerification> getVerifications() {
+ List<PullRequestVerification> verifications = new ArrayList<>();
+ for (PullRequestVerification verification: requestModel.getObject().getVerifications()) {
+ if (verification.getCommit().equals(commitHashModel.getObject()))
+ verifications.add(verification);
+ }
+ return verifications;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ DropdownLink link = new DropdownLink("link") {
+
+ @Override
+ protected Component newContent(String id) {
+ Fragment fragment = new Fragment(id, "detailFrag", VerificationStatusPanel.this);
+
+ IModel<List<PullRequestVerification>> model = new AbstractReadOnlyModel<List<PullRequestVerification>>() {
+
+ @Override
+ public List<PullRequestVerification> getObject() {
+ return getVerifications();
+ }
+
+ };
+ fragment.add(new ListView<PullRequestVerification>("verifications", model) {
+
+ @Override
+ protected void populateItem(ListItem<PullRequestVerification> item) {
+ PullRequestVerification verification = item.getModelObject();
+ item.add(new Label("configuration", verification.getConfiguration()));
+ item.add(new Label("message", verification.getMessage()).setEscapeModelStrings(false));
+
+ if (verification.getStatus() == PullRequestVerification.Status.FAILED)
+ item.add(AttributeAppender.append("class", "failed"));
+ else if (verification.getStatus() == PullRequestVerification.Status.SUCCESSFUL)
+ item.add(AttributeAppender.append("class", "successful"));
+ else
+ item.add(AttributeAppender.append("class", "running"));
+ }
+
+ });
+
+ return fragment;
+ }
+
+ };
+ add(link);
+
+ link.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ PullRequestVerification.Status overallStatus = getOverallStatus();
+ if (overallStatus == PullRequestVerification.Status.SUCCESSFUL) {
+ return "successful";
+ } else if (overallStatus == PullRequestVerification.Status.FAILED) {
+ return "failed";
+ } else {
+ return "running";
+ }
+ }
+
+ }));
+ link.add(AttributeAppender.append("title", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ PullRequestVerification.Status overallStatus = getOverallStatus();
+ if (overallStatus == PullRequestVerification.Status.SUCCESSFUL) {
+ return "Builds are successful";
+ } else if (overallStatus == PullRequestVerification.Status.FAILED) {
+ return "At least one build is failed";
+ } else {
+ return "Builds are running";
+ }
+ }
+
+ }));
+
+ WebMarkupContainer icon = new WebMarkupContainer("icon");
+ link.add(icon);
+ icon.add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ PullRequestVerification.Status overallStatus = getOverallStatus();
+ if (overallStatus == PullRequestVerification.Status.SUCCESSFUL) {
+ return "fa fa-check";
+ } else if (overallStatus == PullRequestVerification.Status.FAILED) {
+ return "fa fa-times";
+ } else {
+ return "fa fa-clock-o";
+ }
+ }
+
+ }));
+
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ private PullRequestVerification.Status getOverallStatus() {
+ PullRequestVerification.Status overallStatus = null;
+ for (PullRequestVerification verification: getVerifications()) {
+ if (verification.getStatus() == PullRequestVerification.Status.FAILED) {
+ overallStatus = PullRequestVerification.Status.FAILED;
+ break;
+ } else if (verification.getStatus() == PullRequestVerification.Status.RUNNING) {
+ overallStatus = PullRequestVerification.Status.RUNNING;
+ } else if (overallStatus == null) {
+ overallStatus = PullRequestVerification.Status.SUCCESSFUL;
+ }
+ }
+ return overallStatus;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(CssHeaderItem.forReference(new VerificationStatusResourceReference()));
+ }
+
+ @Override
+ protected void onDetach() {
+ requestModel.detach();
+ commitHashModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getVerifications().isEmpty());
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java
index 7206c310d2..391dd26d46 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/VerificationStatusResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.pullrequest.verificationstatus;
+package com.gitplex.web.component.pullrequest.verificationstatus;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/verification-status.css b/gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/verification-status.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/pullrequest/verificationstatus/verification-status.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/pullrequest/verificationstatus/verification-status.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/refmatch/RefMatchBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchBehavior.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/refmatch/RefMatchBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchBehavior.java
index 210c8eac7b..9edaa81400 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/refmatch/RefMatchBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchBehavior.java
@@ -1,124 +1,124 @@
-package com.pmease.gitplex.web.component.refmatch;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.Ref;
-
-import com.pmease.commons.antlr.codeassist.FenceAware;
-import com.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.antlr.codeassist.ParentedElement;
-import com.pmease.commons.antlr.grammar.ElementSpec;
-import com.pmease.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeParser;
-
-@SuppressWarnings("serial")
-public class RefMatchBehavior extends ANTLRAssistBehavior {
-
- private final IModel<Depot> depotModel;
-
- private static final String VALUE_OPEN = "(";
-
- private static final String VALUE_CLOSE = ")";
-
- private static final String ANY_BRANCH = "refs/heads/*";
-
- private static final String ANY_TAG = "refs/tags/*";
-
- public RefMatchBehavior(IModel<Depot> depotModel) {
- super(IncludeExcludeParser.class, "match");
- this.depotModel = depotModel;
- }
-
- @Override
- public void detach(Component component) {
- super.detach(component);
- depotModel.detach();
- }
-
- @Override
- protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith, int count) {
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value")) {
- return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
-
- @Override
- protected List<InputSuggestion> match(String unfencedMatchWith, int count) {
- List<InputSuggestion> suggestions = new ArrayList<>();
-
- Depot depot = depotModel.getObject();
-
- String lowerCaseMatchWith = unfencedMatchWith.toLowerCase();
- int numSuggestions = 0;
- Collection<String> suggestedValues = new ArrayList<>();
- suggestedValues.add(ANY_BRANCH);
- suggestedValues.add(ANY_TAG);
- for (Ref ref: depot.getRefs(Constants.R_HEADS).values())
- suggestedValues.add(ref.getName());
- for (Ref ref: depot.getRefs(Constants.R_TAGS).values())
- suggestedValues.add(ref.getName());
-
- for (String suggestedValue: suggestedValues) {
- int index = suggestedValue.toLowerCase().indexOf(lowerCaseMatchWith);
- if (index != -1 && numSuggestions++<count) {
- Range matchRange = new Range(index, index+lowerCaseMatchWith.length());
- if (suggestedValue.equals(ANY_BRANCH)) {
- suggestions.add(new InputSuggestion(suggestedValue, "any branch", matchRange));
- } else if (suggestedValue.equals(ANY_TAG)) {
- suggestions.add(new InputSuggestion(suggestedValue, "any tag", matchRange));
- } else {
- suggestions.add(new InputSuggestion(suggestedValue, matchRange));
- }
- }
- }
-
- if (numSuggestions++<count
- && !unfencedMatchWith.contains(VALUE_CLOSE)
- && unfencedMatchWith.length() != 0) {
- String fenced = VALUE_OPEN + unfencedMatchWith + VALUE_CLOSE;
- Range matchRange = new Range(0, fenced.length());
- suggestions.add(new InputSuggestion(fenced, -1, true, getFencingDescription(), matchRange));
- }
- return suggestions;
- }
-
- @Override
- protected String getFencingDescription() {
- return "value needs to be enclosed in brackets";
- }
-
- }.suggest(expectedElement.getSpec(), matchWith, count);
- }
- }
- return null;
- }
-
- @Override
- protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
- List<String> hints = new ArrayList<>();
- if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
- LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
- if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
- hints.add("Use * to match any part of ref");
- }
- }
- return hints;
- }
-
- @Override
- protected int getEndOfMatch(ElementSpec spec, String content) {
- if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
- return 2;
- else
- return super.getEndOfMatch(spec, content);
- }
-
-}
+package com.gitplex.web.component.refmatch;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.Component;
+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;
+import com.gitplex.commons.antlr.grammar.ElementSpec;
+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;
+
+@SuppressWarnings("serial")
+public class RefMatchBehavior extends ANTLRAssistBehavior {
+
+ private final IModel<Depot> depotModel;
+
+ private static final String VALUE_OPEN = "(";
+
+ private static final String VALUE_CLOSE = ")";
+
+ private static final String ANY_BRANCH = "refs/heads/*";
+
+ private static final String ANY_TAG = "refs/tags/*";
+
+ public RefMatchBehavior(IModel<Depot> depotModel) {
+ super(IncludeExcludeParser.class, "match");
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ public void detach(Component component) {
+ super.detach(component);
+ depotModel.detach();
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(final ParentedElement expectedElement, String matchWith, int count) {
+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ if (spec.getRuleName().equals("Value")) {
+ return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {
+
+ @Override
+ protected List<InputSuggestion> match(String unfencedMatchWith, int count) {
+ List<InputSuggestion> suggestions = new ArrayList<>();
+
+ Depot depot = depotModel.getObject();
+
+ String lowerCaseMatchWith = unfencedMatchWith.toLowerCase();
+ int numSuggestions = 0;
+ Collection<String> suggestedValues = new ArrayList<>();
+ suggestedValues.add(ANY_BRANCH);
+ suggestedValues.add(ANY_TAG);
+ for (Ref ref: depot.getRefs(Constants.R_HEADS).values())
+ suggestedValues.add(ref.getName());
+ for (Ref ref: depot.getRefs(Constants.R_TAGS).values())
+ suggestedValues.add(ref.getName());
+
+ for (String suggestedValue: suggestedValues) {
+ int index = suggestedValue.toLowerCase().indexOf(lowerCaseMatchWith);
+ if (index != -1 && numSuggestions++<count) {
+ Range matchRange = new Range(index, index+lowerCaseMatchWith.length());
+ if (suggestedValue.equals(ANY_BRANCH)) {
+ suggestions.add(new InputSuggestion(suggestedValue, "any branch", matchRange));
+ } else if (suggestedValue.equals(ANY_TAG)) {
+ suggestions.add(new InputSuggestion(suggestedValue, "any tag", matchRange));
+ } else {
+ suggestions.add(new InputSuggestion(suggestedValue, matchRange));
+ }
+ }
+ }
+
+ if (numSuggestions++<count
+ && !unfencedMatchWith.contains(VALUE_CLOSE)
+ && unfencedMatchWith.length() != 0) {
+ String fenced = VALUE_OPEN + unfencedMatchWith + VALUE_CLOSE;
+ Range matchRange = new Range(0, fenced.length());
+ suggestions.add(new InputSuggestion(fenced, -1, true, getFencingDescription(), matchRange));
+ }
+ return suggestions;
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "value needs to be enclosed in brackets";
+ }
+
+ }.suggest(expectedElement.getSpec(), matchWith, count);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected List<String> getHints(ParentedElement expectedElement, String matchWith) {
+ List<String> hints = new ArrayList<>();
+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();
+ if (spec.getRuleName().equals("Value") && !matchWith.contains(VALUE_CLOSE)) {
+ hints.add("Use * to match any part of ref");
+ }
+ }
+ return hints;
+ }
+
+ @Override
+ protected int getEndOfMatch(ElementSpec spec, String content) {
+ if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))
+ return 2;
+ else
+ return super.getEndOfMatch(spec, content);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/refmatch/RefMatchInput.java b/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchInput.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/refmatch/RefMatchInput.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchInput.java
index 90a757c69a..bb3713da61 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/refmatch/RefMatchInput.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/refmatch/RefMatchInput.java
@@ -1,62 +1,62 @@
-package com.pmease.gitplex.web.component.refmatch;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.validation.IErrorMessageSource;
-import org.apache.wicket.validation.IValidatable;
-import org.apache.wicket.validation.IValidationError;
-import org.apache.wicket.validation.IValidator;
-
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.util.includeexclude.IncludeExcludeUtils;
-
-@SuppressWarnings("serial")
-public class RefMatchInput extends TextField<String> {
-
- private final IModel<Depot> depotModel;
-
- public RefMatchInput(String id, IModel<Depot> depotModel, IModel<String> refMatchModel) {
- super(id, refMatchModel);
-
- this.depotModel = depotModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new RefMatchBehavior(depotModel));
- add(new IValidator<String>() {
-
- @Override
- public void validate(IValidatable<String> validatable) {
- try {
- IncludeExcludeUtils.parse(validatable.getValue());
- } catch (final Exception e) {
- validatable.error(new IValidationError() {
-
- @Override
- public Serializable getErrorMessage(IErrorMessageSource messageSource) {
- if (StringUtils.isNotBlank(e.getMessage()))
- return e.getMessage();
- else
- return "Syntax error";
- }
-
- });
- }
- }
-
- });
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.refmatch;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.validation.IErrorMessageSource;
+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;
+
+@SuppressWarnings("serial")
+public class RefMatchInput extends TextField<String> {
+
+ private final IModel<Depot> depotModel;
+
+ public RefMatchInput(String id, IModel<Depot> depotModel, IModel<String> refMatchModel) {
+ super(id, refMatchModel);
+
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new RefMatchBehavior(depotModel));
+ add(new IValidator<String>() {
+
+ @Override
+ public void validate(IValidatable<String> validatable) {
+ try {
+ IncludeExcludeUtils.parse(validatable.getValue());
+ } catch (final Exception e) {
+ validatable.error(new IValidationError() {
+
+ @Override
+ public Serializable getErrorMessage(IErrorMessageSource messageSource) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ return e.getMessage();
+ else
+ return "Syntax error";
+ }
+
+ });
+ }
+ }
+
+ });
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/AffinalRevisionPicker.html b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/AffinalRevisionPicker.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java
index 9a953b0f94..94ef10c414 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/AffinalRevisionPicker.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.revisionpicker;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.DepotPicker;
-import com.pmease.gitplex.web.model.AffinalDepotsModel;
+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;
@SuppressWarnings("serial")
public abstract class AffinalRevisionPicker extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/CreateTagPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/CreateTagPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/CreateTagPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/CreateTagPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.java
index 7514760ca9..96a283270c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/CreateTagPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/CreateTagPanel.java
@@ -1,89 +1,89 @@
-package com.pmease.gitplex.web.component.revisionpicker;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AccountManager;
-
-@SuppressWarnings("serial")
-abstract class CreateTagPanel extends Panel {
-
- private final IModel<Depot> depotModel;
-
- private final String tagName;
-
- private final String revision;
-
- private String message;
-
- public CreateTagPanel(String id, IModel<Depot> depotModel, String tagName, String revision) {
- super(id);
- this.depotModel = depotModel;
- this.tagName = tagName;
- this.revision = revision;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.add(new TextArea<String>("message", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return message;
- }
-
- @Override
- public void setObject(String obj) {
- message = obj;
- }
-
- }));
- form.add(new AjaxButton("create") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- Account user = GitPlex.getInstance(AccountManager.class).getCurrent();
- depotModel.getObject().tag(tagName, revision, user.asPerson(), message);
- onCreate(target, tagName);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- add(form);
- }
-
- protected abstract void onCreate(AjaxRequestTarget target, String tagName);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.component.revisionpicker;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.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;
+
+@SuppressWarnings("serial")
+abstract class CreateTagPanel extends Panel {
+
+ private final IModel<Depot> depotModel;
+
+ private final String tagName;
+
+ private final String revision;
+
+ private String message;
+
+ public CreateTagPanel(String id, IModel<Depot> depotModel, String tagName, String revision) {
+ super(id);
+ this.depotModel = depotModel;
+ this.tagName = tagName;
+ this.revision = revision;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form");
+ form.add(new TextArea<String>("message", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return message;
+ }
+
+ @Override
+ public void setObject(String obj) {
+ message = obj;
+ }
+
+ }));
+ form.add(new AjaxButton("create") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ Account user = GitPlex.getInstance(AccountManager.class).getCurrent();
+ depotModel.getObject().tag(tagName, revision, user.asPerson(), message);
+ onCreate(target, tagName);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ add(form);
+ }
+
+ protected abstract void onCreate(AjaxRequestTarget target, String tagName);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionPicker.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPicker.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionPicker.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPicker.java
index 396b2546de..36c3385416 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionPicker.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPicker.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.revisionpicker;
+package com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.modal.ModalPanel;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.DepotAndRevision;
+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;
@SuppressWarnings("serial")
public abstract class RevisionPicker extends DropdownLink {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java
index ebbdee8687..d2a93fbdb2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionPickerResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.revisionpicker;
+package com.gitplex.web.component.revisionpicker;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelector.html b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelector.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelector.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java
similarity index 95%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelector.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java
index e620452919..977ef1213a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelector.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelector.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.revisionpicker;
+package com.gitplex.web.component.revisionpicker;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -38,20 +38,20 @@ import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.Ref;
import org.unbescape.html.HtmlEscape;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.security.SecurityUtils;
import com.google.common.base.Preconditions;
import com.google.common.base.Throwables;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.behavior.InputChangeBehavior;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.commons.wicket.component.modal.ModalPanel;
-import com.pmease.commons.wicket.component.tabbable.AjaxActionTab;
-import com.pmease.commons.wicket.component.tabbable.Tab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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.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;
@SuppressWarnings("serial")
public abstract class RevisionSelector extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java
index 417ac86008..6ef2da9113 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/RevisionSelectorResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.revisionpicker;
+package com.gitplex.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.pmease.commons.wicket.assets.hotkeys.HotkeysResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.hotkeys.HotkeysResourceReference;
public class RevisionSelectorResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-picker.css b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-picker.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-picker.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-picker.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.css b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.js b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/revision-selector.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/revision-selector.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/search.gif b/gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/search.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/revisionpicker/search.gif
rename to gitplex.web/src/main/java/com/gitplex/web/component/revisionpicker/search.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/roleselection/RoleSelectionPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/roleselection/RoleSelectionPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/roleselection/RoleSelectionPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/roleselection/RoleSelectionPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.java
index 5dafec5e24..d812e01f86 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/roleselection/RoleSelectionPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/roleselection/RoleSelectionPanel.java
@@ -1,63 +1,63 @@
-package com.pmease.gitplex.web.component.roleselection;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-public abstract class RoleSelectionPanel extends Panel {
-
- public static final String ROLE_ADMIN = "Admin";
-
- public static final String ROLE_MEMBER = "Member";
-
- private final String currentRole;
-
- public RoleSelectionPanel(String id, @Nullable String currentRole) {
- super(id);
-
- this.currentRole = currentRole;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new AjaxLink<Void>("admin") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (ROLE_ADMIN.equals(currentRole))
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelectAdmin(target);
- }
-
- });
- add(new AjaxLink<Void>("member") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (ROLE_MEMBER.equals(currentRole))
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelectOrdinary(target);
- }
-
- });
- }
-
- protected abstract void onSelectAdmin(AjaxRequestTarget target);
-
- protected abstract void onSelectOrdinary(AjaxRequestTarget target);
-}
+package com.gitplex.web.component.roleselection;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+public abstract class RoleSelectionPanel extends Panel {
+
+ public static final String ROLE_ADMIN = "Admin";
+
+ public static final String ROLE_MEMBER = "Member";
+
+ private final String currentRole;
+
+ public RoleSelectionPanel(String id, @Nullable String currentRole) {
+ super(id);
+
+ this.currentRole = currentRole;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new AjaxLink<Void>("admin") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (ROLE_ADMIN.equals(currentRole))
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelectAdmin(target);
+ }
+
+ });
+ add(new AjaxLink<Void>("member") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (ROLE_MEMBER.equals(currentRole))
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelectOrdinary(target);
+ }
+
+ });
+ }
+
+ protected abstract void onSelectAdmin(AjaxRequestTarget target);
+
+ protected abstract void onSelectOrdinary(AjaxRequestTarget target);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/OptionChangeCallback.java b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/OptionChangeCallback.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/OptionChangeCallback.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/OptionChangeCallback.java
index a796188e6e..08adbed784 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/OptionChangeCallback.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/OptionChangeCallback.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.sourceformat;
+package com.gitplex.web.component.sourceformat;
import java.io.Serializable;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.java
similarity index 98%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.java
index 484b1f4027..05addc25c8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.sourceformat;
+package com.gitplex.web.component.sourceformat;
import javax.annotation.Nullable;
import javax.servlet.http.Cookie;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatResourceReference.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatResourceReference.java
index bc536989c9..907e0120d5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/SourceFormatResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/SourceFormatResourceReference.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.web.component.sourceformat;
+package com.gitplex.web.component.sourceformat;
import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class SourceFormatResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/source-format.css b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/source-format.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/source-format.js b/gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/sourceformat/source-format.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/sourceformat/source-format.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipPanel.html b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java
index 71560df7b5..f282bc387b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.symboltooltip;
+package com.gitplex.web.component.symboltooltip;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -28,19 +28,19 @@ import org.apache.wicket.request.resource.PackageResourceReference;
import org.apache.wicket.request.resource.ResourceReference;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.behavior.RunTaskBehavior;
-import com.pmease.commons.wicket.component.PreventDefaultAjaxLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.search.SearchManager;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.query.BlobQuery;
-import com.pmease.gitplex.search.query.SymbolQuery;
-import com.pmease.gitplex.search.query.TextQuery;
-import com.pmease.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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.commons.wicket.behavior.AbstractPostAjaxBehavior;
+import com.gitplex.commons.wicket.behavior.RunTaskBehavior;
+import com.gitplex.commons.wicket.component.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
public abstract class SymbolTooltipPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java
index d75770afa2..f1d43d5d1c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/SymbolTooltipResourceReference.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.web.component.symboltooltip;
+package com.gitplex.web.component.symboltooltip;
import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class SymbolTooltipResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/ajax-indicator.gif b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/ajax-indicator.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/ajax-indicator.gif
rename to gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/ajax-indicator.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/symbol-tooltip.css b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/symbol-tooltip.css
rename to gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/symbol-tooltip.js b/gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/symboltooltip/symbol-tooltip.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/symboltooltip/symbol-tooltip.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java
index a3c88639b4..f761b38112 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/AbstractTeamChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.teamchoice;
+package com.gitplex.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.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
+import com.gitplex.commons.wicket.component.select2.ChoiceProvider;
public abstract class AbstractTeamChoiceProvider extends ChoiceProvider<Team> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceProvider.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceProvider.java
index a674df4450..01fe59b98f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.component.teamchoice;
+package com.gitplex.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.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.web.Constants;
+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;
public class TeamChoiceProvider extends AbstractTeamChoiceProvider {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java
similarity index 66%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java
index 61ac94bf56..6d1134707e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamChoiceResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.component.teamchoice;
+package com.gitplex.web.component.teamchoice;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class TeamChoiceResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamMultiChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamMultiChoice.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamMultiChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamMultiChoice.java
index 1eef9416f4..da6645e323 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamMultiChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamMultiChoice.java
@@ -1,36 +1,36 @@
-package com.pmease.gitplex.web.component.teamchoice;
-
-import java.util.Collection;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.wicket.component.select2.Select2MultiChoice;
-import com.pmease.gitplex.core.entity.Team;
-
-@SuppressWarnings("serial")
-public class TeamMultiChoice extends Select2MultiChoice<Team> {
-
- public TeamMultiChoice(String id, IModel<Collection<Team>> teamsModel,
- AbstractTeamChoiceProvider choiceProvider) {
- super(id, teamsModel, choiceProvider);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- getSettings().setPlaceholder("Choose teams ...");
- getSettings().setFormatResult("gitplex.teamChoiceFormatter.formatResult");
- getSettings().setFormatSelection("gitplex.teamChoiceFormatter.formatSelection");
- getSettings().setEscapeMarkup("gitplex.teamChoiceFormatter.escapeMarkup");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));
- }
-
-}
+package com.gitplex.web.component.teamchoice;
+
+import java.util.Collection;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
+
+import com.gitplex.core.entity.Team;
+import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
+
+@SuppressWarnings("serial")
+public class TeamMultiChoice extends Select2MultiChoice<Team> {
+
+ public TeamMultiChoice(String id, IModel<Collection<Team>> teamsModel,
+ AbstractTeamChoiceProvider choiceProvider) {
+ super(id, teamsModel, choiceProvider);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("Choose teams ...");
+ getSettings().setFormatResult("gitplex.teamChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("gitplex.teamChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("gitplex.teamChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamSingleChoice.java b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamSingleChoice.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamSingleChoice.java
rename to gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamSingleChoice.java
index 0ec84328f5..964e2578a0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/TeamSingleChoice.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/TeamSingleChoice.java
@@ -1,40 +1,40 @@
-package com.pmease.gitplex.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.pmease.commons.wicket.component.select2.Select2Choice;
-import com.pmease.gitplex.core.entity.Team;
-
-@SuppressWarnings("serial")
-public class TeamSingleChoice extends Select2Choice<Team> {
-
- public TeamSingleChoice(String id, IModel<Team> teamModel,
- AbstractTeamChoiceProvider choiceProvider) {
- super(id, teamModel, choiceProvider);
- }
-
- @Override
- 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");
- }
-
- @Override
- protected void onBeforeRender() {
- getSettings().setAllowClear(!isRequired());
- super.onBeforeRender();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));
- }
-
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class TeamSingleChoice extends Select2Choice<Team> {
+
+ public TeamSingleChoice(String id, IModel<Team> teamModel,
+ AbstractTeamChoiceProvider choiceProvider) {
+ super(id, teamModel, choiceProvider);
+ }
+
+ @Override
+ 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");
+ }
+
+ @Override
+ protected void onBeforeRender() {
+ getSettings().setAllowClear(!isRequired());
+ super.onBeforeRender();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new TeamChoiceResourceReference()));
+ }
+
}
\ No newline at end of file
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/team-choice.js b/gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/team-choice.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/component/teamchoice/team-choice.js
rename to gitplex.web/src/main/java/com/gitplex/web/component/teamchoice/team-choice.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/DepotAccess.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/DepotAccess.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/DepotAccess.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/DepotAccess.java
index ac99ec769f..45c1afb85a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/DepotAccess.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/DepotAccess.java
@@ -1,101 +1,101 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class DepotAccess {
-
- private final Account user;
-
- private final Depot depot;
-
- private transient List<PrivilegeSource> privilegeSources;
-
- private transient DepotPrivilege greatestPrivilege;
-
- public DepotAccess(Account user, Depot depot) {
- this.user = user;
- this.depot = depot;
- }
-
- public Account getUser() {
- return user;
- }
-
- public Depot getDepot() {
- return depot;
- }
-
- /*
- * This method utilizes cached information in account level to reduce database query
- * to the minimum. This is important as this method might be called repeatedly for
- * different depot or user
- */
- public List<PrivilegeSource> getPrivilegeSources() {
- if (privilegeSources == null) {
- privilegeSources = new ArrayList<>();
- if (depot.isPublicRead()) {
- privilegeSources.add(new IsPublicDepot());
- }
- if (user.isAdministrator()) {
- privilegeSources.add(new IsSystemAdministrator());
- }
- if (user.equals(depot.getAccount())) {
- privilegeSources.add(new IsDepotOwner());
- }
-
- OrganizationMembership membership = null;
- for (OrganizationMembership each: depot.getAccount().getOrganizationMembers()) {
- if (each.getUser().equals(user)) {
- membership = each;
- break;
- }
- }
- if (membership != null) {
- if (membership.isAdmin()) {
- privilegeSources.add(new IsOrganizationAdmin(membership));
- }
- if (membership.getOrganization().getDefaultPrivilege() != DepotPrivilege.NONE) {
- privilegeSources.add(new IsOrganizationMember(membership));
- }
- }
- for (TeamAuthorization authorization: depot.getAccount().getAllTeamAuthorizationsInOrganization()) {
- if (authorization.getDepot().equals(depot)) {
- for (TeamMembership teamMembership: depot.getAccount().getAllTeamMembershipsInOrganiation()) {
- if (teamMembership.getUser().equals(user)
- && teamMembership.getTeam().equals(authorization.getTeam())) {
- privilegeSources.add(new IsTeamMember(teamMembership, authorization.getPrivilege()));
- }
- }
- }
- }
- for (UserAuthorization authorization: depot.getAccount().getAllUserAuthorizationsInOrganization()) {
- if (authorization.getDepot().equals(depot) && authorization.getUser().equals(user)) {
- privilegeSources.add(new IsDepotCollaborator(authorization));
- break;
- }
- }
- }
- return privilegeSources;
- }
-
- public DepotPrivilege getGreatestPrivilege() {
- if (greatestPrivilege == null) {
- greatestPrivilege = DepotPrivilege.NONE;
- for (PrivilegeSource source: getPrivilegeSources()) {
- if (source.getPrivilege().can(greatestPrivilege))
- greatestPrivilege = source.getPrivilege();
- }
- }
- return greatestPrivilege;
- }
-
-}
+package com.gitplex.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;
+
+public class DepotAccess {
+
+ private final Account user;
+
+ private final Depot depot;
+
+ private transient List<PrivilegeSource> privilegeSources;
+
+ private transient DepotPrivilege greatestPrivilege;
+
+ public DepotAccess(Account user, Depot depot) {
+ this.user = user;
+ this.depot = depot;
+ }
+
+ public Account getUser() {
+ return user;
+ }
+
+ public Depot getDepot() {
+ return depot;
+ }
+
+ /*
+ * This method utilizes cached information in account level to reduce database query
+ * to the minimum. This is important as this method might be called repeatedly for
+ * different depot or user
+ */
+ public List<PrivilegeSource> getPrivilegeSources() {
+ if (privilegeSources == null) {
+ privilegeSources = new ArrayList<>();
+ if (depot.isPublicRead()) {
+ privilegeSources.add(new IsPublicDepot());
+ }
+ if (user.isAdministrator()) {
+ privilegeSources.add(new IsSystemAdministrator());
+ }
+ if (user.equals(depot.getAccount())) {
+ privilegeSources.add(new IsDepotOwner());
+ }
+
+ OrganizationMembership membership = null;
+ for (OrganizationMembership each: depot.getAccount().getOrganizationMembers()) {
+ if (each.getUser().equals(user)) {
+ membership = each;
+ break;
+ }
+ }
+ if (membership != null) {
+ if (membership.isAdmin()) {
+ privilegeSources.add(new IsOrganizationAdmin(membership));
+ }
+ if (membership.getOrganization().getDefaultPrivilege() != DepotPrivilege.NONE) {
+ privilegeSources.add(new IsOrganizationMember(membership));
+ }
+ }
+ for (TeamAuthorization authorization: depot.getAccount().getAllTeamAuthorizationsInOrganization()) {
+ if (authorization.getDepot().equals(depot)) {
+ for (TeamMembership teamMembership: depot.getAccount().getAllTeamMembershipsInOrganiation()) {
+ if (teamMembership.getUser().equals(user)
+ && teamMembership.getTeam().equals(authorization.getTeam())) {
+ privilegeSources.add(new IsTeamMember(teamMembership, authorization.getPrivilege()));
+ }
+ }
+ }
+ }
+ for (UserAuthorization authorization: depot.getAccount().getAllUserAuthorizationsInOrganization()) {
+ if (authorization.getDepot().equals(depot) && authorization.getUser().equals(user)) {
+ privilegeSources.add(new IsDepotCollaborator(authorization));
+ break;
+ }
+ }
+ }
+ return privilegeSources;
+ }
+
+ public DepotPrivilege getGreatestPrivilege() {
+ if (greatestPrivilege == null) {
+ greatestPrivilege = DepotPrivilege.NONE;
+ for (PrivilegeSource source: getPrivilegeSources()) {
+ if (source.getPrivilege().can(greatestPrivilege))
+ greatestPrivilege = source.getPrivilege();
+ }
+ }
+ return greatestPrivilege;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaborator.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaborator.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaborator.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaborator.java
index a62a43d447..67aa4c0f50 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaborator.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaborator.java
@@ -1,43 +1,43 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsDepotCollaborator implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- private final Long authorizationId;
-
- private final DepotPrivilege privilege;
-
- public IsDepotCollaborator(UserAuthorization authorization) {
- this.authorizationId = authorization.getId();
- this.privilege = authorization.getPrivilege();
- }
-
- @Override
- public DepotPrivilege getPrivilege() {
- return privilege;
- }
-
- @Override
- public Component render(String componentId) {
- return new IsDepotCollaboratorPanel(componentId, new LoadableDetachableModel<UserAuthorization>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected UserAuthorization load() {
- return GitPlex.getInstance(UserAuthorizationManager.class).load(authorizationId);
- }
-
- });
- }
-
-}
+package com.gitplex.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;
+
+public class IsDepotCollaborator implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long authorizationId;
+
+ private final DepotPrivilege privilege;
+
+ public IsDepotCollaborator(UserAuthorization authorization) {
+ this.authorizationId = authorization.getId();
+ this.privilege = authorization.getPrivilege();
+ }
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return privilege;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new IsDepotCollaboratorPanel(componentId, new LoadableDetachableModel<UserAuthorization>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected UserAuthorization load() {
+ return GitPlex.getInstance(UserAuthorizationManager.class).load(authorizationId);
+ }
+
+ });
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaboratorPanel.html b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaboratorPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java
index 3445f99a92..78c0c76145 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotCollaboratorPanel.java
@@ -1,36 +1,36 @@
-package com.pmease.gitplex.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.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;
-
-@SuppressWarnings("serial")
-public class IsDepotCollaboratorPanel extends Panel {
-
- private final IModel<UserAuthorization> authorizationModel;
-
- public IsDepotCollaboratorPanel(String id, IModel<UserAuthorization> authorizationModel) {
- super(id);
- this.authorizationModel = authorizationModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new BookmarkablePageLink<Void>("collaborator", DepotCollaboratorListPage.class,
- DepotCollaboratorListPage.paramsOf(authorizationModel.getObject().getDepot())));
- add(new Label("privilege", authorizationModel.getObject().getPrivilege()));
- }
-
- @Override
- protected void onDetach() {
- authorizationModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class IsDepotCollaboratorPanel extends Panel {
+
+ private final IModel<UserAuthorization> authorizationModel;
+
+ public IsDepotCollaboratorPanel(String id, IModel<UserAuthorization> authorizationModel) {
+ super(id);
+ this.authorizationModel = authorizationModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new BookmarkablePageLink<Void>("collaborator", DepotCollaboratorListPage.class,
+ DepotCollaboratorListPage.paramsOf(authorizationModel.getObject().getDepot())));
+ add(new Label("privilege", authorizationModel.getObject().getPrivilege()));
+ }
+
+ @Override
+ protected void onDetach() {
+ authorizationModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotOwner.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotOwner.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotOwner.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotOwner.java
index c5d56a7ba4..7c0495e253 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsDepotOwner.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsDepotOwner.java
@@ -1,22 +1,22 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsDepotOwner implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public DepotPrivilege getPrivilege() {
- return DepotPrivilege.ADMIN;
- }
-
- @Override
- public Component render(String componentId) {
- return new Label(componentId, "This user is owner of this repository");
- }
-
-}
+package com.gitplex.web.depotaccess;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+
+import com.gitplex.core.security.privilege.DepotPrivilege;
+
+public class IsDepotOwner implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return DepotPrivilege.ADMIN;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, "This user is owner of this repository");
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdmin.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdmin.java
similarity index 72%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdmin.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdmin.java
index 0f5b105864..1fc15caccd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdmin.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdmin.java
@@ -1,40 +1,40 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsOrganizationAdmin implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- private final Long membershipId;
-
- public IsOrganizationAdmin(OrganizationMembership membership) {
- this.membershipId = membership.getId();
- }
-
- @Override
- public DepotPrivilege getPrivilege() {
- return DepotPrivilege.ADMIN;
- }
-
- @Override
- public Component render(String componentId) {
- return new IsOrganizationAdminPanel(componentId, new LoadableDetachableModel<OrganizationMembership>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected OrganizationMembership load() {
- return GitPlex.getInstance(OrganizationMembershipManager.class).load(membershipId);
- }
-
- });
- }
-
-}
+package com.gitplex.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;
+
+public class IsOrganizationAdmin implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long membershipId;
+
+ public IsOrganizationAdmin(OrganizationMembership membership) {
+ this.membershipId = membership.getId();
+ }
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return DepotPrivilege.ADMIN;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new IsOrganizationAdminPanel(componentId, new LoadableDetachableModel<OrganizationMembership>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected OrganizationMembership load() {
+ return GitPlex.getInstance(OrganizationMembershipManager.class).load(membershipId);
+ }
+
+ });
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdminPanel.html b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdminPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdminPanel.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdminPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.java
index a10cf9f633..6364582538 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationAdminPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationAdminPanel.java
@@ -1,37 +1,37 @@
-package com.pmease.gitplex.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.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.web.page.account.members.MemberTeamListPage;
-
-@SuppressWarnings("serial")
-public class IsOrganizationAdminPanel extends Panel {
-
- private final IModel<OrganizationMembership> membershipModel;
-
- public IsOrganizationAdminPanel(String id, IModel<OrganizationMembership> membershipModel) {
- super(id);
- this.membershipModel = membershipModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new BookmarkablePageLink<Void>("member",
- MemberTeamListPage.class, MemberTeamListPage.paramsOf(membershipModel.getObject())));
- add(new Label("organizationName", membershipModel.getObject().getOrganization().getName()));
- }
-
- @Override
- protected void onDetach() {
- membershipModel.detach();
-
- super.onDetach();
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class IsOrganizationAdminPanel extends Panel {
+
+ private final IModel<OrganizationMembership> membershipModel;
+
+ public IsOrganizationAdminPanel(String id, IModel<OrganizationMembership> membershipModel) {
+ super(id);
+ this.membershipModel = membershipModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new BookmarkablePageLink<Void>("member",
+ MemberTeamListPage.class, MemberTeamListPage.paramsOf(membershipModel.getObject())));
+ add(new Label("organizationName", membershipModel.getObject().getOrganization().getName()));
+ }
+
+ @Override
+ protected void onDetach() {
+ membershipModel.detach();
+
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMember.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMember.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMember.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMember.java
index 6accbad588..db4321012c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMember.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMember.java
@@ -1,43 +1,43 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsOrganizationMember implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- private final Long membershipId;
-
- private final DepotPrivilege privilege;
-
- public IsOrganizationMember(OrganizationMembership membership) {
- this.membershipId = membership.getId();
- this.privilege = membership.getOrganization().getDefaultPrivilege();
- }
-
- @Override
- public DepotPrivilege getPrivilege() {
- return privilege;
- }
-
- @Override
- public Component render(String componentId) {
- return new IsOrganizationMemberPanel(componentId, new LoadableDetachableModel<OrganizationMembership>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected OrganizationMembership load() {
- return GitPlex.getInstance(OrganizationMembershipManager.class).load(membershipId);
- }
-
- });
- }
-
-}
+package com.gitplex.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;
+
+public class IsOrganizationMember implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long membershipId;
+
+ private final DepotPrivilege privilege;
+
+ public IsOrganizationMember(OrganizationMembership membership) {
+ this.membershipId = membership.getId();
+ this.privilege = membership.getOrganization().getDefaultPrivilege();
+ }
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return privilege;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new IsOrganizationMemberPanel(componentId, new LoadableDetachableModel<OrganizationMembership>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected OrganizationMembership load() {
+ return GitPlex.getInstance(OrganizationMembershipManager.class).load(membershipId);
+ }
+
+ });
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMemberPanel.html b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMemberPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMemberPanel.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMemberPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.java
index bc301b7e28..aae4b27ac6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsOrganizationMemberPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsOrganizationMemberPanel.java
@@ -1,44 +1,44 @@
-package com.pmease.gitplex.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.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.setting.ProfileEditPage;
-
-public class IsOrganizationMemberPanel extends Panel {
-
- private static final long serialVersionUID = 1L;
-
- private final IModel<OrganizationMembership> membershipModel;
-
- public IsOrganizationMemberPanel(String id, IModel<OrganizationMembership> membershipModel) {
- super(id);
- this.membershipModel = membershipModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Account organization = membershipModel.getObject().getOrganization();
- add(new Label("organizationName", organization.getDisplayName()));
-
- BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("organizationSetting",
- ProfileEditPage.class, ProfileEditPage.paramsOf(organization));
- link.add(new Label("privilegeName", organization.getDefaultPrivilege()));
- link.setEnabled(SecurityUtils.canManage(organization));
- add(link);
- }
-
- @Override
- protected void onDetach() {
- membershipModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.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;
+
+public class IsOrganizationMemberPanel extends Panel {
+
+ private static final long serialVersionUID = 1L;
+
+ private final IModel<OrganizationMembership> membershipModel;
+
+ public IsOrganizationMemberPanel(String id, IModel<OrganizationMembership> membershipModel) {
+ super(id);
+ this.membershipModel = membershipModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Account organization = membershipModel.getObject().getOrganization();
+ add(new Label("organizationName", organization.getDisplayName()));
+
+ BookmarkablePageLink<Void> link = new BookmarkablePageLink<Void>("organizationSetting",
+ ProfileEditPage.class, ProfileEditPage.paramsOf(organization));
+ link.add(new Label("privilegeName", organization.getDefaultPrivilege()));
+ link.setEnabled(SecurityUtils.canManage(organization));
+ add(link);
+ }
+
+ @Override
+ protected void onDetach() {
+ membershipModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsPublicDepot.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsPublicDepot.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsPublicDepot.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsPublicDepot.java
index 3996e1a578..39d76f3353 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsPublicDepot.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsPublicDepot.java
@@ -1,22 +1,22 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsPublicDepot implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public DepotPrivilege getPrivilege() {
- return DepotPrivilege.READ;
- }
-
- @Override
- public Component render(String componentId) {
- return new Label(componentId, "This repository is public");
- }
-
-}
+package com.gitplex.web.depotaccess;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+
+import com.gitplex.core.security.privilege.DepotPrivilege;
+
+public class IsPublicDepot implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return DepotPrivilege.READ;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, "This repository is public");
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsSystemAdministrator.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsSystemAdministrator.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsSystemAdministrator.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsSystemAdministrator.java
index 0f70a3b828..7c4237fc85 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsSystemAdministrator.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsSystemAdministrator.java
@@ -1,22 +1,22 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.markup.html.basic.Label;
-
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsSystemAdministrator implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public DepotPrivilege getPrivilege() {
- return DepotPrivilege.ADMIN;
- }
-
- @Override
- public Component render(String componentId) {
- return new Label(componentId, "This user is system administrator");
- }
-
-}
+package com.gitplex.web.depotaccess;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+
+import com.gitplex.core.security.privilege.DepotPrivilege;
+
+public class IsSystemAdministrator implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return DepotPrivilege.ADMIN;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new Label(componentId, "This user is system administrator");
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMember.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMember.java
similarity index 73%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMember.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMember.java
index 890b42e3c1..feeb10ca1a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMember.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMember.java
@@ -1,43 +1,43 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public class IsTeamMember implements PrivilegeSource {
-
- private static final long serialVersionUID = 1L;
-
- private final Long membershipId;
-
- private final DepotPrivilege privilege;
-
- public IsTeamMember(TeamMembership membership, DepotPrivilege privilege) {
- this.membershipId = membership.getId();
- this.privilege = privilege;
- }
-
- @Override
- public DepotPrivilege getPrivilege() {
- return privilege;
- }
-
- @Override
- public Component render(String componentId) {
- return new IsTeamMemberPanel(componentId, new LoadableDetachableModel<TeamMembership>() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- protected TeamMembership load() {
- return GitPlex.getInstance(TeamMembershipManager.class).load(membershipId);
- }
-
- }, privilege);
- }
-
-}
+package com.gitplex.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;
+
+public class IsTeamMember implements PrivilegeSource {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Long membershipId;
+
+ private final DepotPrivilege privilege;
+
+ public IsTeamMember(TeamMembership membership, DepotPrivilege privilege) {
+ this.membershipId = membership.getId();
+ this.privilege = privilege;
+ }
+
+ @Override
+ public DepotPrivilege getPrivilege() {
+ return privilege;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new IsTeamMemberPanel(componentId, new LoadableDetachableModel<TeamMembership>() {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected TeamMembership load() {
+ return GitPlex.getInstance(TeamMembershipManager.class).load(membershipId);
+ }
+
+ }, privilege);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMemberPanel.html b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMemberPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMemberPanel.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMemberPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.java
index d71b430cda..2fb386508c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/IsTeamMemberPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/IsTeamMemberPanel.java
@@ -1,52 +1,52 @@
-package com.pmease.gitplex.web.depotaccess;
-
-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.IModel;
-
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.page.account.teams.TeamDepotListPage;
-import com.pmease.gitplex.web.page.account.teams.TeamMemberListPage;
-
-@SuppressWarnings("serial")
-public class IsTeamMemberPanel extends Panel {
-
- private final IModel<TeamMembership> membershipModel;
-
- private final DepotPrivilege privilege;
-
- public IsTeamMemberPanel(String id, IModel<TeamMembership> membershipModel, DepotPrivilege privilege) {
- super(id);
- this.membershipModel = membershipModel;
- this.privilege = privilege;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Link<Void> memberListLink = new BookmarkablePageLink<Void>(
- "memberListLink",
- TeamMemberListPage.class,
- TeamMemberListPage.paramsOf(membershipModel.getObject().getTeam()));
- memberListLink.add(new Label("name", membershipModel.getObject().getTeam().getName()));
- add(memberListLink);
-
- Link<Void> depotListLink = new BookmarkablePageLink<Void>(
- "depotListLink",
- TeamDepotListPage.class,
- TeamDepotListPage.paramsOf(membershipModel.getObject().getTeam()));
- depotListLink.add(new Label("privilege", privilege));
- add(depotListLink);
- }
-
- @Override
- protected void onDetach() {
- membershipModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.depotaccess;
+
+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.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;
+
+@SuppressWarnings("serial")
+public class IsTeamMemberPanel extends Panel {
+
+ private final IModel<TeamMembership> membershipModel;
+
+ private final DepotPrivilege privilege;
+
+ public IsTeamMemberPanel(String id, IModel<TeamMembership> membershipModel, DepotPrivilege privilege) {
+ super(id);
+ this.membershipModel = membershipModel;
+ this.privilege = privilege;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Link<Void> memberListLink = new BookmarkablePageLink<Void>(
+ "memberListLink",
+ TeamMemberListPage.class,
+ TeamMemberListPage.paramsOf(membershipModel.getObject().getTeam()));
+ memberListLink.add(new Label("name", membershipModel.getObject().getTeam().getName()));
+ add(memberListLink);
+
+ Link<Void> depotListLink = new BookmarkablePageLink<Void>(
+ "depotListLink",
+ TeamDepotListPage.class,
+ TeamDepotListPage.paramsOf(membershipModel.getObject().getTeam()));
+ depotListLink.add(new Label("privilege", privilege));
+ add(depotListLink);
+ }
+
+ @Override
+ protected void onDetach() {
+ membershipModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/PrivilegeSource.java b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/PrivilegeSource.java
similarity index 61%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/PrivilegeSource.java
rename to gitplex.web/src/main/java/com/gitplex/web/depotaccess/PrivilegeSource.java
index 51b2ad4c64..41477aefdd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/depotaccess/PrivilegeSource.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/depotaccess/PrivilegeSource.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.depotaccess;
-
-import java.io.Serializable;
-
-import org.apache.wicket.Component;
-
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-
-public interface PrivilegeSource extends Serializable {
-
- DepotPrivilege getPrivilege();
-
- Component render(String componentId);
+package com.gitplex.web.depotaccess;
+
+import java.io.Serializable;
+
+import org.apache.wicket.Component;
+
+import com.gitplex.core.security.privilege.DepotPrivilege;
+
+public interface PrivilegeSource extends Serializable {
+
+ DepotPrivilege getPrivilege();
+
+ Component render(String componentId);
}
\ No newline at end of file
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.java
new file mode 100644
index 0000000000..a63bda239f
--- /dev/null
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/EditSupportLocator.java
@@ -0,0 +1,5 @@
+package com.gitplex.web.editable;
+
+public class EditSupportLocator {
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountEditSupport.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountEditSupport.java
index 07547b245a..2b48b5ab60 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.accountchoice;
+package com.gitplex.web.editable.accountchoice;
import java.lang.reflect.Method;
import java.util.List;
@@ -9,15 +9,15 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.AccountChoice;
+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;
+import com.gitplex.commons.wicket.editable.NotDefinedLabel;
+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;
@SuppressWarnings("serial")
public class AccountEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java
similarity index 72%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java
index 355419cd10..3afdc1d77c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountMultiChoiceEditor.java
@@ -1,72 +1,72 @@
-package com.pmease.gitplex.web.editable.accountchoice;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceProvider;
-import com.pmease.gitplex.web.component.accountchoice.AccountMultiChoice;
-
-@SuppressWarnings("serial")
-public class AccountMultiChoiceEditor extends PropertyEditor<List<String>> {
-
- private AccountMultiChoice input;
-
- private final boolean organization;
-
- public AccountMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
- IModel<List<String>> propertyModel, boolean organization) {
- super(id, propertyDescriptor, propertyModel);
- this.organization = organization;
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<Account> accounts = new ArrayList<>();
- if (getModelObject() != null) {
- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);
- for (String accountName: getModelObject()) {
- Account account = accountManager.findByName(accountName);
- if (account != null)
- accounts.add(account);
- }
- }
-
- input = new AccountMultiChoice("input", new Model((Serializable)accounts), new AccountChoiceProvider(organization));
- input.setConvertEmptyInputStringToNull(true);
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected List<String> convertInputToValue() throws ConversionException {
- List<String> accountNames = new ArrayList<>();
- Collection<Account> accounts = input.getConvertedInput();
- if (accounts != null) {
- for (Account account: accounts)
- accountNames.add(account.getName());
- }
- return accountNames;
- }
-
-}
+package com.gitplex.web.editable.accountchoice;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class AccountMultiChoiceEditor extends PropertyEditor<List<String>> {
+
+ private AccountMultiChoice input;
+
+ private final boolean organization;
+
+ public AccountMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
+ IModel<List<String>> propertyModel, boolean organization) {
+ super(id, propertyDescriptor, propertyModel);
+ this.organization = organization;
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<Account> accounts = new ArrayList<>();
+ if (getModelObject() != null) {
+ AccountManager accountManager = GitPlex.getInstance(AccountManager.class);
+ for (String accountName: getModelObject()) {
+ Account account = accountManager.findByName(accountName);
+ if (account != null)
+ accounts.add(account);
+ }
+ }
+
+ input = new AccountMultiChoice("input", new Model((Serializable)accounts), new AccountChoiceProvider(organization));
+ input.setConvertEmptyInputStringToNull(true);
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected List<String> convertInputToValue() throws ConversionException {
+ List<String> accountNames = new ArrayList<>();
+ Collection<Account> accounts = input.getConvertedInput();
+ if (accounts != null) {
+ for (Account account: accounts)
+ accountNames.add(account.getName());
+ }
+ return accountNames;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java
similarity index 68%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java
index 5e9b62aafc..45d5dc0a9d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/accountchoice/AccountSingleChoiceEditor.java
@@ -1,63 +1,63 @@
-package com.pmease.gitplex.web.editable.accountchoice;
-
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceProvider;
-import com.pmease.gitplex.web.component.accountchoice.AccountSingleChoice;
-
-@SuppressWarnings("serial")
-public class AccountSingleChoiceEditor extends PropertyEditor<String> {
-
- private AccountSingleChoice input;
-
- private boolean organization;
-
- public AccountSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
- IModel<String> propertyModel, boolean organization) {
- super(id, propertyDescriptor, propertyModel);
- this.organization = organization;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Account account;
- if (getModelObject() != null)
- account = GitPlex.getInstance(AccountManager.class).findByName(getModelObject());
- else
- account = null;
-
- input = new AccountSingleChoice("input", Model.of(account), new AccountChoiceProvider(organization));
- input.setConvertEmptyInputStringToNull(true);
-
- // add this to control allowClear flag of select2
- input.setRequired(propertyDescriptor.isPropertyRequired());
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- Account account = input.getConvertedInput();
- if (account != null)
- return account.getName();
- else
- return null;
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class AccountSingleChoiceEditor extends PropertyEditor<String> {
+
+ private AccountSingleChoice input;
+
+ private boolean organization;
+
+ public AccountSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor,
+ IModel<String> propertyModel, boolean organization) {
+ super(id, propertyDescriptor, propertyModel);
+ this.organization = organization;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Account account;
+ if (getModelObject() != null)
+ account = GitPlex.getInstance(AccountManager.class).findByName(getModelObject());
+ else
+ account = null;
+
+ input = new AccountSingleChoice("input", Model.of(account), new AccountChoiceProvider(organization));
+ input.setConvertEmptyInputStringToNull(true);
+
+ // add this to control allowClear flag of select2
+ input.setRequired(propertyDescriptor.isPropertyRequired());
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ Account account = input.getConvertedInput();
+ if (account != null)
+ return account.getName();
+ else
+ return null;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchEditSupport.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchEditSupport.java
index 699a555c62..5d55df9cdd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.branchchoice;
+package com.gitplex.web.editable.branchchoice;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -10,15 +10,15 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.BranchChoice;
+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;
+import com.gitplex.commons.wicket.editable.EditableUtils;
+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;
@SuppressWarnings("serial")
public class BranchEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java
similarity index 73%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java
index c3ae35528e..089ace67d0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchMultiChoiceEditor.java
@@ -1,68 +1,68 @@
-package com.pmease.gitplex.web.editable.branchchoice;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.branchchoice.BranchChoiceProvider;
-import com.pmease.gitplex.web.component.branchchoice.BranchMultiChoice;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {
-
- private BranchMultiChoice input;
-
- public BranchMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Depot>() {
-
- @Override
- protected Depot load() {
- DepotPage page = (DepotPage) getPage();
- return page.getDepot();
- }
-
- });
-
- ArrayList<String> depotAndBranches = new ArrayList<>();
- if (getModelObject() != null)
- depotAndBranches.addAll(getModelObject());
-
- input = new BranchMultiChoice("input", new Model(depotAndBranches), branchProvider);
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected List<String> convertInputToValue() throws ConversionException {
- List<String> depotAndBranches = new ArrayList<>();
- Collection<String> convertedInput = input.getConvertedInput();
- if (convertedInput != null)
- depotAndBranches.addAll(convertedInput);
- return depotAndBranches;
- }
-
-}
+package com.gitplex.web.editable.branchchoice;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.model.IModel;
+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;
+
+@SuppressWarnings("serial")
+public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {
+
+ private BranchMultiChoice input;
+
+ public BranchMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Depot>() {
+
+ @Override
+ protected Depot load() {
+ DepotPage page = (DepotPage) getPage();
+ return page.getDepot();
+ }
+
+ });
+
+ ArrayList<String> depotAndBranches = new ArrayList<>();
+ if (getModelObject() != null)
+ depotAndBranches.addAll(getModelObject());
+
+ input = new BranchMultiChoice("input", new Model(depotAndBranches), branchProvider);
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected List<String> convertInputToValue() throws ConversionException {
+ List<String> depotAndBranches = new ArrayList<>();
+ Collection<String> convertedInput = input.getConvertedInput();
+ if (convertedInput != null)
+ depotAndBranches.addAll(convertedInput);
+ return depotAndBranches;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java
similarity index 68%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java
index fcac0d0f1a..5b394e3811 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/branchchoice/BranchSingleChoiceEditor.java
@@ -1,58 +1,58 @@
-package com.pmease.gitplex.web.editable.branchchoice;
-
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.branchchoice.BranchChoiceProvider;
-import com.pmease.gitplex.web.component.branchchoice.BranchSingleChoice;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class BranchSingleChoiceEditor extends PropertyEditor<String> {
-
- private BranchSingleChoice input;
-
- public BranchSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Depot>() {
-
- @Override
- protected Depot load() {
- DepotPage page = (DepotPage) getPage();
- return page.getDepot();
- }
-
- });
-
- input = new BranchSingleChoice("input", getModel(), branchProvider);
- input.setConvertEmptyInputStringToNull(true);
-
- // add this to control allowClear flag of select2
- input.setRequired(propertyDescriptor.isPropertyRequired());
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class BranchSingleChoiceEditor extends PropertyEditor<String> {
+
+ private BranchSingleChoice input;
+
+ public BranchSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ BranchChoiceProvider branchProvider = new BranchChoiceProvider(new LoadableDetachableModel<Depot>() {
+
+ @Override
+ protected Depot load() {
+ DepotPage page = (DepotPage) getPage();
+ return page.getDepot();
+ }
+
+ });
+
+ input = new BranchSingleChoice("input", getModel(), branchProvider);
+ input.setConvertEmptyInputStringToNull(true);
+
+ // add this to control allowClear flag of select2
+ input.setRequired(propertyDescriptor.isPropertyRequired());
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java
index 95f7f8a8b6..ad6e49f512 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.branchmatch;
+package com.gitplex.web.editable.branchmatch;
import java.lang.reflect.Method;
import java.util.Set;
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.BranchMatch;
+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;
+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;
@SuppressWarnings("serial")
public class BranchMatchEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.java
index a57028c73d..c4dd1dcc31 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/branchmatch/BranchMatchEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/branchmatch/BranchMatchEditor.java
@@ -1,65 +1,65 @@
-package com.pmease.gitplex.web.editable.branchmatch;
-
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.branchmatch.BranchMatchInput;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class BranchMatchEditor extends PropertyEditor<String> {
-
- private BranchMatchInput input;
-
- public BranchMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new BranchMatchInput("input", new AbstractReadOnlyModel<Depot>() {
-
- @Override
- public Depot getObject() {
- return ((DepotPage) getPage()).getDepot();
- }
-
- }, getModel());
-
- add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
+package com.gitplex.web.editable.branchmatch;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+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;
+
+@SuppressWarnings("serial")
+public class BranchMatchEditor extends PropertyEditor<String> {
+
+ private BranchMatchInput input;
+
+ public BranchMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ input = new BranchMatchInput("input", new AbstractReadOnlyModel<Depot>() {
+
+ @Override
+ public Depot getObject() {
+ return ((DepotPage) getPage()).getDepot();
+ }
+
+ }, getModel());
+
+ add(input);
+
+ add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (hasErrors(true))
+ return " has-error";
+ else
+ return "";
+ }
+
+ }));
+
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.java
index 68a06d8d61..a068dd8c99 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileChoiceEditor.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.filechoice;
+package com.gitplex.web.editable.filechoice;
import java.util.ArrayList;
import java.util.List;
@@ -8,20 +8,20 @@ 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.pmease.commons.antlr.codeassist.InputCompletion;
-import com.pmease.commons.antlr.codeassist.InputStatus;
-import com.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.util.ReflectionUtils;
-import com.pmease.commons.wicket.behavior.inputassist.InputAssistBehavior;
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.annotation.FileChoice;
-import com.pmease.gitplex.web.util.SuggestionUtils;
+import com.gitplex.commons.antlr.codeassist.InputCompletion;
+import com.gitplex.commons.antlr.codeassist.InputStatus;
+import com.gitplex.commons.antlr.codeassist.InputSuggestion;
+import com.gitplex.commons.util.Range;
+import com.gitplex.commons.util.ReflectionUtils;
+import com.gitplex.commons.wicket.behavior.inputassist.InputAssistBehavior;
+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;
@SuppressWarnings("serial")
public class FileChoiceEditor extends PropertyEditor<String> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileEditSupport.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileEditSupport.java
index fd68ae44dc..1076bf30b6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/filechoice/FileEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/filechoice/FileEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.filechoice;
+package com.gitplex.web.editable.filechoice;
import java.lang.reflect.Method;
import java.util.Set;
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.FileChoice;
+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;
+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;
@SuppressWarnings("serial")
public class FileEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
index c056d2107c..0f55029da2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.fullbranchmatch;
+package com.gitplex.web.editable.fullbranchmatch;
import java.lang.reflect.Method;
import java.util.Set;
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.FullBranchMatch;
+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;
+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;
@SuppressWarnings("serial")
public class FullBranchMatchEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java
index 9c1c7bfc73..f620c72ad7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/fullbranchmatch/FullBranchMatchEditor.java
@@ -1,65 +1,65 @@
-package com.pmease.gitplex.web.editable.fullbranchmatch;
-
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.fullbranchmatch.FullBranchMatchInput;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class FullBranchMatchEditor extends PropertyEditor<String> {
-
- private FullBranchMatchInput input;
-
- public FullBranchMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new FullBranchMatchInput("input", new AbstractReadOnlyModel<Depot>() {
-
- @Override
- public Depot getObject() {
- return ((DepotPage) getPage()).getDepot();
- }
-
- }, getModel());
-
- add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
+package com.gitplex.web.editable.fullbranchmatch;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+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;
+
+@SuppressWarnings("serial")
+public class FullBranchMatchEditor extends PropertyEditor<String> {
+
+ private FullBranchMatchInput input;
+
+ public FullBranchMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ input = new FullBranchMatchInput("input", new AbstractReadOnlyModel<Depot>() {
+
+ @Override
+ public Depot getObject() {
+ return ((DepotPage) getPage()).getDepot();
+ }
+
+ }, getModel());
+
+ add(input);
+
+ add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (hasErrors(true))
+ return " has-error";
+ else
+ return "";
+ }
+
+ }));
+
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditSupport.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditSupport.java
index 26c13238c2..13151ead95 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.pathmatch;
+package com.gitplex.web.editable.pathmatch;
import java.lang.reflect.Method;
import java.util.Set;
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.PathMatch;
+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;
+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;
@SuppressWarnings("serial")
public class PathMatchEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.java
index bbb864eb6e..19ff931597 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/pathmatch/PathMatchEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/pathmatch/PathMatchEditor.java
@@ -1,65 +1,65 @@
-package com.pmease.gitplex.web.editable.pathmatch;
-
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.pathmatch.PathMatchInput;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class PathMatchEditor extends PropertyEditor<String> {
-
- private PathMatchInput input;
-
- public PathMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new PathMatchInput("input", new AbstractReadOnlyModel<Depot>() {
-
- @Override
- public Depot getObject() {
- return ((DepotPage) getPage()).getDepot();
- }
-
- }, getModel());
-
- add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
+package com.gitplex.web.editable.pathmatch;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+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;
+
+@SuppressWarnings("serial")
+public class PathMatchEditor extends PropertyEditor<String> {
+
+ private PathMatchInput input;
+
+ public PathMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ input = new PathMatchInput("input", new AbstractReadOnlyModel<Depot>() {
+
+ @Override
+ public Depot getObject() {
+ return ((DepotPage) getPage()).getDepot();
+ }
+
+ }, getModel());
+
+ add(input);
+
+ add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (hasErrors(true))
+ return " has-error";
+ else
+ return "";
+ }
+
+ }));
+
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditSupport.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditSupport.java
index 035e1400d2..eeec5f0efd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.refmatch;
+package com.gitplex.web.editable.refmatch;
import java.lang.reflect.Method;
import java.util.Set;
@@ -7,14 +7,14 @@ import org.apache.wicket.Component;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.RefMatch;
+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;
+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;
@SuppressWarnings("serial")
public class RefMatchEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.java
index 9d6a645419..47713306b0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/refmatch/RefMatchEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/refmatch/RefMatchEditor.java
@@ -1,65 +1,65 @@
-package com.pmease.gitplex.web.editable.refmatch;
-
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.component.refmatch.RefMatchInput;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-
-@SuppressWarnings("serial")
-public class RefMatchEditor extends PropertyEditor<String> {
-
- private RefMatchInput input;
-
- public RefMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- input = new RefMatchInput("input", new AbstractReadOnlyModel<Depot>() {
-
- @Override
- public Depot getObject() {
- return ((DepotPage) getPage()).getDepot();
- }
-
- }, getModel());
-
- add(input);
-
- add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- if (hasErrors(true))
- return " has-error";
- else
- return "";
- }
-
- }));
-
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- return input.getConvertedInput();
- }
-
-}
+package com.gitplex.web.editable.refmatch;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+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;
+
+@SuppressWarnings("serial")
+public class RefMatchEditor extends PropertyEditor<String> {
+
+ private RefMatchInput input;
+
+ public RefMatchEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ input = new RefMatchInput("input", new AbstractReadOnlyModel<Depot>() {
+
+ @Override
+ public Depot getObject() {
+ return ((DepotPage) getPage()).getDepot();
+ }
+
+ }, getModel());
+
+ add(input);
+
+ add(new AttributeAppender("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (hasErrors(true))
+ return " has-error";
+ else
+ return "";
+ }
+
+ }));
+
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamEditSupport.java b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamEditSupport.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamEditSupport.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamEditSupport.java
index a7756edd6d..96d376de54 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamEditSupport.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamEditSupport.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.editable.teamchoice;
+package com.gitplex.web.editable.teamchoice;
import java.lang.reflect.Method;
import java.util.Collection;
@@ -9,15 +9,15 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.eclipse.jgit.util.StringUtils;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.EditSupport;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.commons.wicket.editable.NotDefinedLabel;
-import com.pmease.commons.wicket.editable.PropertyContext;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.commons.wicket.editable.PropertyViewer;
-import com.pmease.gitplex.core.annotation.TeamChoice;
+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;
+import com.gitplex.commons.wicket.editable.EditableUtils;
+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;
@SuppressWarnings("serial")
public class TeamEditSupport implements EditSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java
index e220b1b6f5..d83acfc078 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamMultiChoiceEditor.java
@@ -1,79 +1,79 @@
-package com.pmease.gitplex.web.editable.teamchoice;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.ConversionException;
-
-import com.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.web.component.teamchoice.TeamChoiceProvider;
-import com.pmease.gitplex.web.component.teamchoice.TeamMultiChoice;
-import com.pmease.gitplex.web.page.account.AccountPage;
-
-@SuppressWarnings("serial")
-public class TeamMultiChoiceEditor extends PropertyEditor<Collection<String>> {
-
- private TeamMultiChoice input;
-
- public TeamMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- IModel<Account> organizationModel = new AbstractReadOnlyModel<Account>() {
-
- @Override
- public Account getObject() {
- return ((AccountPage)getPage()).getAccount();
- }
-
- };
- List<Team> teams = new ArrayList<>();
- if (getModelObject() != null) {
- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
- for (String teamName: getModelObject()) {
- Team team = teamManager.find(organizationModel.getObject(), teamName);
- if (team != null)
- teams.add(team);
- }
- }
-
- input = new TeamMultiChoice("input", new Model((Serializable)teams), new TeamChoiceProvider(organizationModel));
- input.setConvertEmptyInputStringToNull(true);
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected List<String> convertInputToValue() throws ConversionException {
- List<String> teamNames = new ArrayList<>();
- Collection<Team> teams = input.getConvertedInput();
- if (teams != null) {
- for (Team team: teams)
- teamNames.add(team.getName());
- }
- return teamNames;
- }
-
-}
+package com.gitplex.web.editable.teamchoice;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class TeamMultiChoiceEditor extends PropertyEditor<Collection<String>> {
+
+ private TeamMultiChoice input;
+
+ public TeamMultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<Collection<String>> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @SuppressWarnings({ "rawtypes", "unchecked" })
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ IModel<Account> organizationModel = new AbstractReadOnlyModel<Account>() {
+
+ @Override
+ public Account getObject() {
+ return ((AccountPage)getPage()).getAccount();
+ }
+
+ };
+ List<Team> teams = new ArrayList<>();
+ if (getModelObject() != null) {
+ TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
+ for (String teamName: getModelObject()) {
+ Team team = teamManager.find(organizationModel.getObject(), teamName);
+ if (team != null)
+ teams.add(team);
+ }
+ }
+
+ input = new TeamMultiChoice("input", new Model((Serializable)teams), new TeamChoiceProvider(organizationModel));
+ input.setConvertEmptyInputStringToNull(true);
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected List<String> convertInputToValue() throws ConversionException {
+ List<String> teamNames = new ArrayList<>();
+ Collection<Team> teams = input.getConvertedInput();
+ if (teams != null) {
+ for (Team team: teams)
+ teamNames.add(team.getName());
+ }
+ return teamNames;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.html b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java
index e3220a7c32..01bb7a971d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/editable/teamchoice/TeamSingleChoiceEditor.java
@@ -1,70 +1,70 @@
-package com.pmease.gitplex.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.pmease.commons.wicket.editable.ErrorContext;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.PropertyEditor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.web.component.teamchoice.TeamChoiceProvider;
-import com.pmease.gitplex.web.component.teamchoice.TeamSingleChoice;
-import com.pmease.gitplex.web.page.account.AccountPage;
-
-@SuppressWarnings("serial")
-public class TeamSingleChoiceEditor extends PropertyEditor<String> {
-
- private TeamSingleChoice input;
-
- public TeamSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
- super(id, propertyDescriptor, propertyModel);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- IModel<Account> organizationModel = new AbstractReadOnlyModel<Account>() {
-
- @Override
- public Account getObject() {
- return ((AccountPage)getPage()).getAccount();
- }
-
- };
- Team team;
- if (getModelObject() != null)
- team = GitPlex.getInstance(TeamManager.class).find(organizationModel.getObject(), getModelObject());
- else
- team = null;
-
- input = new TeamSingleChoice("input", Model.of(team), new TeamChoiceProvider(organizationModel));
- input.setConvertEmptyInputStringToNull(true);
-
- // add this to control allowClear flag of select2
- input.setRequired(propertyDescriptor.isPropertyRequired());
-
- add(input);
- }
-
- @Override
- public ErrorContext getErrorContext(PathSegment pathSegment) {
- return null;
- }
-
- @Override
- protected String convertInputToValue() throws ConversionException {
- Team team = input.getConvertedInput();
- if (team != null)
- return team.getName();
- else
- return null;
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class TeamSingleChoiceEditor extends PropertyEditor<String> {
+
+ private TeamSingleChoice input;
+
+ public TeamSingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
+ super(id, propertyDescriptor, propertyModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ IModel<Account> organizationModel = new AbstractReadOnlyModel<Account>() {
+
+ @Override
+ public Account getObject() {
+ return ((AccountPage)getPage()).getAccount();
+ }
+
+ };
+ Team team;
+ if (getModelObject() != null)
+ team = GitPlex.getInstance(TeamManager.class).find(organizationModel.getObject(), getModelObject());
+ else
+ team = null;
+
+ input = new TeamSingleChoice("input", Model.of(team), new TeamChoiceProvider(organizationModel));
+ input.setConvertEmptyInputStringToNull(true);
+
+ // add this to control allowClear flag of select2
+ input.setRequired(propertyDescriptor.isPropertyRequired());
+
+ add(input);
+ }
+
+ @Override
+ public ErrorContext getErrorContext(PathSegment pathSegment) {
+ return null;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ Team team = input.getConvertedInput();
+ if (team != null)
+ return team.getName();
+ else
+ return null;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/AccountMapper.java b/gitplex.web/src/main/java/com/gitplex/web/mapper/AccountMapper.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/AccountMapper.java
rename to gitplex.web/src/main/java/com/gitplex/web/mapper/AccountMapper.java
index 401d993fca..461ed0fd28 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/AccountMapper.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/mapper/AccountMapper.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.web.mapper;
+package com.gitplex.web.mapper;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.component.IRequestablePage;
-import com.pmease.commons.wicket.NoVersionMountedMapper;
+import com.gitplex.commons.wicket.NoVersionMountedMapper;
public class AccountMapper extends NoVersionMountedMapper {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/DepotMapper.java b/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotMapper.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/DepotMapper.java
rename to gitplex.web/src/main/java/com/gitplex/web/mapper/DepotMapper.java
index cad3e237be..8476cfcaf8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/DepotMapper.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotMapper.java
@@ -1,10 +1,10 @@
-package com.pmease.gitplex.web.mapper;
+package com.gitplex.web.mapper;
import org.apache.wicket.request.IRequestHandler;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.component.IRequestablePage;
-import com.pmease.commons.wicket.NoVersionMountedMapper;
+import com.gitplex.commons.wicket.NoVersionMountedMapper;
public class DepotMapper extends NoVersionMountedMapper {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/DepotResourceMapper.java b/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotResourceMapper.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/DepotResourceMapper.java
rename to gitplex.web/src/main/java/com/gitplex/web/mapper/DepotResourceMapper.java
index b52e4e4245..8981d6c3b1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/DepotResourceMapper.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/mapper/DepotResourceMapper.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.mapper;
+package com.gitplex.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/pmease/gitplex/web/mapper/MapperUtils.java b/gitplex.web/src/main/java/com/gitplex/web/mapper/MapperUtils.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/MapperUtils.java
rename to gitplex.web/src/main/java/com/gitplex/web/mapper/MapperUtils.java
index 48e31800e2..fc63071cf3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/MapperUtils.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/mapper/MapperUtils.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.mapper;
+package com.gitplex.web.mapper;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.request.Url;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.util.validation.AccountNameValidator;
-import com.pmease.gitplex.core.util.validation.DepotNameValidator;
+import com.gitplex.core.util.validation.AccountNameValidator;
+import com.gitplex.core.util.validation.DepotNameValidator;
+import com.gitplex.commons.util.StringUtils;
public class MapperUtils {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/UrlMapper.java b/gitplex.web/src/main/java/com/gitplex/web/mapper/UrlMapper.java
similarity index 60%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/UrlMapper.java
rename to gitplex.web/src/main/java/com/gitplex/web/mapper/UrlMapper.java
index 76e2726ac1..8cdf89536c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/mapper/UrlMapper.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/mapper/UrlMapper.java
@@ -1,71 +1,71 @@
-package com.pmease.gitplex.web.mapper;
+package com.gitplex.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.pmease.commons.wicket.NoVersionMountedMapper;
-import com.pmease.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorEffectivePrivilegePage;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;
-import com.pmease.gitplex.web.page.account.members.MemberEffectivePrivilegePage;
-import com.pmease.gitplex.web.page.account.members.MemberListPage;
-import com.pmease.gitplex.web.page.account.members.MemberPrivilegeSourcePage;
-import com.pmease.gitplex.web.page.account.members.MemberTeamListPage;
-import com.pmease.gitplex.web.page.account.members.NewMembersPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.account.overview.NewDepotPage;
-import com.pmease.gitplex.web.page.account.overview.NewOrganizationPage;
-import com.pmease.gitplex.web.page.account.setting.AvatarEditPage;
-import com.pmease.gitplex.web.page.account.setting.PasswordEditPage;
-import com.pmease.gitplex.web.page.account.setting.ProfileEditPage;
-import com.pmease.gitplex.web.page.account.tasks.TaskListPage;
-import com.pmease.gitplex.web.page.account.teams.NewTeamPage;
-import com.pmease.gitplex.web.page.account.teams.TeamDepotListPage;
-import com.pmease.gitplex.web.page.account.teams.TeamEditPage;
-import com.pmease.gitplex.web.page.account.teams.TeamListPage;
-import com.pmease.gitplex.web.page.account.teams.TeamMemberListPage;
-import com.pmease.gitplex.web.page.admin.DatabaseBackupPage;
-import com.pmease.gitplex.web.page.admin.MailSettingPage;
-import com.pmease.gitplex.web.page.admin.SystemSettingPage;
-import com.pmease.gitplex.web.page.admin.account.UserListPage;
-import com.pmease.gitplex.web.page.admin.account.NewUserPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.branches.DepotBranchesPage;
-import com.pmease.gitplex.web.page.depot.comments.CodeCommentPage;
-import com.pmease.gitplex.web.page.depot.comments.DepotCommentsPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.commit.DepotCommitsPage;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;
-import com.pmease.gitplex.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;
-import com.pmease.gitplex.web.page.depot.setting.gatekeeper.GateKeeperPage;
-import com.pmease.gitplex.web.page.depot.setting.general.GeneralSettingPage;
-import com.pmease.gitplex.web.page.depot.setting.integrationpolicy.IntegrationPolicyPage;
-import com.pmease.gitplex.web.page.depot.tags.DepotTagsPage;
-import com.pmease.gitplex.web.page.init.ServerInitPage;
-import com.pmease.gitplex.web.page.init.WelcomePage;
-import com.pmease.gitplex.web.page.layout.CreateDepotPage;
-import com.pmease.gitplex.web.page.security.ForgetPage;
-import com.pmease.gitplex.web.page.security.LoginPage;
-import com.pmease.gitplex.web.page.security.LogoutPage;
-import com.pmease.gitplex.web.page.security.RegisterPage;
-import com.pmease.gitplex.web.page.test.RunModePage;
-import com.pmease.gitplex.web.page.test.TestPage;
-import com.pmease.gitplex.web.resource.ArchiveResourceReference;
-import com.pmease.gitplex.web.resource.AttachmentResourceReference;
-import com.pmease.gitplex.web.resource.BlobResourceReference;
+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;
public class UrlMapper extends CompoundRequestMapper {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/AffinalDepotsModel.java b/gitplex.web/src/main/java/com/gitplex/web/model/AffinalDepotsModel.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/model/AffinalDepotsModel.java
rename to gitplex.web/src/main/java/com/gitplex/web/model/AffinalDepotsModel.java
index 7120eb5c79..f4e2a0f8ea 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/AffinalDepotsModel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/model/AffinalDepotsModel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.model;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
+import com.gitplex.core.GitPlex;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.core.security.SecurityUtils;
+import com.gitplex.commons.hibernate.dao.Dao;
@SuppressWarnings("serial")
public class AffinalDepotsModel extends LoadableDetachableModel<Collection<Depot>> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/CommitRefsModel.java b/gitplex.web/src/main/java/com/gitplex/web/model/CommitRefsModel.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/model/CommitRefsModel.java
rename to gitplex.web/src/main/java/com/gitplex/web/model/CommitRefsModel.java
index 6694e2816b..0ffecd02d9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/CommitRefsModel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/model/CommitRefsModel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.model;
+package com.gitplex.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.pmease.commons.git.RefInfo;
-import com.pmease.gitplex.core.entity.Depot;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.commons.git.RefInfo;
public class CommitRefsModel extends LoadableDetachableModel<Map<String, List<String>>> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/DepotModel.java b/gitplex.web/src/main/java/com/gitplex/web/model/DepotModel.java
similarity index 69%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/model/DepotModel.java
rename to gitplex.web/src/main/java/com/gitplex/web/model/DepotModel.java
index 37e8dc3f15..910813f324 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/DepotModel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/model/DepotModel.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.model;
-
-import com.pmease.gitplex.core.entity.Depot;
-
-/** Shortcut for {@link EntityModel}<Repository> */
-public class DepotModel extends EntityModel<Depot> {
- private static final long serialVersionUID = 1L;
-
- public DepotModel(Depot entity) {
- super(entity);
- }
-
-}
+package com.gitplex.web.model;
+
+import com.gitplex.core.entity.Depot;
+
+/** Shortcut for {@link EntityModel}<Repository> */
+public class DepotModel extends EntityModel<Depot> {
+ private static final long serialVersionUID = 1L;
+
+ public DepotModel(Depot entity) {
+ super(entity);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/EntityModel.java b/gitplex.web/src/main/java/com/gitplex/web/model/EntityModel.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/model/EntityModel.java
rename to gitplex.web/src/main/java/com/gitplex/web/model/EntityModel.java
index c88f0cd5d3..051c1337c8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/EntityModel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/model/EntityModel.java
@@ -1,54 +1,54 @@
-package com.pmease.gitplex.web.model;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.loader.AppLoader;
-import com.pmease.commons.util.ClassUtils;
-
-public class EntityModel<T extends AbstractEntity> extends LoadableDetachableModel<T> {
-
- private static final long serialVersionUID = 1L;
-
- private Class<T> entityClass;
-
- private Long entityId;
-
- private T entity;
-
- public EntityModel(@Nullable T entity) {
- setObject(entity);
- }
-
- @Override
- protected T load() {
- if (entityClass != null && entityId != null) {
- return AppLoader.getInstance(Dao.class).load(entityClass, entityId);
- } else {
- return entity;
- }
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public void setObject(@Nullable T object) {
- super.setObject(object);
-
- if (object != null) {
- entityClass = (Class<T>) ClassUtils.unproxy(object.getClass());
- entityId = object.getId();
- } else {
- entityClass = null;
- entityId = null;
- }
-
- if (entityId == null)
- entity = object;
- else
- entity = null;
- }
-
-}
+package com.gitplex.web.model;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.commons.loader.AppLoader;
+import com.gitplex.commons.util.ClassUtils;
+
+public class EntityModel<T extends AbstractEntity> extends LoadableDetachableModel<T> {
+
+ private static final long serialVersionUID = 1L;
+
+ private Class<T> entityClass;
+
+ private Long entityId;
+
+ private T entity;
+
+ public EntityModel(@Nullable T entity) {
+ setObject(entity);
+ }
+
+ @Override
+ protected T load() {
+ if (entityClass != null && entityId != null) {
+ return AppLoader.getInstance(Dao.class).load(entityClass, entityId);
+ } else {
+ return entity;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void setObject(@Nullable T object) {
+ super.setObject(object);
+
+ if (object != null) {
+ entityClass = (Class<T>) ClassUtils.unproxy(object.getClass());
+ entityId = object.getId();
+ } else {
+ entityClass = null;
+ entityId = null;
+ }
+
+ if (entityId == null)
+ entity = object;
+ else
+ entity = null;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/ReviewersModel.java b/gitplex.web/src/main/java/com/gitplex/web/model/ReviewersModel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/model/ReviewersModel.java
rename to gitplex.web/src/main/java/com/gitplex/web/model/ReviewersModel.java
index df121d5ba9..bc84ef6083 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/ReviewersModel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/model/ReviewersModel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.model;
+package com.gitplex.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.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
+import com.gitplex.core.entity.PullRequest;
+import com.gitplex.core.entity.PullRequestReviewInvitation;
@SuppressWarnings("serial")
public class ReviewersModel extends LoadableDetachableModel<List<PullRequestReviewInvitation>>{
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/UserModel.java b/gitplex.web/src/main/java/com/gitplex/web/model/UserModel.java
similarity index 63%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/model/UserModel.java
rename to gitplex.web/src/main/java/com/gitplex/web/model/UserModel.java
index 82427cc36e..a906cd617f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/model/UserModel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/model/UserModel.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.model;
-
-import com.pmease.gitplex.core.entity.Account;
-
-public class UserModel extends EntityModel<Account> {
-
- private static final long serialVersionUID = 1L;
-
- public UserModel(Account entity) {
- super(entity);
- }
-
-}
+package com.gitplex.web.model;
+
+import com.gitplex.core.entity.Account;
+
+public class UserModel extends EntityModel<Account> {
+
+ private static final long serialVersionUID = 1L;
+
+ public UserModel(Account entity) {
+ super(entity);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountLayoutPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountLayoutPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountLayoutPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.java
similarity index 69%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountLayoutPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.java
index 4b5a2a4068..dd04269ea6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountLayoutPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountLayoutPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account;
+package com.gitplex.web.page.account;
import java.util.ArrayList;
import java.util.List;
@@ -9,24 +9,24 @@ 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.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorPage;
-import com.pmease.gitplex.web.page.account.members.MemberListPage;
-import com.pmease.gitplex.web.page.account.members.MemberPage;
-import com.pmease.gitplex.web.page.account.members.NewMembersPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.account.overview.NewDepotPage;
-import com.pmease.gitplex.web.page.account.overview.NewOrganizationPage;
-import com.pmease.gitplex.web.page.account.setting.AvatarEditPage;
-import com.pmease.gitplex.web.page.account.setting.PasswordEditPage;
-import com.pmease.gitplex.web.page.account.setting.ProfileEditPage;
-import com.pmease.gitplex.web.page.account.tasks.TaskListPage;
-import com.pmease.gitplex.web.page.account.teams.TeamListPage;
-import com.pmease.gitplex.web.page.account.teams.TeamPage;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountPage.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountPage.java
index 7de1df29cc..2e4df867b3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountPage.java
@@ -1,65 +1,65 @@
-package com.pmease.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.google.common.base.Preconditions;
-import com.google.common.base.Strings;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.model.UserModel;
-import com.pmease.gitplex.web.page.layout.LayoutPage;
-
-@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.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());
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountResourceReference.java
index 5e27e8f870..99ca221b07 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account;
+package com.gitplex.web.page.account;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTab.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTab.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTab.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTab.java
index 128d8bf92b..8b1f0910de 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTab.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTab.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.page.account;
+package com.gitplex.web.page.account;
import org.apache.wicket.Component;
import org.apache.wicket.model.Model;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
+import com.gitplex.commons.wicket.component.tabbable.PageTab;
@SuppressWarnings("serial")
public class AccountTab extends PageTab {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTabLink.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTabLink.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTabLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.java
similarity index 95%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTabLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.java
index 9941bf4dff..12405fb5fd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/AccountTabLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/AccountTabLink.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account;
+package com.gitplex.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/pmease/gitplex/web/page/account/account.css b/gitplex.web/src/main/java/com/gitplex/web/page/account/account.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/account.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/account.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java
index 6a18ba1f9a..1df7231c23 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/AccountCollaboratorListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.collaborators;
+package com.gitplex.web.page.account.collaborators;
import java.util.ArrayList;
import java.util.Collections;
@@ -18,16 +18,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java
index 1fc665a22b..d3a75f5851 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorDepotListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.collaborators;
+package com.gitplex.web.page.account.collaborators;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,23 +25,23 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;
-import com.pmease.gitplex.web.component.depotchoice.DepotChoiceResourceReference;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
index 5b4e15a3a1..ee47079dff 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorEffectivePrivilegePage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.collaborators;
+package com.gitplex.web.page.account.collaborators;
import java.util.ArrayList;
import java.util.List;
@@ -18,16 +18,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.java
index 5c351b5877..8f41c86658 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPage.java
@@ -1,123 +1,123 @@
-package com.pmease.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.google.common.base.Preconditions;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.PageTabLink;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.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));
- }
-
-}
+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));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
index 3b2bf904f9..a979c06574 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/collaborators/CollaboratorPrivilegeSourcePage.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web.page.account.collaborators;
+package com.gitplex.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.google.common.base.Preconditions;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.component.privilegesource.PrivilegeSourcePanel;
@SuppressWarnings("serial")
public class CollaboratorPrivilegeSourcePage extends CollaboratorPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberEffectivePrivilegePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberEffectivePrivilegePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java
index d16c248c45..a6eb9fe914 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberEffectivePrivilegePage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.members;
+package com.gitplex.web.page.account.members;
import java.util.ArrayList;
import java.util.List;
@@ -18,16 +18,16 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java
index df860e364d..5d79a2ac27 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberListPage.java
@@ -1,7 +1,7 @@
-package com.pmease.gitplex.web.page.account.members;
+package com.gitplex.web.page.account.members;
-import static com.pmease.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;
-import static com.pmease.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_MEMBER;
+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;
@@ -25,22 +25,22 @@ 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.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.component.roleselection.RoleSelectionPanel;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.collaborators.AccountCollaboratorListPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.account.setting.ProfileEditPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.java
index d6f6c17a5f..690b7222db 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPage.java
@@ -1,214 +1,214 @@
-package com.pmease.gitplex.web.page.account.members;
-
-import static com.pmease.gitplex.web.component.roleselection.RoleSelectionPanel.ROLE_ADMIN;
-import static com.pmease.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.google.common.base.Preconditions;
-import com.pmease.commons.wicket.ConfirmOnClick;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.PageTabLink;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.roleselection.RoleSelectionPanel;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.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));
- }
-
-}
+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));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPrivilegeSourcePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPrivilegeSourcePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java
index 85f42a9cd6..f46509d773 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberPrivilegeSourcePage.java
@@ -1,18 +1,18 @@
-package com.pmease.gitplex.web.page.account.members;
+package com.gitplex.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.google.common.base.Preconditions;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.privilegesource.PrivilegeSourcePanel;
@SuppressWarnings("serial")
public class MemberPrivilegeSourcePage extends MemberPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberTeamListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberTeamListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberTeamListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberTeamListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.java
index e09ce526bf..6dc5ad696e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/MemberTeamListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/MemberTeamListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.members;
+package com.gitplex.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.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.teamchoice.TeamChoiceResourceReference;
-import com.pmease.gitplex.web.page.account.teams.TeamMemberListPage;
+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;
@SuppressWarnings("serial")
public class MemberTeamListPage extends MemberPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NewMembersPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NewMembersPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NewMembersPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NewMembersPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.java
index 104414a407..a09766db9a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NewMembersPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NewMembersPage.java
@@ -1,168 +1,168 @@
-package com.pmease.gitplex.web.page.account.members;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.RadioChoice;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.base.Preconditions;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.teamchoice.TeamChoiceProvider;
-import com.pmease.gitplex.web.component.teamchoice.TeamMultiChoice;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-
-@SuppressWarnings("serial")
-public class NewMembersPage extends AccountLayoutPage {
-
- private static final String USERS_ID = "users";
-
- private static final List<String> ROLES =
- Arrays.asList("Add as ordinary members", "Add as organization administrators");
-
- private Collection<Account> users;
-
- private String role = ROLES.get(0);
-
- private Collection<Team> teams;
-
- public NewMembersPage(PageParameters params) {
- super(params);
-
- Preconditions.checkState(getAccount().isOrganization());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
-
- Collection<OrganizationMembership> organizationMemberships = new ArrayList<>();
- Collection<TeamMembership> teamMemberships = new ArrayList<>();
- for (Account user: users) {
- OrganizationMembership organizationMembership = new OrganizationMembership();
- organizationMembership.setUser(user);
- organizationMembership.setOrganization(getAccount());
- organizationMembership.setAdmin(!role.equals(ROLES.get(0)));
- organizationMemberships.add(organizationMembership);
- for (Team team: teams) {
- TeamMembership teamMembership = new TeamMembership();
- teamMembership.setUser(user);
- teamMembership.setTeam(team);
- teamMemberships.add(teamMembership);
- }
- }
-
- GitPlex.getInstance(OrganizationMembershipManager.class).save(organizationMemberships, teamMemberships);
- setResponsePage(MemberListPage.class, MemberListPage.paramsOf(getAccount()));
- }
-
- };
- add(form);
-
- WebMarkupContainer usersContainer = new WebMarkupContainer(USERS_ID);
- usersContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- if (usersContainer.get(USERS_ID).hasErrorMessage())
- return "has-error";
- else
- return "";
- }
-
- }));
- form.add(usersContainer);
-
- usersContainer.add(new NonMemberChoices(USERS_ID, accountModel, new IModel<Collection<Account>>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Collection<Account> getObject() {
- return users;
- }
-
- @Override
- public void setObject(Collection<Account> object) {
- users = object;
- }
-
- }).setRequired(true));
-
- usersContainer.add(new FencedFeedbackPanel("feedback", usersContainer));
-
- form.add(new RadioChoice<String>("role", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return role;
- }
-
- @Override
- public void setObject(String object) {
- role = object;
- }
-
- }, ROLES));
-
- form.add(new TeamMultiChoice("teams", new IModel<Collection<Team>>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Collection<Team> getObject() {
- return teams;
- }
-
- @Override
- public void setObject(Collection<Team> object) {
- teams = object;
- }
-
- }, new TeamChoiceProvider(accountModel)));
- }
-
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.canManage(getAccount());
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Account account) {
- if (account.isOrganization())
- setResponsePage(MemberListPage.class, paramsOf(account));
- else
- setResponsePage(AccountOverviewPage.class, paramsOf(account));
- }
-
-}
+package com.gitplex.web.page.account.members;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.RadioChoice;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.gitplex.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.google.common.base.Preconditions;
+
+@SuppressWarnings("serial")
+public class NewMembersPage extends AccountLayoutPage {
+
+ private static final String USERS_ID = "users";
+
+ private static final List<String> ROLES =
+ Arrays.asList("Add as ordinary members", "Add as organization administrators");
+
+ private Collection<Account> users;
+
+ private String role = ROLES.get(0);
+
+ private Collection<Team> teams;
+
+ public NewMembersPage(PageParameters params) {
+ super(params);
+
+ Preconditions.checkState(getAccount().isOrganization());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ Collection<OrganizationMembership> organizationMemberships = new ArrayList<>();
+ Collection<TeamMembership> teamMemberships = new ArrayList<>();
+ for (Account user: users) {
+ OrganizationMembership organizationMembership = new OrganizationMembership();
+ organizationMembership.setUser(user);
+ organizationMembership.setOrganization(getAccount());
+ organizationMembership.setAdmin(!role.equals(ROLES.get(0)));
+ organizationMemberships.add(organizationMembership);
+ for (Team team: teams) {
+ TeamMembership teamMembership = new TeamMembership();
+ teamMembership.setUser(user);
+ teamMembership.setTeam(team);
+ teamMemberships.add(teamMembership);
+ }
+ }
+
+ GitPlex.getInstance(OrganizationMembershipManager.class).save(organizationMemberships, teamMemberships);
+ setResponsePage(MemberListPage.class, MemberListPage.paramsOf(getAccount()));
+ }
+
+ };
+ add(form);
+
+ WebMarkupContainer usersContainer = new WebMarkupContainer(USERS_ID);
+ usersContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ if (usersContainer.get(USERS_ID).hasErrorMessage())
+ return "has-error";
+ else
+ return "";
+ }
+
+ }));
+ form.add(usersContainer);
+
+ usersContainer.add(new NonMemberChoices(USERS_ID, accountModel, new IModel<Collection<Account>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<Account> getObject() {
+ return users;
+ }
+
+ @Override
+ public void setObject(Collection<Account> object) {
+ users = object;
+ }
+
+ }).setRequired(true));
+
+ usersContainer.add(new FencedFeedbackPanel("feedback", usersContainer));
+
+ form.add(new RadioChoice<String>("role", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return role;
+ }
+
+ @Override
+ public void setObject(String object) {
+ role = object;
+ }
+
+ }, ROLES));
+
+ form.add(new TeamMultiChoice("teams", new IModel<Collection<Team>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<Team> getObject() {
+ return teams;
+ }
+
+ @Override
+ public void setObject(Collection<Team> object) {
+ teams = object;
+ }
+
+ }, new TeamChoiceProvider(accountModel)));
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canManage(getAccount());
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Account account) {
+ if (account.isOrganization())
+ setResponsePage(MemberListPage.class, paramsOf(account));
+ else
+ setResponsePage(AccountOverviewPage.class, paramsOf(account));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NonMemberChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoiceProvider.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NonMemberChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoiceProvider.java
index d509da769c..62d4022aaf 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NonMemberChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoiceProvider.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.members;
+package com.gitplex.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.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceProvider;
+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;
public class NonMemberChoiceProvider extends AccountChoiceProvider {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NonMemberChoices.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoices.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NonMemberChoices.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoices.java
index a7d44ceb43..6b5ae8148c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/members/NonMemberChoices.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/members/NonMemberChoices.java
@@ -1,38 +1,38 @@
-package com.pmease.gitplex.web.page.account.members;
-
-import java.util.Collection;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.wicket.component.select2.Select2MultiChoice;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
-
-public class NonMemberChoices extends Select2MultiChoice<Account> {
-
- private static final long serialVersionUID = 1L;
-
- public NonMemberChoices(String id, IModel<Account> organizationModel,
- IModel<Collection<Account>> nonMembersModel) {
- super(id, nonMembersModel, new NonMemberChoiceProvider(organizationModel));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- getSettings().setPlaceholder("Choose new members...");
- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");
- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");
- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));
- }
-
-}
+package com.gitplex.web.page.account.members;
+
+import java.util.Collection;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
+
+import com.gitplex.core.entity.Account;
+import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
+
+public class NonMemberChoices extends Select2MultiChoice<Account> {
+
+ private static final long serialVersionUID = 1L;
+
+ public NonMemberChoices(String id, IModel<Account> organizationModel,
+ IModel<Collection<Account>> nonMembersModel) {
+ super(id, nonMembersModel, new NonMemberChoiceProvider(organizationModel));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("Choose new members...");
+ getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/AccountOverviewPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/AccountOverviewPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/AccountOverviewPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/AccountOverviewPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.java
index 2507ef210c..0538458a6d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/AccountOverviewPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/AccountOverviewPage.java
@@ -1,31 +1,31 @@
-package com.pmease.gitplex.web.page.account.overview;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-
-@SuppressWarnings("serial")
-public class AccountOverviewPage extends AccountLayoutPage {
-
- public AccountOverviewPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- if (getAccount().isOrganization())
- add(new OrganizationOverviewPanel("content", accountModel));
- else
- add(new UserOverviewPanel("content", accountModel));
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Account account) {
- setResponsePage(AccountOverviewPage.class, paramsOf(account));
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class AccountOverviewPage extends AccountLayoutPage {
+
+ public AccountOverviewPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (getAccount().isOrganization())
+ add(new OrganizationOverviewPanel("content", accountModel));
+ else
+ add(new UserOverviewPanel("content", accountModel));
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Account account) {
+ setResponsePage(AccountOverviewPage.class, paramsOf(account));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/DepotListPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/DepotListPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/DepotListPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/DepotListPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java
index d67183d50c..30b1f7c90e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/DepotListPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/DepotListPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.overview;
+package com.gitplex.web.page.account.overview;
import java.util.ArrayList;
import java.util.Collections;
@@ -18,15 +18,15 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.setting.general.GeneralSettingPage;
+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.web.page.depot.setting.general.GeneralSettingPage;
+import com.gitplex.commons.wicket.behavior.OnTypingDoneBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewDepotPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewDepotPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewDepotPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.java
similarity index 72%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewDepotPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.java
index 051f96ea8e..d578a9e760 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewDepotPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewDepotPage.java
@@ -1,20 +1,20 @@
-package com.pmease.gitplex.web.page.account.overview;
+package com.gitplex.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.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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;
@SuppressWarnings("serial")
public class NewDepotPage extends AccountLayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewOrganizationPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewOrganizationPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewOrganizationPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewOrganizationPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.java
index 0c1d00197f..23a88889e7 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/NewOrganizationPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/NewOrganizationPage.java
@@ -1,20 +1,20 @@
-package com.pmease.gitplex.web.page.account.overview;
+package com.gitplex.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.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
+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;
@SuppressWarnings("serial")
public class NewOrganizationPage extends AccountLayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/OrganizationOverviewPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/OrganizationOverviewPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/OrganizationOverviewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/OrganizationOverviewPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.java
index 7594e1733d..31b1216dab 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/OrganizationOverviewPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/OrganizationOverviewPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.overview;
+package com.gitplex.web.page.account.overview;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
@@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.gitplex.core.entity.Account;
+import com.gitplex.core.entity.Account;
+import com.gitplex.commons.wicket.component.markdown.MarkdownPanel;
@SuppressWarnings("serial")
public class OrganizationOverviewPanel extends GenericPanel<Account> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/UserOverviewPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/UserOverviewPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/UserOverviewPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/UserOverviewPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.java
index c4a0e139c4..d06f837829 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/overview/UserOverviewPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/overview/UserOverviewPanel.java
@@ -1,105 +1,105 @@
-package com.pmease.gitplex.web.page.account.overview;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.stream.Collectors;
-
-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.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
-
-@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())));
-
- IModel<List<Account>> organizationsModel = new LoadableDetachableModel<List<Account>>() {
-
- @Override
- protected List<Account> load() {
- List<Account> organizations = getUser().getOrganizations()
- .stream()
- // we do not want to disclose organization membership information
- .filter((membership)->membership.isAdmin() || SecurityUtils.canManage(getUser()))
- .map((membership)->membership.getOrganization())
- .collect(Collectors.toList());
- Collections.sort(organizations);
- return organizations;
- }
-
- };
- add(new WebMarkupContainer("organizations") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new ListView<Account>("organizations", organizationsModel) {
-
- @Override
- protected void populateItem(ListItem<Account> item) {
- item.add(new AvatarLink("organization", item.getModelObject(), new TooltipConfig()));
- }
-
- });
-
- add(new BookmarkablePageLink<Void>("addOrganization",
- NewOrganizationPage.class, NewOrganizationPage.paramsOf(getUser())) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canManage(user));
- }
-
- });
-
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(SecurityUtils.canManage(user) || !organizationsModel.getObject().isEmpty());
- }
-
- });
-
- add(new DepotListPanel("depots", getModel()));
- }
-
-}
+package com.gitplex.web.page.account.overview;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+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.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import com.gitplex.core.entity.Account;
+import com.gitplex.core.security.SecurityUtils;
+import com.gitplex.web.component.avatar.AvatarLink;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
+
+@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())));
+
+ IModel<List<Account>> organizationsModel = new LoadableDetachableModel<List<Account>>() {
+
+ @Override
+ protected List<Account> load() {
+ List<Account> organizations = getUser().getOrganizations()
+ .stream()
+ // we do not want to disclose organization membership information
+ .filter((membership)->membership.isAdmin() || SecurityUtils.canManage(getUser()))
+ .map((membership)->membership.getOrganization())
+ .collect(Collectors.toList());
+ Collections.sort(organizations);
+ return organizations;
+ }
+
+ };
+ add(new WebMarkupContainer("organizations") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ListView<Account>("organizations", organizationsModel) {
+
+ @Override
+ protected void populateItem(ListItem<Account> item) {
+ item.add(new AvatarLink("organization", item.getModelObject(), new TooltipConfig()));
+ }
+
+ });
+
+ add(new BookmarkablePageLink<Void>("addOrganization",
+ NewOrganizationPage.class, NewOrganizationPage.paramsOf(getUser())) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canManage(user));
+ }
+
+ });
+
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canManage(user) || !organizationsModel.getObject().isEmpty());
+ }
+
+ });
+
+ add(new DepotListPanel("depots", getModel()));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AccountSettingPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AccountSettingPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AccountSettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.java
similarity index 70%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AccountSettingPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.java
index 7d284134ac..727feed9b6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AccountSettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AccountSettingPage.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.web.page.account.setting;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.AccountTab;
+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;
@SuppressWarnings("serial")
public abstract class AccountSettingPage extends AccountLayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.java
index d2590afe6e..4635110b35 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.web.page.account.setting;
import java.util.Map;
@@ -17,11 +17,11 @@ 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.pmease.commons.util.FileUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.avatar.AvatarManager;
-import com.pmease.gitplex.web.component.avatar.AvatarChanged;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditResourceReference.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditResourceReference.java
index 50b50eec27..cfa0d72567 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/AvatarEditResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/AvatarEditResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.web.page.account.setting;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/OldPassword.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPassword.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/OldPassword.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPassword.java
index 9000c453e2..fa5d097031 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/OldPassword.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPassword.java
@@ -1,11 +1,11 @@
/*
- * Copyright PMEase Inc.,
+ * Copyright GitPlex Inc.,
* Date: 2008-2-28
* All rights reserved.
*
* Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $
*/
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.web.page.account.setting;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/OldPasswordValidator.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPasswordValidator.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/OldPasswordValidator.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPasswordValidator.java
index 26dc9b2453..4cb8bdd12c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/OldPasswordValidator.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/OldPasswordValidator.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.web.page.account.setting;
import javax.validation.ConstraintValidator;
import javax.validation.ConstraintValidatorContext;
import org.apache.shiro.authc.credential.PasswordService;
-import com.pmease.commons.loader.AppLoader;
-import com.pmease.commons.wicket.WicketUtils;
-import com.pmease.gitplex.web.page.account.AccountPage;
+import com.gitplex.web.page.account.AccountPage;
+import com.gitplex.commons.loader.AppLoader;
+import com.gitplex.commons.wicket.WicketUtils;
public class OldPasswordValidator implements ConstraintValidator<OldPassword, String> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditBean.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditBean.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditBean.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditBean.java
index 1fab506a9e..f0b50f738d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditBean.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditBean.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.web.page.account.setting;
import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.commons.wicket.editable.annotation.Password;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
+import com.gitplex.commons.wicket.editable.annotation.Password;
@Editable
public class PasswordEditBean implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.java
index 21759419e2..4d0b114a33 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/PasswordEditPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/PasswordEditPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.setting;
+package com.gitplex.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.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.commons.wicket.editable.BeanContext;
@SuppressWarnings("serial")
public class PasswordEditPage extends AccountSettingPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/ProfileEditPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/ProfileEditPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/ProfileEditPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/ProfileEditPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.java
index 2b65016115..36894ee0f5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/ProfileEditPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/ProfileEditPage.java
@@ -1,130 +1,130 @@
-package com.pmease.gitplex.web.page.account.setting;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.component.confirmdelete.ConfirmDeleteAccountModal;
-import com.pmease.gitplex.web.page.account.AccountPage;
-
-@SuppressWarnings("serial")
-public class ProfileEditPage extends AccountSettingPage {
-
- private String oldName;
-
- private BeanEditor<?> editor;
-
- public ProfileEditPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Set<String> excludedProperties = new HashSet<>();
- excludedProperties.add("password");
- if (getAccount().isOrganization()) {
- excludedProperties.add("email");
- } else {
- excludedProperties.add("description");
- excludedProperties.add("defaultPrivilege");
- }
- editor = BeanContext.editModel("editor", new IModel<Serializable>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Serializable getObject() {
- return getAccount();
- }
-
- @Override
- public void setObject(Serializable object) {
- // check contract of AccountManager.save on why we assign oldName here
- oldName = getAccount().getName();
- editor.getBeanDescriptor().copyProperties(object, getAccount());
- }
-
- }, excludedProperties);
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
-
- Account account = getAccount();
- AccountManager accountManager = GitPlex.getInstance(AccountManager.class);
- Account accountWithSameName = accountManager.findByName(account.getName());
- if (accountWithSameName != null && !accountWithSameName.equals(account)) {
- editor.getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another account.");
- }
- Account accountWithSameEmail = accountManager.findByEmail(account.getEmail());
- if (accountWithSameEmail != null && !accountWithSameEmail.equals(account)) {
- editor.getErrorContext(new PathSegment.Property("email"))
- .addError("This email has already been used by another account.");
- }
- if (!editor.hasErrors(true)) {
- accountManager.save(account, oldName);
- Session.get().success("Profile has been updated");
- setResponsePage(ProfileEditPage.class, AccountPage.paramsOf(account));
- }
- }
-
- };
- form.add(editor);
-
- form.add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(!getAccount().isAdministrator());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new ConfirmDeleteAccountModal(target) {
-
- @Override
- protected void onDeleted(AjaxRequestTarget target) {
- setResponsePage(getApplication().getHomePage());
- }
-
- @Override
- protected Account getAccount() {
- return ProfileEditPage.this.getAccount();
- }
-
- };
- }
-
- });
-
- add(form);
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Account account) {
- setResponsePage(ProfileEditPage.class, paramsOf(account));
- }
-
-}
+package com.gitplex.web.page.account.setting;
+
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class ProfileEditPage extends AccountSettingPage {
+
+ private String oldName;
+
+ private BeanEditor<?> editor;
+
+ public ProfileEditPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Set<String> excludedProperties = new HashSet<>();
+ excludedProperties.add("password");
+ if (getAccount().isOrganization()) {
+ excludedProperties.add("email");
+ } else {
+ excludedProperties.add("description");
+ excludedProperties.add("defaultPrivilege");
+ }
+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Serializable getObject() {
+ return getAccount();
+ }
+
+ @Override
+ public void setObject(Serializable object) {
+ // check contract of AccountManager.save on why we assign oldName here
+ oldName = getAccount().getName();
+ editor.getBeanDescriptor().copyProperties(object, getAccount());
+ }
+
+ }, excludedProperties);
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ Account account = getAccount();
+ AccountManager accountManager = GitPlex.getInstance(AccountManager.class);
+ Account accountWithSameName = accountManager.findByName(account.getName());
+ if (accountWithSameName != null && !accountWithSameName.equals(account)) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another account.");
+ }
+ Account accountWithSameEmail = accountManager.findByEmail(account.getEmail());
+ if (accountWithSameEmail != null && !accountWithSameEmail.equals(account)) {
+ editor.getErrorContext(new PathSegment.Property("email"))
+ .addError("This email has already been used by another account.");
+ }
+ if (!editor.hasErrors(true)) {
+ accountManager.save(account, oldName);
+ Session.get().success("Profile has been updated");
+ setResponsePage(ProfileEditPage.class, AccountPage.paramsOf(account));
+ }
+ }
+
+ };
+ form.add(editor);
+
+ form.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(!getAccount().isAdministrator());
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new ConfirmDeleteAccountModal(target) {
+
+ @Override
+ protected void onDeleted(AjaxRequestTarget target) {
+ setResponsePage(getApplication().getHomePage());
+ }
+
+ @Override
+ protected Account getAccount() {
+ return ProfileEditPage.this.getAccount();
+ }
+
+ };
+ }
+
+ });
+
+ add(form);
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Account account) {
+ setResponsePage(ProfileEditPage.class, paramsOf(account));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/avatar-edit.css b/gitplex.web/src/main/java/com/gitplex/web/page/account/setting/avatar-edit.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/setting/avatar-edit.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/setting/avatar-edit.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/tasks/TaskListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/tasks/TaskListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/tasks/TaskListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/tasks/TaskListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.java
index aa8ead0749..cd1ac06e1d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/tasks/TaskListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/tasks/TaskListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.tasks;
+package com.gitplex.web.page.account.tasks;
import java.util.ArrayList;
import java.util.List;
@@ -21,23 +21,23 @@ 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.pmease.commons.hibernate.AbstractEntity;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.wicket.component.datatable.DefaultDataTable;
-import com.pmease.commons.wicket.component.datatable.EntityDataProvider;
-import com.pmease.commons.wicket.component.datatable.SelectionColumn;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequestTask;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.BranchLink;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.util.DateUtils;
+import com.gitplex.commons.hibernate.AbstractEntity;
+import com.gitplex.commons.hibernate.dao.Dao;
+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;
@SuppressWarnings("serial")
public class TaskListPage extends AccountLayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/MemberChoiceProvider.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoiceProvider.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/MemberChoiceProvider.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoiceProvider.java
index 1c579c41e2..5be9a6b767 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/MemberChoiceProvider.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoiceProvider.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web.page.account.teams;
+package com.gitplex.web.page.account.teams;
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceProvider;
+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;
public class MemberChoiceProvider extends AccountChoiceProvider {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/MemberChoices.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoices.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/MemberChoices.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoices.java
index d1677c5412..f1e00985c0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/MemberChoices.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/MemberChoices.java
@@ -1,37 +1,37 @@
-package com.pmease.gitplex.web.page.account.teams;
-
-import java.util.Collection;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.wicket.component.select2.Select2MultiChoice;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
-
-public class MemberChoices extends Select2MultiChoice<Account> {
-
- private static final long serialVersionUID = 1L;
-
- public MemberChoices(String id, IModel<Account> organizationModel, IModel<Collection<Account>> membersModel) {
- super(id, membersModel, new MemberChoiceProvider(organizationModel));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- getSettings().setPlaceholder("Choose team members...");
- getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");
- getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");
- getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));
- }
-
-}
+package com.gitplex.web.page.account.teams;
+
+import java.util.Collection;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.model.IModel;
+
+import com.gitplex.core.entity.Account;
+import com.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
+import com.gitplex.commons.wicket.component.select2.Select2MultiChoice;
+
+public class MemberChoices extends Select2MultiChoice<Account> {
+
+ private static final long serialVersionUID = 1L;
+
+ public MemberChoices(String id, IModel<Account> organizationModel, IModel<Collection<Account>> membersModel) {
+ super(id, membersModel, new MemberChoiceProvider(organizationModel));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("Choose team members...");
+ getSettings().setFormatResult("gitplex.accountChoiceFormatter.formatResult");
+ getSettings().setFormatSelection("gitplex.accountChoiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("gitplex.accountChoiceFormatter.escapeMarkup");
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new AccountChoiceResourceReference()));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/NewTeamPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/NewTeamPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/NewTeamPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/NewTeamPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.java
index 0199ffc310..0acc8ea11b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/NewTeamPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/NewTeamPage.java
@@ -1,74 +1,74 @@
-package com.pmease.gitplex.web.page.account.teams;
-
-import java.io.Serializable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-
-@SuppressWarnings("serial")
-public class NewTeamPage extends AccountLayoutPage {
-
- public NewTeamPage(PageParameters params) {
- super(params);
-
- Preconditions.checkState(getAccount().isOrganization());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Team team = new Team();
-
- BeanEditor<Serializable> editor = BeanContext.editBean("editor", team);
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
-
- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
- Account organization = getAccount();
- team.setOrganization(organization);
- if (teamManager.find(organization, team.getName()) != null) {
- editor.getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another team in the organization");
- } else {
- GitPlex.getInstance(TeamManager.class).save(team, null);
- setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));
- }
- }
-
- };
- form.add(editor);
-
- add(form);
- }
-
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.canManage(getAccount());
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Account account) {
- if (account.isOrganization())
- setResponsePage(TeamListPage.class, paramsOf(account));
- else
- setResponsePage(AccountOverviewPage.class, paramsOf(account));
- }
-
-}
+package com.gitplex.web.page.account.teams;
+
+import java.io.Serializable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.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;
+
+@SuppressWarnings("serial")
+public class NewTeamPage extends AccountLayoutPage {
+
+ public NewTeamPage(PageParameters params) {
+ super(params);
+
+ Preconditions.checkState(getAccount().isOrganization());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Team team = new Team();
+
+ BeanEditor<Serializable> editor = BeanContext.editBean("editor", team);
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
+ Account organization = getAccount();
+ team.setOrganization(organization);
+ if (teamManager.find(organization, team.getName()) != null) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another team in the organization");
+ } else {
+ GitPlex.getInstance(TeamManager.class).save(team, null);
+ setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));
+ }
+ }
+
+ };
+ form.add(editor);
+
+ add(form);
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canManage(getAccount());
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Account account) {
+ if (account.isOrganization())
+ setResponsePage(TeamListPage.class, paramsOf(account));
+ else
+ setResponsePage(AccountOverviewPage.class, paramsOf(account));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamDepotListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamDepotListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamDepotListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamDepotListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java
index ba5ad5343c..3349ca238a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamDepotListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamDepotListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.teams;
+package com.gitplex.web.page.account.teams;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,28 +25,28 @@ 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.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.manager.TeamAuthorizationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.depotchoice.AbstractDepotChoiceProvider;
-import com.pmease.gitplex.web.component.depotchoice.DepotChoiceResourceReference;
-import com.pmease.gitplex.web.component.greaterprivilege.GreaterPrivilegesPanel;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamEditPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamEditPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamEditPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamEditPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.java
index 8fa7f0c352..54ed71f6ee 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamEditPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamEditPage.java
@@ -1,122 +1,122 @@
-package com.pmease.gitplex.web.page.account.teams;
-
-import java.io.Serializable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-
-@SuppressWarnings("serial")
-public class TeamEditPage extends AccountLayoutPage {
-
- private static final String PARAM_TEAM = "team";
-
- private final IModel<Team> teamModel;
-
- private BeanEditor<?> editor;
-
- private String oldName;
-
- public static PageParameters paramsOf(Team team) {
- PageParameters params = paramsOf(team.getOrganization());
- params.add(PARAM_TEAM, team.getName());
- return params;
- }
-
- public TeamEditPage(PageParameters params) {
- super(params);
-
- String teamName = params.get(PARAM_TEAM).toString();
- teamModel = new LoadableDetachableModel<Team>() {
-
- @Override
- protected Team load() {
- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
- return Preconditions.checkNotNull(teamManager.find(getAccount(), teamName));
- }
-
- };
- Preconditions.checkState(getAccount().isOrganization());
- }
-
- @Override
- protected boolean isPermitted() {
- return SecurityUtils.canManage(getAccount());
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- editor = BeanContext.editModel("editor", new IModel<Serializable>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Serializable getObject() {
- return teamModel.getObject();
- }
-
- @Override
- public void setObject(Serializable object) {
- // check contract of TeamManager.save on why we assign oldName here
- oldName = teamModel.getObject().getName();
- editor.getBeanDescriptor().copyProperties(object, teamModel.getObject());
- }
-
- });
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
-
- TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
- Team team = teamModel.getObject();
- if (!oldName.equals(team.getName()) && teamManager.find(getAccount(), team.getName()) != null) {
- editor.getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another team in the organization");
- } else {
- teamManager.save(team, oldName);
- setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));
- }
- }
-
- };
- form.add(editor);
-
- add(form);
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Account account) {
- if (account.isOrganization())
- setResponsePage(TeamListPage.class, paramsOf(account));
- else
- setResponsePage(AccountOverviewPage.class, paramsOf(account));
- }
-
- @Override
- protected void onDetach() {
- teamModel.detach();
- super.onDetach();
- }
-
-}
+package com.gitplex.web.page.account.teams;
+
+import java.io.Serializable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.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;
+
+@SuppressWarnings("serial")
+public class TeamEditPage extends AccountLayoutPage {
+
+ private static final String PARAM_TEAM = "team";
+
+ private final IModel<Team> teamModel;
+
+ private BeanEditor<?> editor;
+
+ private String oldName;
+
+ public static PageParameters paramsOf(Team team) {
+ PageParameters params = paramsOf(team.getOrganization());
+ params.add(PARAM_TEAM, team.getName());
+ return params;
+ }
+
+ public TeamEditPage(PageParameters params) {
+ super(params);
+
+ String teamName = params.get(PARAM_TEAM).toString();
+ teamModel = new LoadableDetachableModel<Team>() {
+
+ @Override
+ protected Team load() {
+ TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
+ return Preconditions.checkNotNull(teamManager.find(getAccount(), teamName));
+ }
+
+ };
+ Preconditions.checkState(getAccount().isOrganization());
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.canManage(getAccount());
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ editor = BeanContext.editModel("editor", new IModel<Serializable>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Serializable getObject() {
+ return teamModel.getObject();
+ }
+
+ @Override
+ public void setObject(Serializable object) {
+ // check contract of TeamManager.save on why we assign oldName here
+ oldName = teamModel.getObject().getName();
+ editor.getBeanDescriptor().copyProperties(object, teamModel.getObject());
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ TeamManager teamManager = GitPlex.getInstance(TeamManager.class);
+ Team team = teamModel.getObject();
+ if (!oldName.equals(team.getName()) && teamManager.find(getAccount(), team.getName()) != null) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another team in the organization");
+ } else {
+ teamManager.save(team, oldName);
+ setResponsePage(TeamMemberListPage.class, TeamMemberListPage.paramsOf(team));
+ }
+ }
+
+ };
+ form.add(editor);
+
+ add(form);
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Account account) {
+ if (account.isOrganization())
+ setResponsePage(TeamListPage.class, paramsOf(account));
+ else
+ setResponsePage(AccountOverviewPage.class, paramsOf(account));
+ }
+
+ @Override
+ protected void onDetach() {
+ teamModel.detach();
+ super.onDetach();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.java
index 0599dc12f3..c4291b1040 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.teams;
+package com.gitplex.web.page.account.teams;
import java.util.ArrayList;
import java.util.Collection;
@@ -19,18 +19,18 @@ 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.pmease.commons.wicket.ajaxlistener.ConfirmListener;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamMemberListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamMemberListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamMemberListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamMemberListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java
index a230d430b2..717db64c00 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamMemberListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamMemberListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.teams;
+package com.gitplex.web.page.account.teams;
import java.util.ArrayList;
import java.util.Collection;
@@ -24,26 +24,26 @@ 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.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.select2.ChoiceProvider;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.TeamMembership;
-import com.pmease.gitplex.core.manager.OrganizationMembershipManager;
-import com.pmease.gitplex.core.manager.TeamMembershipManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.avatar.AvatarManager;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.page.account.members.MemberListPage;
-import com.pmease.gitplex.web.page.account.members.MemberTeamListPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.java
index 51d0ab6f61..38f2b9697d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/account/teams/TeamPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/account/teams/TeamPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.account.teams;
+package com.gitplex.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.pmease.commons.wicket.ConfirmOnClick;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.PageTabLink;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.manager.TeamManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountLayoutPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
+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;
@SuppressWarnings("serial")
public abstract class TeamPage extends AccountLayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.java
index b0d6e8b796..a2c0fd7b29 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.web.page.admin;
import java.util.ArrayList;
import java.util.List;
@@ -8,12 +8,12 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.admin.account.UserListPage;
-import com.pmease.gitplex.web.page.admin.account.NewUserPage;
-import com.pmease.gitplex.web.page.layout.LayoutPage;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationResourceReference.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationResourceReference.java
index d6b0546192..db767b4d53 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.web.page.admin;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTab.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTab.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTab.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTab.java
index c653457f67..86bc02fd30 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTab.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTab.java
@@ -1,35 +1,35 @@
-package com.pmease.gitplex.web.page.admin;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.Model;
-
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-
-@SuppressWarnings("serial")
-public class AdministrationTab extends PageTab {
-
- private final String iconClass;
-
- public AdministrationTab(String title, String iconClass, Class<? extends AdministrationPage> mainPageClass) {
- super(Model.of(title), mainPageClass);
-
- this.iconClass = iconClass;
- }
-
- public AdministrationTab(String title, String iconClass, Class<? extends AdministrationPage> mainPageClass,
- Class<? extends AdministrationPage> additionalPageClass) {
- super(Model.of(title), mainPageClass, additionalPageClass);
-
- this.iconClass = iconClass;
- }
-
- @Override
- public Component render(String componentId) {
- return new AdministrationTabLink(componentId, this);
- }
-
- public String getIconClass() {
- return iconClass;
- }
-
-}
+package com.gitplex.web.page.admin;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.Model;
+
+import com.gitplex.commons.wicket.component.tabbable.PageTab;
+
+@SuppressWarnings("serial")
+public class AdministrationTab extends PageTab {
+
+ private final String iconClass;
+
+ public AdministrationTab(String title, String iconClass, Class<? extends AdministrationPage> mainPageClass) {
+ super(Model.of(title), mainPageClass);
+
+ this.iconClass = iconClass;
+ }
+
+ public AdministrationTab(String title, String iconClass, Class<? extends AdministrationPage> mainPageClass,
+ Class<? extends AdministrationPage> additionalPageClass) {
+ super(Model.of(title), mainPageClass, additionalPageClass);
+
+ this.iconClass = iconClass;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new AdministrationTabLink(componentId, this);
+ }
+
+ public String getIconClass() {
+ return iconClass;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTabLink.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTabLink.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTabLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTabLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.java
index a477a9dbc4..40e3ad5458 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/AdministrationTabLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/AdministrationTabLink.java
@@ -1,31 +1,31 @@
-package com.pmease.gitplex.web.page.admin;
-
-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.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-public class AdministrationTabLink extends Panel {
-
- private final AdministrationTab tab;
-
- public AdministrationTabLink(String id, AdministrationTab tab) {
- super(id);
-
- this.tab = tab;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Link<Void> link = new BookmarkablePageLink<Void>("link", tab.getMainPageClass());
- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));
- link.add(new Label("label", tab.getTitleModel()));
- add(link);
- }
-
-}
+package com.gitplex.web.page.admin;
+
+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.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+public class AdministrationTabLink extends Panel {
+
+ private final AdministrationTab tab;
+
+ public AdministrationTabLink(String id, AdministrationTab tab) {
+ super(id);
+
+ this.tab = tab;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Link<Void> link = new BookmarkablePageLink<Void>("link", tab.getMainPageClass());
+ link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));
+ link.add(new Label("label", tab.getTitleModel()));
+ add(link);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/BackupSettingHolder.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/BackupSettingHolder.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/BackupSettingHolder.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/BackupSettingHolder.java
index e114918d6e..58f61e04d5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/BackupSettingHolder.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/BackupSettingHolder.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.web.page.admin;
import java.io.Serializable;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.setting.BackupSetting;
+import com.gitplex.core.setting.BackupSetting;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable
public class BackupSettingHolder implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/DatabaseBackupPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/DatabaseBackupPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/DatabaseBackupPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/DatabaseBackupPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.java
index 5c3bfabd4e..b028eae346 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/DatabaseBackupPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/DatabaseBackupPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.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.pmease.commons.bootstrap.BootstrapUtils;
-import com.pmease.commons.hibernate.PersistManager;
-import com.pmease.commons.util.FileUtils;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.manager.ConfigManager;
+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;
@SuppressWarnings("serial")
public class DatabaseBackupPage extends AdministrationPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingHolder.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingHolder.java
similarity index 70%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingHolder.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingHolder.java
index a57d4fbeb0..a270ca9c98 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingHolder.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingHolder.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.web.page.admin;
import java.io.Serializable;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.setting.MailSetting;
+import com.gitplex.core.setting.MailSetting;
+import com.gitplex.commons.wicket.editable.annotation.Editable;
@Editable
public class MailSettingHolder implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java
index c78d80ad5e..6f79eee83e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/MailSettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/MailSettingPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.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.pmease.commons.wicket.behavior.testform.TestFormBehavior;
-import com.pmease.commons.wicket.behavior.testform.TestResult;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.EditorChanged;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.MailManager;
+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;
@SuppressWarnings("serial")
public class MailSettingPage extends AdministrationPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SecuritySettingPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SecuritySettingPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SecuritySettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SecuritySettingPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.java
index 3cb65998f1..67646bf348 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SecuritySettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/SecuritySettingPage.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.page.admin;
+package com.gitplex.web.page.admin;
import org.apache.wicket.markup.html.form.Form;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.setting.SecuritySetting;
+import com.gitplex.core.GitPlex;
+import com.gitplex.core.manager.ConfigManager;
+import com.gitplex.core.setting.SecuritySetting;
+import com.gitplex.commons.wicket.editable.BeanContext;
@SuppressWarnings("serial")
public class SecuritySettingPage extends AdministrationPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SystemSettingPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SystemSettingPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SystemSettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SystemSettingPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.java
index 4b3c3c398a..4cbb8cc9fe 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/SystemSettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/SystemSettingPage.java
@@ -1,36 +1,36 @@
-package com.pmease.gitplex.web.page.admin;
-
-import org.apache.wicket.markup.html.form.Form;
-
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.setting.SystemSetting;
-
-@SuppressWarnings("serial")
-public class SystemSettingPage extends AdministrationPage {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- SystemSetting systemSetting = GitPlex.getInstance(ConfigManager.class).getSystemSetting();
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- GitPlex.getInstance(ConfigManager.class).saveSystemSetting(systemSetting);
- getSession().success("System setting has been updated");
-
- setResponsePage(SystemSettingPage.class);
- }
-
- };
- form.add(BeanContext.editBean("editor", systemSetting));
-
- add(form);
- }
-
-}
+package com.gitplex.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;
+
+@SuppressWarnings("serial")
+public class SystemSettingPage extends AdministrationPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ SystemSetting systemSetting = GitPlex.getInstance(ConfigManager.class).getSystemSetting();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ GitPlex.getInstance(ConfigManager.class).saveSystemSetting(systemSetting);
+ getSession().success("System setting has been updated");
+
+ setResponsePage(SystemSettingPage.class);
+ }
+
+ };
+ form.add(BeanContext.editBean("editor", systemSetting));
+
+ add(form);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/NewUserPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/NewUserPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/NewUserPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/NewUserPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.java
index d4c087d4a1..154834964f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/NewUserPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/NewUserPage.java
@@ -1,15 +1,15 @@
-package com.pmease.gitplex.web.page.admin.account;
+package com.gitplex.web.page.admin.account;
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.Form;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.page.admin.AdministrationPage;
+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;
@SuppressWarnings("serial")
public class NewUserPage extends AdministrationPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/TypeSelectionPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/TypeSelectionPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/TypeSelectionPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/TypeSelectionPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.java
index 32f0ed8909..2d95737a61 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/TypeSelectionPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/TypeSelectionPanel.java
@@ -1,63 +1,63 @@
-package com.pmease.gitplex.web.page.admin.account;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-abstract class TypeSelectionPanel extends Panel {
-
- public static final String TYPE_USER = "User";
-
- public static final String TYPE_ORGANIZATIOIN = "Organization";
-
- private final String currentType;
-
- public TypeSelectionPanel(String id, @Nullable String currentType) {
- super(id);
-
- this.currentType = currentType;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new AjaxLink<Void>("user") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (TYPE_USER.equals(currentType))
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelectUser(target);
- }
-
- });
- add(new AjaxLink<Void>("organization") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- if (TYPE_ORGANIZATIOIN.equals(currentType))
- add(AttributeAppender.append("class", "active"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelectOrganization(target);
- }
-
- });
- }
-
- protected abstract void onSelectUser(AjaxRequestTarget target);
-
- protected abstract void onSelectOrganization(AjaxRequestTarget target);
-}
+package com.gitplex.web.page.admin.account;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+abstract class TypeSelectionPanel extends Panel {
+
+ public static final String TYPE_USER = "User";
+
+ public static final String TYPE_ORGANIZATIOIN = "Organization";
+
+ private final String currentType;
+
+ public TypeSelectionPanel(String id, @Nullable String currentType) {
+ super(id);
+
+ this.currentType = currentType;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new AjaxLink<Void>("user") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (TYPE_USER.equals(currentType))
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelectUser(target);
+ }
+
+ });
+ add(new AjaxLink<Void>("organization") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ if (TYPE_ORGANIZATIOIN.equals(currentType))
+ add(AttributeAppender.append("class", "active"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelectOrganization(target);
+ }
+
+ });
+ }
+
+ protected abstract void onSelectUser(AjaxRequestTarget target);
+
+ protected abstract void onSelectOrganization(AjaxRequestTarget target);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/UserListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/UserListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/UserListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/UserListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java
index 718c506a57..74e58bcb91 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/account/UserListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/admin/account/UserListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.admin.account;
+package com.gitplex.web.page.admin.account;
import java.util.ArrayList;
import java.util.List;
@@ -15,18 +15,18 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.confirmdelete.ConfirmDeleteAccountModal;
-import com.pmease.gitplex.web.page.account.AccountPage;
-import com.pmease.gitplex.web.page.account.setting.ProfileEditPage;
-import com.pmease.gitplex.web.page.admin.AdministrationPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/administration.css b/gitplex.web/src/main/java/com/gitplex/web/page/admin/administration.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/admin/administration.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/admin/administration.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseCssResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseCssResourceReference.java
similarity index 75%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseCssResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/BaseCssResourceReference.java
index a53aaead0f..e24ca6cb0b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseCssResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseCssResourceReference.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.web.page.base;
+package com.gitplex.web.page.base;
import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.pmease.commons.wicket.page.CommonDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.fontext.FontExtResourceReference;
+import com.gitplex.web.page.base.fontext.FontExtResourceReference;
+import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
public class BaseCssResourceReference extends CommonDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseDependentCssResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentCssResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseDependentCssResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentCssResourceReference.java
index 668df03d6c..1e3346927a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseDependentCssResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentCssResourceReference.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.page.base;
+package com.gitplex.web.page.base;
import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.pmease.commons.wicket.page.CommonDependentCssResourceReference;
+import com.gitplex.commons.wicket.page.CommonDependentCssResourceReference;
public class BaseDependentCssResourceReference extends CommonDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseDependentResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentResourceReference.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseDependentResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentResourceReference.java
index 57f0368d85..fd0214bd7d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseDependentResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseDependentResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.base;
+package com.gitplex.web.page.base;
import java.util.ArrayList;
import java.util.List;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BasePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.html
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BasePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.html
index 3eb8c6fe7e..fc6faf55d8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BasePage.html
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.html
@@ -1,14 +1,14 @@
-<wicket:head>
- <meta charset="utf-8">
- <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
- <title wicket:id="pageTitle"></title>
- <meta wicket:id="pageRefresh" http-equiv="refresh"/>
- <meta name="Author" content="PMEase Inc." />
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link rel="icon" wicket:id="favicon" type="image/x-icon"/>
- <link rel="apple-touch-icon" wicket:id="appleTouchIcon"/>
- <link rel="apple-touch-icon-precomposed" wicket:id="appleTouchIconPrecomposed"/>
-</wicket:head>
-<wicket:extend>
- <wicket:child></wicket:child>
-</wicket:extend>
+<wicket:head>
+ <meta charset="utf-8">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <title wicket:id="pageTitle"></title>
+ <meta wicket:id="pageRefresh" http-equiv="refresh"/>
+ <meta name="Author" content="GitPlex Inc." />
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <link rel="icon" wicket:id="favicon" type="image/x-icon"/>
+ <link rel="apple-touch-icon" wicket:id="appleTouchIcon"/>
+ <link rel="apple-touch-icon-precomposed" wicket:id="appleTouchIconPrecomposed"/>
+</wicket:head>
+<wicket:extend>
+ <wicket:child></wicket:child>
+</wicket:extend>
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BasePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BasePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.java
index bf57728416..0be70d8cd1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BasePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/BasePage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.base;
+package com.gitplex.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.pmease.commons.wicket.page.CommonPage;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.page.init.ServerInitPage;
-import com.pmease.gitplex.web.page.security.LoginPage;
+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;
@SuppressWarnings("serial")
public abstract class BasePage extends CommonPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/BaseResourceReference.java
index 5deb5ce5b8..7785e982ef 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/BaseResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/BaseResourceReference.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.page.base;
+package com.gitplex.web.page.base;
import java.util.List;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
-import com.pmease.commons.wicket.page.CommonDependentResourceReference;
+import com.gitplex.commons.wicket.page.CommonDependentResourceReference;
public class BaseResourceReference extends CommonDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/apple-touch-icon.png b/gitplex.web/src/main/java/com/gitplex/web/page/base/apple-touch-icon.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/apple-touch-icon.png
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/apple-touch-icon.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/base.css b/gitplex.web/src/main/java/com/gitplex/web/page/base/base.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/base.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/base.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/base.js b/gitplex.web/src/main/java/com/gitplex/web/page/base/base.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/base.js
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/base.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/favicon.ico b/gitplex.web/src/main/java/com/gitplex/web/page/base/favicon.ico
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/favicon.ico
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/favicon.ico
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/FontExtResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/FontExtResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/FontExtResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/FontExtResourceReference.java
index d55695a0bd..631978c333 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/FontExtResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/FontExtResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.base.fontext;
+package com.gitplex.web.page.base.fontext;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/cheatsheet.html b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/cheatsheet.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/cheatsheet.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/cheatsheet.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.css b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.eot b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.eot
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.eot
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.eot
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.svg b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.svg
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.svg
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.svg
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.ttf b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.ttf
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.ttf
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.ttf
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.woff b/gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.woff
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/base/fontext/fontext.woff
rename to gitplex.web/src/main/java/com/gitplex/web/page/base/fontext/fontext.woff
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.java
index 82ac0fe634..4da2e7f0f0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot;
+package com.gitplex.web.page.depot;
import java.util.ArrayList;
import java.util.HashMap;
@@ -28,31 +28,31 @@ 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.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountPage;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.depot.branches.DepotBranchesPage;
-import com.pmease.gitplex.web.page.depot.comments.DepotCommentsPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.commit.DepotCommitsPage;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.moreinfo.MoreInfoPanel;
-import com.pmease.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
-import com.pmease.gitplex.web.page.depot.setting.general.GeneralSettingPage;
-import com.pmease.gitplex.web.page.depot.tags.DepotTagsPage;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotResourceReference.java
index c030605afe..21635e234d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot;
+package com.gitplex.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.pmease.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.cookies.CookiesResourceReference;
public class DepotResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTab.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTab.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTab.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTab.java
index 67b1b0bf19..8bd6656291 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTab.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTab.java
@@ -1,91 +1,91 @@
-package com.pmease.gitplex.web.page.depot;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-
-@SuppressWarnings("serial")
-public class DepotTab extends PageTab {
-
- private final String iconClass;
-
- private final int count;
-
- public DepotTab(IModel<String> titleModel, String iconClass, int count,
- Class<? extends DepotPage> mainPageClass) {
- super(titleModel, mainPageClass);
- this.iconClass = iconClass;
- this.count = count;
- }
-
- public DepotTab(IModel<String> titleModel, String iconClass, int count,
- Class<? extends DepotPage> mainPageClass,
- Class<? extends DepotPage> additionalPageClass1) {
- super(titleModel, mainPageClass, additionalPageClass1);
- this.iconClass = iconClass;
- this.count = count;
- }
-
- public DepotTab(IModel<String> titleModel, String iconClass, int count,
- Class<? extends DepotPage> mainPageClass,
- Class<? extends DepotPage> additionalPageClass1,
- Class<? extends DepotPage> additionalPageClass2) {
- super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2);
- this.iconClass = iconClass;
- this.count = count;
- }
-
- public DepotTab(IModel<String> titleModel, String iconClass, int count,
- Class<? extends DepotPage> mainPageClass,
- Class<? extends DepotPage> additionalPageClass1,
- Class<? extends DepotPage> additionalPageClass2,
- Class<? extends DepotPage> additionalPageClass3) {
- super(titleModel, mainPageClass, additionalPageClass1,
- additionalPageClass2, additionalPageClass3);
- this.iconClass = iconClass;
- this.count = count;
- }
-
- public DepotTab(IModel<String> titleModel, String iconClass, int count,
- Class<? extends DepotPage> mainPageClass,
- Class<? extends DepotPage> additionalPageClass1,
- Class<? extends DepotPage> additionalPageClass2,
- Class<? extends DepotPage> additionalPageClass3,
- Class<? extends DepotPage> additionalPageClass4) {
- super(titleModel, mainPageClass, additionalPageClass1,
- additionalPageClass2, additionalPageClass3, additionalPageClass4);
- this.iconClass = iconClass;
- this.count = count;
- }
-
- public DepotTab(IModel<String> titleModel, String iconClass, int count,
- Class<? extends DepotPage> mainPageClass,
- Class<? extends DepotPage> additionalPageClass1,
- Class<? extends DepotPage> additionalPageClass2,
- Class<? extends DepotPage> additionalPageClass3,
- Class<? extends DepotPage> additionalPageClass4,
- Class<? extends DepotPage> additionalPageClass5) {
- super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2,
- additionalPageClass3, additionalPageClass4, additionalPageClass5);
- this.iconClass = iconClass;
- this.count = count;
- }
-
- public String getIconClass() {
- return iconClass;
- }
-
- /**
- * @return the count
- */
- public int getCount() {
- return count;
- }
-
- @Override
- public Component render(String componentId) {
- return new DepotTabLink(componentId, this);
- }
-
-}
+package com.gitplex.web.page.depot;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import com.gitplex.commons.wicket.component.tabbable.PageTab;
+
+@SuppressWarnings("serial")
+public class DepotTab extends PageTab {
+
+ private final String iconClass;
+
+ private final int count;
+
+ public DepotTab(IModel<String> titleModel, String iconClass, int count,
+ Class<? extends DepotPage> mainPageClass) {
+ super(titleModel, mainPageClass);
+ this.iconClass = iconClass;
+ this.count = count;
+ }
+
+ public DepotTab(IModel<String> titleModel, String iconClass, int count,
+ Class<? extends DepotPage> mainPageClass,
+ Class<? extends DepotPage> additionalPageClass1) {
+ super(titleModel, mainPageClass, additionalPageClass1);
+ this.iconClass = iconClass;
+ this.count = count;
+ }
+
+ public DepotTab(IModel<String> titleModel, String iconClass, int count,
+ Class<? extends DepotPage> mainPageClass,
+ Class<? extends DepotPage> additionalPageClass1,
+ Class<? extends DepotPage> additionalPageClass2) {
+ super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2);
+ this.iconClass = iconClass;
+ this.count = count;
+ }
+
+ public DepotTab(IModel<String> titleModel, String iconClass, int count,
+ Class<? extends DepotPage> mainPageClass,
+ Class<? extends DepotPage> additionalPageClass1,
+ Class<? extends DepotPage> additionalPageClass2,
+ Class<? extends DepotPage> additionalPageClass3) {
+ super(titleModel, mainPageClass, additionalPageClass1,
+ additionalPageClass2, additionalPageClass3);
+ this.iconClass = iconClass;
+ this.count = count;
+ }
+
+ public DepotTab(IModel<String> titleModel, String iconClass, int count,
+ Class<? extends DepotPage> mainPageClass,
+ Class<? extends DepotPage> additionalPageClass1,
+ Class<? extends DepotPage> additionalPageClass2,
+ Class<? extends DepotPage> additionalPageClass3,
+ Class<? extends DepotPage> additionalPageClass4) {
+ super(titleModel, mainPageClass, additionalPageClass1,
+ additionalPageClass2, additionalPageClass3, additionalPageClass4);
+ this.iconClass = iconClass;
+ this.count = count;
+ }
+
+ public DepotTab(IModel<String> titleModel, String iconClass, int count,
+ Class<? extends DepotPage> mainPageClass,
+ Class<? extends DepotPage> additionalPageClass1,
+ Class<? extends DepotPage> additionalPageClass2,
+ Class<? extends DepotPage> additionalPageClass3,
+ Class<? extends DepotPage> additionalPageClass4,
+ Class<? extends DepotPage> additionalPageClass5) {
+ super(titleModel, mainPageClass, additionalPageClass1, additionalPageClass2,
+ additionalPageClass3, additionalPageClass4, additionalPageClass5);
+ this.iconClass = iconClass;
+ this.count = count;
+ }
+
+ public String getIconClass() {
+ return iconClass;
+ }
+
+ /**
+ * @return the count
+ */
+ public int getCount() {
+ return count;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new DepotTabLink(componentId, this);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTabLink.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTabLink.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTabLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTabLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.java
index 6b891a81d6..283979b94f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/DepotTabLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/DepotTabLink.java
@@ -1,36 +1,36 @@
-package com.pmease.gitplex.web.page.depot;
-
-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.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-public class DepotTabLink extends Panel {
-
- private final DepotTab tab;
-
- public DepotTabLink(String id, DepotTab tab) {
- super(id);
-
- this.tab = tab;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- DepotPage page = (DepotPage) getPage();
- Link<Void> link = new BookmarkablePageLink<Void>("link",
- tab.getMainPageClass(), DepotPage.paramsOf(page.getDepot()));
- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));
-
- link.add(new Label("text", tab.getTitleModel()));
-
- link.add(new Label("count", tab.getCount()).setVisible(tab.getCount()!=0));
- add(link);
- }
-
-}
+package com.gitplex.web.page.depot;
+
+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.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+public class DepotTabLink extends Panel {
+
+ private final DepotTab tab;
+
+ public DepotTabLink(String id, DepotTab tab) {
+ super(id);
+
+ this.tab = tab;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ DepotPage page = (DepotPage) getPage();
+ Link<Void> link = new BookmarkablePageLink<Void>("link",
+ tab.getMainPageClass(), DepotPage.paramsOf(page.getDepot()));
+ link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));
+
+ link.add(new Label("text", tab.getTitleModel()));
+
+ link.add(new Label("count", tab.getCount()).setVisible(tab.getCount()!=0));
+ add(link);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.java
index 6b7834d0cf..31462107ee 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot;
+package com.gitplex.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.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+import com.gitplex.core.entity.Depot;
+import com.gitplex.web.page.depot.file.DepotFilePage;
@SuppressWarnings("serial")
public class NoBranchesPage extends DepotPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesResourceReference.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesResourceReference.java
index 5c4cb90452..60c79bc1c6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/NoBranchesResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/NoBranchesResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot;
+package com.gitplex.web.page.depot;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/AheadBehind.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/AheadBehind.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/AheadBehind.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/AheadBehind.java
index dd23bde49e..962806334e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/AheadBehind.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/AheadBehind.java
@@ -1,25 +1,25 @@
-package com.pmease.gitplex.web.page.depot.branches;
-
-import java.io.Serializable;
-
-@SuppressWarnings("serial")
-public class AheadBehind implements Serializable {
-
- private final int ahead;
-
- private final int behind;
-
- public AheadBehind(int ahead, int behind) {
- this.ahead = ahead;
- this.behind = behind;
- }
-
- public int getAhead() {
- return ahead;
- }
-
- public int getBehind() {
- return behind;
- }
-
-}
+package com.gitplex.web.page.depot.branches;
+
+import java.io.Serializable;
+
+@SuppressWarnings("serial")
+public class AheadBehind implements Serializable {
+
+ private final int ahead;
+
+ private final int behind;
+
+ public AheadBehind(int ahead, int behind) {
+ this.ahead = ahead;
+ this.behind = behind;
+ }
+
+ public int getAhead() {
+ return ahead;
+ }
+
+ public int getBehind() {
+ return behind;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.java
index 84e89e1de7..04fce4b65e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.branches;
+package com.gitplex.web.page.depot.branches;
import java.io.IOException;
import java.io.Serializable;
@@ -46,35 +46,35 @@ 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.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.BranchWatch;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.manager.BranchWatchManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.branchchoice.BranchChoiceProvider;
-import com.pmease.gitplex.web.component.branchchoice.BranchSingleChoice;
-import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;
-import com.pmease.gitplex.web.component.revisionpicker.RevisionPicker;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.SearchOption;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.SearchOption.Status;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.SortOption;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.git.RefInfo;
+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 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/pmease/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java
index 301254d2b3..1822f1ddc1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/DepotBranchesResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.branches;
+package com.gitplex.web.page.depot.branches;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/ajax-indicator.gif b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/ajax-indicator.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/ajax-indicator.gif
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/ajax-indicator.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/depot-branches.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/depot-branches.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/branches/depot-branches.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/branches/depot-branches.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/CodeCommentPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/CodeCommentPage.java
similarity index 70%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/CodeCommentPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/CodeCommentPage.java
index fbfcd51013..8665a607cf 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/CodeCommentPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/CodeCommentPage.java
@@ -1,17 +1,17 @@
-package com.pmease.gitplex.web.page.depot.comments;
+package com.gitplex.web.page.depot.comments;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.CodeCommentRelation;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
+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;
@SuppressWarnings("serial")
public class CodeCommentPage extends DepotPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.java
index ffcc796e97..811f734019 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.comments;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.manager.CodeCommentInfoManager;
-import com.pmease.gitplex.web.component.comment.CodeCommentAware;
-import com.pmease.gitplex.web.component.comment.CodeCommentFilter;
-import com.pmease.gitplex.web.component.comment.CodeCommentListPanel;
-import com.pmease.gitplex.web.page.depot.DepotPage;
+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;
@SuppressWarnings("serial")
public class DepotCommentsPage extends DepotPage implements CodeCommentAware {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java
index 4fb308c889..372e2a4ff2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/DepotCommentsResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.comments;
+package com.gitplex.web.page.depot.comments;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/depot-comments.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/depot-comments.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/comments/depot-comments.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/comments/depot-comments.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.java
index 5ec08e2bd8..0360323138 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailPage.java
@@ -1,544 +1,544 @@
-package com.pmease.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.google.common.base.Preconditions;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
-import com.pmease.gitplex.web.component.avatar.ContributorAvatars;
-import com.pmease.gitplex.web.component.commitmessage.CommitMessageLabel;
-import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;
-import com.pmease.gitplex.web.component.createbranch.CreateBranchLink;
-import com.pmease.gitplex.web.component.createtag.CreateTagLink;
-import com.pmease.gitplex.web.component.diff.revision.CommentSupport;
-import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.branches.DepotBranchesPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.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.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.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;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailResourceReference.java
index 30bd496f5b..e0f0d0b890 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitDetailResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitDetailResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.commit;
+package com.gitplex.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.pmease.commons.wicket.assets.oneline.OnelineResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.commons.wicket.assets.oneline.OnelineResourceReference;
public class CommitDetailResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitQuery.g4 b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitQuery.g4
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/CommitQuery.g4
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/CommitQuery.g4
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.java
index 5ae5e9238d..2e196d8965 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.commit;
+package com.gitplex.web.page.depot.commit;
import java.io.IOException;
import java.io.Serializable;
@@ -44,31 +44,33 @@ 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.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.command.RevListCommand;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.util.concurrent.PrioritizedCallable;
-import com.pmease.commons.wicket.ajaxlistener.IndicateLoadingListener;
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.DepotAndRevision;
-import com.pmease.gitplex.core.manager.WorkExecutor;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.ContributorAvatars;
-import com.pmease.gitplex.web.component.commitgraph.CommitGraphResourceReference;
-import com.pmease.gitplex.web.component.commitgraph.CommitGraphUtils;
-import com.pmease.gitplex.web.component.commitmessage.ExpandableCommitMessagePanel;
-import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;
-import com.pmease.gitplex.web.model.CommitRefsModel;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.CriteriaContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.QueryContext;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java
index 588de5f028..41b301f062 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/DepotCommitsResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.commit;
+package com.gitplex.web.page.depot.commit;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/QueryAssistBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/QueryAssistBehavior.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/QueryAssistBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/QueryAssistBehavior.java
index 8728cef800..200e264bb8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/QueryAssistBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/QueryAssistBehavior.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.commit;
+package com.gitplex.web.page.depot.commit;
import java.util.ArrayList;
import java.util.LinkedHashMap;
@@ -8,22 +8,23 @@ import java.util.Map;
import org.apache.wicket.Component;
import org.apache.wicket.model.IModel;
-import com.pmease.commons.antlr.codeassist.FenceAware;
-import com.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.antlr.codeassist.ParentedElement;
-import com.pmease.commons.antlr.grammar.ElementSpec;
-import com.pmease.commons.antlr.grammar.LexerRuleRefElementSpec;
-import com.pmease.commons.git.NameAndEmail;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.util.match.PatternApplied;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.commons.wicket.behavior.inputassist.ANTLRAssistBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.util.SuggestionUtils;
+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;
+import com.gitplex.commons.antlr.grammar.ElementSpec;
+import com.gitplex.commons.antlr.grammar.LexerRuleRefElementSpec;
+import com.gitplex.commons.git.NameAndEmail;
+import com.gitplex.commons.util.Range;
+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.web.page.depot.commit.CommitQueryParser;
@SuppressWarnings("serial")
public class QueryAssistBehavior extends ANTLRAssistBehavior {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/RevListCommandFiller.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/RevListCommandFiller.java
similarity index 66%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/RevListCommandFiller.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/RevListCommandFiller.java
index a527b6cd82..de98067c02 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/RevListCommandFiller.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/RevListCommandFiller.java
@@ -1,89 +1,90 @@
-package com.pmease.gitplex.web.page.depot.commit;
-
-import org.antlr.v4.runtime.tree.ParseTreeProperty;
-import org.antlr.v4.runtime.tree.TerminalNode;
-import org.apache.commons.lang3.StringUtils;
-import org.unbescape.java.JavaEscape;
-
-import com.pmease.commons.git.command.RevListCommand;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.AfterContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.AuthorContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.BeforeContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.CommitterContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.MessageContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.PathContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.RevisionContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.RevisionExclusionContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.RevisionRangeContext;
-import com.pmease.gitplex.web.page.depot.commit.CommitQueryParser.SingleRevisionContext;
-
-public class RevListCommandFiller extends CommitQueryBaseListener {
-
- private final RevListCommand command;
-
- private ParseTreeProperty<String> value = new ParseTreeProperty<>();
-
- public RevListCommandFiller(RevListCommand command) {
- this.command = command;
- }
-
- @Override
- public void exitSingleRevision(SingleRevisionContext ctx) {
- command.revisions().add(value.get(ctx.revision()));
- }
-
- @Override
- public void exitRevisionExclusion(RevisionExclusionContext ctx) {
- command.revisions().add("^" + value.get(ctx.revision()));
- }
-
- @Override
- public void exitRevisionRange(RevisionRangeContext ctx) {
- command.revisions().add(value.get(ctx.revision(0)) + ctx.Range().getText() + value.get(ctx.revision(1)));
- }
-
- @Override
- public void exitRevision(RevisionContext ctx) {
- value.put(ctx, getValue(ctx.Value()));
- }
-
- private String getValue(TerminalNode terminal) {
- String value = terminal.getText().substring(1);
- return value.substring(0, value.length()-1);
- }
-
- @Override
- public void exitAfter(AfterContext ctx) {
- command.after(getValue(ctx.Value()));
- }
-
- @Override
- public void exitBefore(BeforeContext ctx) {
- command.before(getValue(ctx.Value()));
- }
-
- @Override
- public void exitCommitter(CommitterContext ctx) {
- String value = JavaEscape.unescapeJava(getValue(ctx.Value()));
- value = StringUtils.replace(value, "*", ".*");
- command.committers().add(value);
- }
-
- @Override
- public void exitAuthor(AuthorContext ctx) {
- String value = JavaEscape.unescapeJava(getValue(ctx.Value()));
- value = StringUtils.replace(value, "*", ".*");
- command.authors().add(value);
- }
-
- @Override
- public void exitPath(PathContext ctx) {
- command.paths().add(getValue(ctx.Value()));
- }
-
- @Override
- public void exitMessage(MessageContext ctx) {
- command.messages().add(JavaEscape.unescapeJava(getValue(ctx.Value())));
- }
-
-}
+package com.gitplex.web.page.depot.commit;
+
+import org.antlr.v4.runtime.tree.ParseTreeProperty;
+import org.antlr.v4.runtime.tree.TerminalNode;
+import org.apache.commons.lang3.StringUtils;
+import org.unbescape.java.JavaEscape;
+
+import com.gitplex.commons.git.command.RevListCommand;
+import com.gitplex.web.page.depot.commit.CommitQueryBaseListener;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.AfterContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.AuthorContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.BeforeContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.CommitterContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.MessageContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.PathContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.RevisionContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.RevisionExclusionContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.RevisionRangeContext;
+import com.gitplex.web.page.depot.commit.CommitQueryParser.SingleRevisionContext;
+
+public class RevListCommandFiller extends CommitQueryBaseListener {
+
+ private final RevListCommand command;
+
+ private ParseTreeProperty<String> value = new ParseTreeProperty<>();
+
+ public RevListCommandFiller(RevListCommand command) {
+ this.command = command;
+ }
+
+ @Override
+ public void exitSingleRevision(SingleRevisionContext ctx) {
+ command.revisions().add(value.get(ctx.revision()));
+ }
+
+ @Override
+ public void exitRevisionExclusion(RevisionExclusionContext ctx) {
+ command.revisions().add("^" + value.get(ctx.revision()));
+ }
+
+ @Override
+ public void exitRevisionRange(RevisionRangeContext ctx) {
+ command.revisions().add(value.get(ctx.revision(0)) + ctx.Range().getText() + value.get(ctx.revision(1)));
+ }
+
+ @Override
+ public void exitRevision(RevisionContext ctx) {
+ value.put(ctx, getValue(ctx.Value()));
+ }
+
+ private String getValue(TerminalNode terminal) {
+ String value = terminal.getText().substring(1);
+ return value.substring(0, value.length()-1);
+ }
+
+ @Override
+ public void exitAfter(AfterContext ctx) {
+ command.after(getValue(ctx.Value()));
+ }
+
+ @Override
+ public void exitBefore(BeforeContext ctx) {
+ command.before(getValue(ctx.Value()));
+ }
+
+ @Override
+ public void exitCommitter(CommitterContext ctx) {
+ String value = JavaEscape.unescapeJava(getValue(ctx.Value()));
+ value = StringUtils.replace(value, "*", ".*");
+ command.committers().add(value);
+ }
+
+ @Override
+ public void exitAuthor(AuthorContext ctx) {
+ String value = JavaEscape.unescapeJava(getValue(ctx.Value()));
+ value = StringUtils.replace(value, "*", ".*");
+ command.authors().add(value);
+ }
+
+ @Override
+ public void exitPath(PathContext ctx) {
+ command.paths().add(getValue(ctx.Value()));
+ }
+
+ @Override
+ public void exitMessage(MessageContext ctx) {
+ command.messages().add(JavaEscape.unescapeJava(getValue(ctx.Value())));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.js b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/commit-detail.js
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/commit-detail.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/depot-commits.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/depot-commits.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/commit/depot-commits.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/commit/depot-commits.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionComparePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionComparePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionComparePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionComparePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.java
index b50d67c2c8..de16712fb0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionComparePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionComparePage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.compare;
+package com.gitplex.web.page.depot.compare;
import java.io.IOException;
import java.io.Serializable;
@@ -31,35 +31,35 @@ import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevWalk;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.wicket.behavior.TooltipBehavior;
-import com.pmease.commons.wicket.component.tabbable.AjaxActionTab;
-import com.pmease.commons.wicket.component.tabbable.Tab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.CompareContext;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.entity.support.DepotAndRevision;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.web.component.commitlist.CommitListPanel;
-import com.pmease.gitplex.web.component.diff.revision.CommentSupport;
-import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;
-import com.pmease.gitplex.web.component.revisionpicker.AffinalRevisionPicker;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.websocket.CodeCommentChangedRegion;
+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;
+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.commons.wicket.websocket.WebSocketManager;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
@SuppressWarnings("serial")
public class RevisionComparePage extends DepotPage implements CommentSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java
index 95428a11ea..f174fd0c27 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/RevisionCompareResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.compare;
+package com.gitplex.web.page.depot.compare;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/revision-compare.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/revision-compare.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/compare/revision-compare.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/compare/revision-compare.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/depot.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/depot.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/depot.js b/gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/depot.js
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/depot.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFilePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFilePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFilePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFilePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.java
index dfc4e666ee..99132d3d89 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFilePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFilePage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.file;
+package com.gitplex.web.page.depot.file;
import java.io.IOException;
import java.io.Serializable;
@@ -38,59 +38,59 @@ 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.google.common.base.Objects;
-import com.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.exception.GitObjectNotFoundException;
-import com.pmease.commons.hibernate.UnitOfWork;
-import com.pmease.commons.lang.diff.DiffUtils;
-import com.pmease.commons.lang.extractors.TokenPosition;
-import com.pmease.commons.loader.ListenerRegistry;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
-import com.pmease.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.TextRange;
-import com.pmease.gitplex.core.event.RefUpdated;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.search.IndexManager;
-import com.pmease.gitplex.search.SearchManager;
-import com.pmease.gitplex.search.hit.QueryHit;
-import com.pmease.gitplex.search.query.BlobQuery;
-import com.pmease.gitplex.search.query.TextQuery;
-import com.pmease.gitplex.web.WebSession;
-import com.pmease.gitplex.web.component.archivemenulink.ArchiveMenuLink;
-import com.pmease.gitplex.web.component.depotfile.blobsearch.advanced.AdvancedSearchPanel;
-import com.pmease.gitplex.web.component.depotfile.blobsearch.instant.InstantSearchPanel;
-import com.pmease.gitplex.web.component.depotfile.blobsearch.result.SearchResultPanel;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobNameChangeCallback;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewPanel;
-import com.pmease.gitplex.web.component.depotfile.blobview.source.SourceViewPanel;
-import com.pmease.gitplex.web.component.depotfile.editsave.CancelListener;
-import com.pmease.gitplex.web.component.depotfile.editsave.EditSavePanel;
-import com.pmease.gitplex.web.component.depotfile.fileedit.FileEditPanel;
-import com.pmease.gitplex.web.component.depotfile.filelist.FileListPanel;
-import com.pmease.gitplex.web.component.depotfile.filenavigator.FileNavigator;
-import com.pmease.gitplex.web.component.revisionpicker.RevisionPicker;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.commit.DepotCommitsPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.websocket.CodeCommentChangedRegion;
-import com.pmease.gitplex.web.websocket.CommitIndexedRegion;
-import com.pmease.gitplex.web.websocket.PullRequestChangedRegion;
+import com.gitplex.commons.git.Blob;
+import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.git.exception.GitObjectNotFoundException;
+import com.gitplex.commons.hibernate.UnitOfWork;
+import com.gitplex.commons.lang.diff.DiffUtils;
+import com.gitplex.commons.lang.extractors.TokenPosition;
+import com.gitplex.commons.loader.ListenerRegistry;
+import com.gitplex.commons.wicket.component.modal.ModalLink;
+import com.gitplex.commons.wicket.websocket.WebSocketManager;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
@SuppressWarnings("serial")
public class DepotFilePage extends DepotPage implements BlobViewContext {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFileResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFileResourceReference.java
similarity index 72%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFileResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFileResourceReference.java
index dce36fb87e..1df36d8cff 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/DepotFileResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/DepotFileResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.file;
+package com.gitplex.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.pmease.commons.wicket.assets.cookies.CookiesResourceReference;
-import com.pmease.commons.wicket.assets.jqueryui.JQueryUIResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
-import com.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+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;
public class DepotFileResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/RequestCompareInfo.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/RequestCompareInfo.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/RequestCompareInfo.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/RequestCompareInfo.java
index 143f98d1a6..a8affe04e9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/RequestCompareInfo.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/RequestCompareInfo.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.file;
+package com.gitplex.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.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
+import com.gitplex.commons.lang.diff.WhitespaceOption;
public class RequestCompareInfo implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/depot-file.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/depot-file.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/depot-file.js b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/depot-file.js
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/depot-file.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/hgrabber.png b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/hgrabber.png
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/hgrabber.png
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/hgrabber.png
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/indexing.gif b/gitplex.web/src/main/java/com/gitplex/web/page/depot/file/indexing.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/file/indexing.gif
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/file/indexing.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/ForkOptionPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/ForkOptionPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java
index ce46b2be09..b748c685e6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/ForkOptionPanel.java
@@ -1,126 +1,126 @@
-package com.pmease.gitplex.web.page.depot.moreinfo;
-
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.accountchoice.AccountSingleChoice;
-import com.pmease.gitplex.web.component.accountchoice.AdministrativeAccountChoiceProvider;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-
-@SuppressWarnings("serial")
-abstract class ForkOptionPanel extends Panel {
-
- private final IModel<Depot> depotModel;
-
- private Long ownerId;
-
- public ForkOptionPanel(String id, IModel<Depot> depotModel) {
- super(id);
- this.depotModel = depotModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Depot depot = new Depot();
- depot.setForkedFrom(getDepot());
- depot.setName(getDepot().getName());
-
- BeanEditor<?> editor = BeanContext.editBean("editor", depot);
-
- Form<?> form = new Form<Void>("form");
- form.setOutputMarkupId(true);
- form.add(editor);
-
- IModel<Account> choiceModel = new IModel<Account>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Account getObject() {
- return getOwner();
- }
-
- @Override
- public void setObject(Account object) {
- ownerId = object.getId();
- }
-
- };
- form.add(new AccountSingleChoice("owner", choiceModel, new AdministrativeAccountChoiceProvider()).setRequired(true));
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- Account owner = getOwner();
- depot.setAccount(owner);
- DepotManager depotManager = GitPlex.getInstance(DepotManager.class);
- Depot depotWithSameName = depotManager.find(owner, depot.getName());
- if (depotWithSameName != null) {
- editor.getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another repository in account '" + owner.getDisplayName() + "'");
- target.add(form);
- } else {
- depotManager.fork(getDepot(), depot);
- Session.get().success("Repository forked");
- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));
- }
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onClose(target);
- }
-
- });
- add(form);
- }
-
- private Account getOwner() {
- if (ownerId == null)
- return SecurityUtils.getAccount();
- else
- return GitPlex.getInstance(AccountManager.class).load(ownerId);
- }
-
- private Depot getDepot() {
- return depotModel.getObject();
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
- protected abstract void onClose(AjaxRequestTarget target);
-
-}
+package com.gitplex.web.page.depot.moreinfo;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+
+import com.gitplex.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;
+
+@SuppressWarnings("serial")
+abstract class ForkOptionPanel extends Panel {
+
+ private final IModel<Depot> depotModel;
+
+ private Long ownerId;
+
+ public ForkOptionPanel(String id, IModel<Depot> depotModel) {
+ super(id);
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Depot depot = new Depot();
+ depot.setForkedFrom(getDepot());
+ depot.setName(getDepot().getName());
+
+ BeanEditor<?> editor = BeanContext.editBean("editor", depot);
+
+ Form<?> form = new Form<Void>("form");
+ form.setOutputMarkupId(true);
+ form.add(editor);
+
+ IModel<Account> choiceModel = new IModel<Account>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Account getObject() {
+ return getOwner();
+ }
+
+ @Override
+ public void setObject(Account object) {
+ ownerId = object.getId();
+ }
+
+ };
+ form.add(new AccountSingleChoice("owner", choiceModel, new AdministrativeAccountChoiceProvider()).setRequired(true));
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ Account owner = getOwner();
+ depot.setAccount(owner);
+ DepotManager depotManager = GitPlex.getInstance(DepotManager.class);
+ Depot depotWithSameName = depotManager.find(owner, depot.getName());
+ if (depotWithSameName != null) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another repository in account '" + owner.getDisplayName() + "'");
+ target.add(form);
+ } else {
+ depotManager.fork(getDepot(), depot);
+ Session.get().success("Repository forked");
+ setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));
+ }
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onClose(target);
+ }
+
+ });
+ add(form);
+ }
+
+ private Account getOwner() {
+ if (ownerId == null)
+ return SecurityUtils.getAccount();
+ else
+ return GitPlex.getInstance(AccountManager.class).load(ownerId);
+ }
+
+ private Depot getDepot() {
+ return depotModel.getObject();
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+ protected abstract void onClose(AjaxRequestTarget target);
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java
index 161abd29b7..a9c45eda9f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoPanel.java
@@ -1,202 +1,202 @@
-package com.pmease.gitplex.web.page.depot.moreinfo;
-
-import java.util.Collection;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-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.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.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.eclipse.jgit.lib.Constants;
-
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
-import com.pmease.gitplex.core.manager.UrlManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.depotselector.DepotSelector;
-import com.pmease.gitplex.web.page.depot.branches.DepotBranchesPage;
-import com.pmease.gitplex.web.page.depot.commit.DepotCommitsPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.depot.tags.DepotTagsPage;
-
-@SuppressWarnings("serial")
-public abstract class MoreInfoPanel extends Panel {
-
- private final IModel<Depot> depotModel;
-
- public MoreInfoPanel(String id, IModel<Depot> depotModel) {
- super(id);
- this.depotModel = depotModel;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- if (getDepot().getForkedFrom() != null) {
- Link<Void> link = new BookmarkablePageLink<Void>("forkedFromLink",
- DepotFilePage.class, DepotFilePage.paramsOf(getDepot().getForkedFrom()));
- link.add(new Label("name", getDepot().getForkedFrom().getFQN()));
- add(link);
- } else {
- WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");
- link.add(new Label("name"));
- link.setVisible(false);
- add(link);
- }
- add(new Label("id", getDepot().getId()));
-
- UrlManager urlManager = GitPlex.getInstance(UrlManager.class);
- Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getDepot()));
- add(new TextField<String>("cloneUrl", cloneUrlModel));
- add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
-
- if (getDepot().getDescription() != null) {
- add(new MarkdownPanel("description", Model.of(getDepot().getDescription()), null));
- } else {
- add(new WebMarkupContainer("description").setVisible(false));
- }
-
- add(new BookmarkablePageLink<Void>("commitsLink",
- DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot())) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(GitPlex.getInstance(CommitInfoManager.class).getCommitCount(getDepot()) != 0);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);
- add(new Label("count", commitInfoManager.getCommitCount(getDepot()) + " commits"));
- }
-
- });
-
- add(new BookmarkablePageLink<Void>("branchesLink",
- DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot())) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("count", getDepot().getRefs(Constants.R_HEADS).size() + " branches"));
- }
-
- });
-
- add(new BookmarkablePageLink<Void>("tagsLink",
- DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot())) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("count", getDepot().getRefs(Constants.R_TAGS).size() + " tags"));
- }
-
- });
-
- if (getDepot().getForks().isEmpty()) {
- add(new WebMarkupContainer("forks") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", "0 forks"));
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.setName("span");
- }
-
- });
- } else {
- add(new DropdownLink("forks") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", getDepot().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));
- }
-
- @Override
- protected Component newContent(String id) {
- return new DepotSelector(id, new LoadableDetachableModel<Collection<Depot>>() {
-
- @Override
- protected Collection<Depot> load() {
- return getDepot().getForks();
- }
-
- }, Depot.idOf(getDepot())) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Depot depot) {
- setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));
- }
-
- };
- }
-
- });
- }
-
- add(new ModalLink("forkNow") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- onPromptForkOption(target);
- }
-
- @Override
- protected Component newContent(String id) {
- return new ForkOptionPanel(id, depotModel) {
-
- @Override
- protected void onClose(AjaxRequestTarget target) {
- close(target);
- }
-
- };
- }
-
- }.setVisible(SecurityUtils.getAccount() != null));
- }
-
- private Depot getDepot() {
- return depotModel.getObject();
- }
-
- @Override
- protected void onDetach() {
- depotModel.detach();
- super.onDetach();
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MoreInfoResourceReference()));
- }
-
- protected abstract void onPromptForkOption(AjaxRequestTarget target);
-
-}
+package com.gitplex.web.page.depot.moreinfo;
+
+import java.util.Collection;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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.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.panel.Panel;
+import org.apache.wicket.model.IModel;
+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;
+
+@SuppressWarnings("serial")
+public abstract class MoreInfoPanel extends Panel {
+
+ private final IModel<Depot> depotModel;
+
+ public MoreInfoPanel(String id, IModel<Depot> depotModel) {
+ super(id);
+ this.depotModel = depotModel;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (getDepot().getForkedFrom() != null) {
+ Link<Void> link = new BookmarkablePageLink<Void>("forkedFromLink",
+ DepotFilePage.class, DepotFilePage.paramsOf(getDepot().getForkedFrom()));
+ link.add(new Label("name", getDepot().getForkedFrom().getFQN()));
+ add(link);
+ } else {
+ WebMarkupContainer link = new WebMarkupContainer("forkedFromLink");
+ link.add(new Label("name"));
+ link.setVisible(false);
+ add(link);
+ }
+ add(new Label("id", getDepot().getId()));
+
+ UrlManager urlManager = GitPlex.getInstance(UrlManager.class);
+ Model<String> cloneUrlModel = Model.of(urlManager.urlFor(getDepot()));
+ add(new TextField<String>("cloneUrl", cloneUrlModel));
+ add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel)));
+
+ if (getDepot().getDescription() != null) {
+ add(new MarkdownPanel("description", Model.of(getDepot().getDescription()), null));
+ } else {
+ add(new WebMarkupContainer("description").setVisible(false));
+ }
+
+ add(new BookmarkablePageLink<Void>("commitsLink",
+ DepotCommitsPage.class, DepotCommitsPage.paramsOf(getDepot())) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(GitPlex.getInstance(CommitInfoManager.class).getCommitCount(getDepot()) != 0);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ CommitInfoManager commitInfoManager = GitPlex.getInstance(CommitInfoManager.class);
+ add(new Label("count", commitInfoManager.getCommitCount(getDepot()) + " commits"));
+ }
+
+ });
+
+ add(new BookmarkablePageLink<Void>("branchesLink",
+ DepotBranchesPage.class, DepotBranchesPage.paramsOf(getDepot())) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("count", getDepot().getRefs(Constants.R_HEADS).size() + " branches"));
+ }
+
+ });
+
+ add(new BookmarkablePageLink<Void>("tagsLink",
+ DepotTagsPage.class, DepotTagsPage.paramsOf(getDepot())) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("count", getDepot().getRefs(Constants.R_TAGS).size() + " tags"));
+ }
+
+ });
+
+ if (getDepot().getForks().isEmpty()) {
+ add(new WebMarkupContainer("forks") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", "0 forks"));
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ } else {
+ add(new DropdownLink("forks") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", getDepot().getForks().size() + " forks <i class='fa fa-caret-down'></i>").setEscapeModelStrings(false));
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new DepotSelector(id, new LoadableDetachableModel<Collection<Depot>>() {
+
+ @Override
+ protected Collection<Depot> load() {
+ return getDepot().getForks();
+ }
+
+ }, Depot.idOf(getDepot())) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Depot depot) {
+ setResponsePage(DepotFilePage.class, DepotFilePage.paramsOf(depot));
+ }
+
+ };
+ }
+
+ });
+ }
+
+ add(new ModalLink("forkNow") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ onPromptForkOption(target);
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new ForkOptionPanel(id, depotModel) {
+
+ @Override
+ protected void onClose(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ };
+ }
+
+ }.setVisible(SecurityUtils.getAccount() != null));
+ }
+
+ private Depot getDepot() {
+ return depotModel.getObject();
+ }
+
+ @Override
+ protected void onDetach() {
+ depotModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new MoreInfoResourceReference()));
+ }
+
+ protected abstract void onPromptForkOption(AjaxRequestTarget target);
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java
similarity index 65%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java
index c9e70c6f59..db9bbb94d0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/MoreInfoResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.page.depot.moreinfo;
+package com.gitplex.web.page.depot.moreinfo;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
public class MoreInfoResourceReference extends BaseDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/more-info.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/more-info.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/moreinfo/more-info.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/moreinfo/more-info.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/no-branches.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/no-branches.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/no-branches.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/no-branches.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java
index ea732d5b2e..83da0f1d95 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestPage.java
@@ -1,772 +1,772 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.newrequest;
-
-import static com.pmease.gitplex.core.entity.PullRequest.Status.INTEGRATED;
-import static com.pmease.gitplex.core.entity.PullRequest.Status.PENDING_UPDATE;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-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.Button;
-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.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-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.model.PropertyModel;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevWalk;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.component.tabbable.AjaxActionTab;
-import com.pmease.commons.wicket.component.tabbable.Tab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
-import com.pmease.gitplex.core.entity.PullRequest.Status;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.CloseInfo;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.security.ObjectPermission;
-import com.pmease.gitplex.web.component.BranchLink;
-import com.pmease.gitplex.web.component.branchpicker.AffinalBranchPicker;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.component.commitlist.CommitListPanel;
-import com.pmease.gitplex.web.component.diff.revision.CommentSupport;
-import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;
-import com.pmease.gitplex.web.component.pullrequest.requestassignee.AssigneeChoice;
-import com.pmease.gitplex.web.component.pullrequest.requestreviewer.ReviewerAvatar;
-import com.pmease.gitplex.web.component.pullrequest.requestreviewer.ReviewerChoice;
-import com.pmease.gitplex.web.model.ReviewersModel;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.compare.RevisionComparePage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.page.security.LoginPage;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-
-@SuppressWarnings("serial")
-public class NewRequestPage extends DepotPage implements CommentSupport {
-
- private static final String TAB_PANEL_ID = "tabPanel";
-
- private DepotAndBranch target;
-
- private DepotAndBranch source;
-
- private IModel<List<RevCommit>> commitsModel;
-
- private IModel<PullRequest> requestModel;
-
- private Long commentId;
-
- private CommentPos mark;
-
- private String pathFilter;
-
- private String blameFile;
-
- private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;
-
- public static PageParameters paramsOf(Depot depot, DepotAndBranch target, DepotAndBranch source) {
- PageParameters params = paramsOf(depot);
- params.set("target", target.toString());
- params.set("source", source.toString());
- return params;
- }
-
- public NewRequestPage(PageParameters params) {
- super(params);
-
- if (getDepot().getDefaultBranch() == null)
- throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));
-
- Account currentUser = getLoginUser();
- if (currentUser == null)
- throw new RestartResponseAtInterceptPageException(LoginPage.class);
-
- PullRequest prevRequest = null;
- String targetParam = params.get("target").toString();
- String sourceParam = params.get("source").toString();
- if (targetParam != null) {
- target = new DepotAndBranch(targetParam);
- } else {
- prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getDepot(), getLoginUser());
- if (prevRequest != null && prevRequest.getTarget().getObjectId(false) != null) {
- target = prevRequest.getTarget();
- } else if (getDepot().getForkedFrom() != null) {
- target = new DepotAndBranch(getDepot().getForkedFrom(),
- getDepot().getForkedFrom().getDefaultBranch());
- } else {
- target = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());
- }
- }
-
- if (sourceParam != null) {
- source = new DepotAndBranch(sourceParam);
- } else {
- if (prevRequest == null)
- prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getDepot(), getLoginUser());
- if (prevRequest != null && prevRequest.getSource().getObjectId(false) != null) {
- source = prevRequest.getSource();
- } else if (getDepot().getForkedFrom() != null) {
- source = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());
- } else {
- source = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());
- }
- }
-
- PullRequest pullRequest;
- if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())
- pullRequest = prevRequest;
- else
- pullRequest = GitPlex.getInstance(PullRequestManager.class).findOpen(target, source);
-
- if (pullRequest == null) {
- pullRequest = new PullRequest();
- pullRequest.setTarget(target);
- pullRequest.setSource(source);
- pullRequest.setSubmitter(currentUser);
-
- PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);
- List<IntegrationStrategy> strategies = pullRequestManager.getApplicableIntegrationStrategies(pullRequest);
- Preconditions.checkState(!strategies.isEmpty());
- pullRequest.setIntegrationStrategy(strategies.get(0));
-
- ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());
- if (currentUser.asSubject().isPermitted(writePermission))
- pullRequest.setAssignee(currentUser);
- else
- pullRequest.setAssignee(getDepot().getAccount());
-
- ObjectId baseCommitId = GitUtils.getMergeBase(
- target.getDepot().getRepository(), target.getObjectId(),
- source.getDepot().getRepository(), source.getObjectId(),
- GitUtils.branch2ref(source.getBranch()));
-
- pullRequest.setBaseCommitHash(baseCommitId.name());
- if (pullRequest.getBaseCommitHash().equals(source.getObjectName())) {
- CloseInfo closeInfo = new CloseInfo();
- closeInfo.setCloseDate(new Date());
- closeInfo.setCloseStatus(CloseInfo.Status.INTEGRATED);
- pullRequest.setCloseInfo(closeInfo);
- }
-
- PullRequestUpdate update = new PullRequestUpdate();
- pullRequest.addUpdate(update);
- update.setRequest(pullRequest);
- update.setHeadCommitHash(source.getObjectName());
- update.setMergeCommitHash(pullRequest.getBaseCommitHash());
-
- requestModel = Model.of(pullRequest);
- } else {
- Long requestId = pullRequest.getId();
- requestModel = new LoadableDetachableModel<PullRequest>() {
-
- @Override
- protected PullRequest load() {
- return GitPlex.getInstance(PullRequestManager.class).load(requestId);
- }
-
- };
- requestModel.setObject(pullRequest);
- }
-
- commitsModel = new LoadableDetachableModel<List<RevCommit>>() {
-
- @Override
- protected List<RevCommit> load() {
- PullRequest request = getPullRequest();
- List<RevCommit> commits = new ArrayList<>();
- try (RevWalk revWalk = new RevWalk(source.getDepot().getRepository())) {
- ObjectId headId = ObjectId.fromString(request.getHeadCommitHash());
- revWalk.markStart(revWalk.parseCommit(headId));
- ObjectId baseId = ObjectId.fromString(request.getBaseCommitHash());
- revWalk.markUninteresting(revWalk.parseCommit(baseId));
- revWalk.forEach(c->commits.add(c));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return commits;
- }
-
- };
-
- }
-
- private PullRequest getPullRequest() {
- return requestModel.getObject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- setOutputMarkupId(true);
-
- add(new AffinalBranchPicker("target", target.getDepotId(), target.getBranch()) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {
- PageParameters params = paramsOf(depot, new DepotAndBranch(depot, branch), source);
- setResponsePage(NewRequestPage.class, params);
- }
-
- });
- PageParameters params = CommitDetailPage.paramsOf(target.getDepot(), target.getObjectName());
- Link<Void> targetCommitLink = new BookmarkablePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);
- targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));
- add(targetCommitLink);
-
- add(new AffinalBranchPicker("source", source.getDepotId(), source.getBranch()) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {
- PageParameters params = paramsOf(getDepot(), NewRequestPage.this.target,
- new DepotAndBranch(depot, branch));
- setResponsePage(NewRequestPage.class, params);
- }
-
- });
- params = CommitDetailPage.paramsOf(source.getDepot(), source.getObjectName());
- Link<Void> sourceCommitLink = new BookmarkablePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);
- sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));
- add(sourceCommitLink);
-
- add(new Link<Void>("swap") {
-
- @Override
- public void onClick() {
- PageParameters params = paramsOf(getPullRequest().getSourceDepot(),
- getPullRequest().getSource(), getPullRequest().getTarget());
- setResponsePage(NewRequestPage.class, params);
- }
-
- });
-
- Fragment fragment;
- if (getPullRequest().getId() != null) {
- fragment = newOpenedFrag();
- } else if (getPullRequest().getSource().equals(getPullRequest().getTarget())) {
- fragment = newSameBranchFrag();
- } else if (getPullRequest().getStatus() == INTEGRATED) {
- fragment = newIntegratedFrag();
- } else if (getPullRequest().getStatus() == PENDING_UPDATE) {
- fragment = newRejectedFrag();
- } else {
- fragment = newCanSendFrag();
- }
- add(fragment);
-
- List<Tab> tabs = new ArrayList<>();
-
- tabs.add(new AjaxActionTab(Model.of("Commits")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component panel = newCommitsPanel();
- getPage().replace(panel);
- target.add(panel);
- }
-
- });
-
- tabs.add(new AjaxActionTab(Model.of("Files")) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component panel = newRevDiffPanel();
- getPage().replace(panel);
- target.add(panel);
- }
-
- });
-
- add(new Tabbable("tabs", tabs) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(getPullRequest().getStatus() != INTEGRATED);
- }
-
- });
-
- add(newCommitsPanel());
- }
-
- private Component newCommitsPanel() {
- return new CommitListPanel(TAB_PANEL_ID, depotModel, commitsModel) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().getStatus() != INTEGRATED);
- }
-
- }.setOutputMarkupId(true);
- }
-
- private RevisionDiffPanel newRevDiffPanel() {
- PullRequest request = getPullRequest();
-
- IModel<Depot> depotModel = new LoadableDetachableModel<Depot>() {
-
- @Override
- protected Depot load() {
- Depot depot = source.getDepot();
- depot.cacheObjectId(source.getRevision(),
- ObjectId.fromString(getPullRequest().getHeadCommitHash()));
- return depot;
- }
-
- };
-
- IModel<String> blameModel = new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return blameFile;
- }
-
- @Override
- public void setObject(String object) {
- blameFile = object;
- }
-
- };
- IModel<String> pathFilterModel = new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return pathFilter;
- }
-
- @Override
- public void setObject(String object) {
- pathFilter = object;
- }
-
- };
- IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public WhitespaceOption getObject() {
- return whitespaceOption;
- }
-
- @Override
- public void setObject(WhitespaceOption object) {
- whitespaceOption = object;
- }
-
- };
-
- /*
- * we are passing source revision here instead of head commit hash of latest update
- * as we want to preserve the branch name in case they are useful at some point
- * later. Also it is guaranteed to be resolved to the same commit has as we've cached
- * it above when loading the depot
- */
- RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, depotModel,
- new Model<PullRequest>(null), request.getBaseCommitHash(),
- source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().getStatus() != INTEGRATED);
- }
-
- };
- diffPanel.setOutputMarkupId(true);
- return diffPanel;
- }
-
- private Fragment newOpenedFrag() {
- Fragment fragment = new Fragment("status", "openedFrag", this);
- fragment.add(new Label("no", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return getPullRequest().getId().toString();
- }
- }));
- fragment.add(new Link<Void>("link") {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return getPullRequest().getTitle();
- }
- }));
- }
-
- @Override
- public void onClick() {
- PageParameters params = RequestDetailPage.paramsOf(getPullRequest());
- setResponsePage(RequestOverviewPage.class, params);
- }
-
- });
-
- return fragment;
- }
-
- private Fragment newSameBranchFrag() {
- return new Fragment("status", "sameBranchFrag", this);
- }
-
- private Fragment newIntegratedFrag() {
- Fragment fragment = new Fragment("status", "integratedFrag", this);
- fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource()));
- fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget()));
- fragment.add(new Link<Void>("swapBranches") {
-
- @Override
- public void onClick() {
- setResponsePage(
- NewRequestPage.class,
- paramsOf(getDepot(), getPullRequest().getSource(), getPullRequest().getTarget()));
- }
-
- });
- return fragment;
- }
-
- private Fragment newRejectedFrag() {
- Fragment fragment = new Fragment("status", "rejectedFrag", this);
- fragment.add(new ListView<String>("reasons", new LoadableDetachableModel<List<String>>() {
-
- @Override
- protected List<String> load() {
- return getPullRequest().checkGates(false).getReasons();
- }
-
- }) {
-
- @Override
- protected void populateItem(ListItem<String> item) {
- item.add(new Label("reason", item.getModelObject()));
- }
-
- });
-
- return fragment;
- }
-
- private Fragment newCanSendFrag() {
- Fragment fragment = new Fragment("status", "canSendFrag", this);
- final Form<?> form = new Form<Void>("form");
- fragment.add(form);
-
- form.add(new Button("send") {
-
- @Override
- public void onSubmit() {
- super.onSubmit();
-
- Dao dao = GitPlex.getInstance(Dao.class);
- DepotAndBranch target = getPullRequest().getTarget();
- DepotAndBranch source = getPullRequest().getSource();
- if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName())
- || !source.getObjectName().equals(getPullRequest().getSource().getObjectName())) {
- getSession().warn("Either target branch or source branch has new commits just now, please re-check.");
- setResponsePage(NewRequestPage.class, paramsOf(getDepot(), target, source));
- } else {
- getPullRequest().setSource(source);
- getPullRequest().setTarget(target);
- for (PullRequestReviewInvitation invitation: getPullRequest().getReviewInvitations())
- invitation.setUser(dao.load(Account.class, invitation.getUser().getId()));
-
- getPullRequest().setAssignee(dao.load(Account.class, getPullRequest().getAssignee().getId()));
-
- GitPlex.getInstance(PullRequestManager.class).open(getPullRequest());
-
- setResponsePage(RequestOverviewPage.class, RequestOverviewPage.paramsOf(getPullRequest()));
- }
- }
-
- });
-
- WebMarkupContainer titleContainer = new WebMarkupContainer("title");
- form.add(titleContainer);
- final TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- if (getPullRequest().getTitle() == null) {
- List<RevCommit> commits = commitsModel.getObject();
- Preconditions.checkState(!commits.isEmpty());
- if (commits.size() == 1)
- getPullRequest().setTitle(commits.get(0).getShortMessage());
- else
- getPullRequest().setTitle(getPullRequest().getSource().getBranch());
- }
- return getPullRequest().getTitle();
- }
-
- @Override
- public void setObject(String object) {
- getPullRequest().setTitle(object);
- }
-
- });
- titleInput.setRequired(true);
- titleContainer.add(titleInput);
-
- titleContainer.add(new NotificationPanel("feedback", titleInput));
-
- titleContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return !titleInput.isValid()?" has-error":"";
- }
-
- }));
-
- form.add(new CommentInput("comment", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return getPullRequest().getDescription();
- }
-
- @Override
- public void setObject(String object) {
- getPullRequest().setDescription(object);
- }
-
- }) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(getDepot(), getPullRequest().getUUID());
- }
-
- @Override
- protected Depot getDepot() {
- return NewRequestPage.this.getDepot();
- }
-
- });
-
- WebMarkupContainer assigneeContainer = new WebMarkupContainer("assignee");
- form.add(assigneeContainer);
- IModel<Account> assigneeModel = new PropertyModel<>(getPullRequest(), "assignee");
- AssigneeChoice assigneeChoice = new AssigneeChoice("assignee", depotModel, assigneeModel);
- assigneeChoice.setRequired(true);
- assigneeContainer.add(assigneeChoice);
-
- assigneeContainer.add(new NotificationPanel("feedback", assigneeChoice));
-
- assigneeContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return !assigneeChoice.isValid()?" has-error":"";
- }
-
- }));
-
- WebMarkupContainer reviewersContainer = new WebMarkupContainer("reviewers") {
-
- @Override
- protected void onBeforeRender() {
- super.onBeforeRender();
- }
-
- };
- reviewersContainer.setOutputMarkupId(true);
- form.add(reviewersContainer);
- 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);
- }
-
- });
- }
-
- });
-
- reviewersContainer.add(new ReviewerChoice("addReviewer", requestModel) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Account user) {
- super.onSelect(target, user);
-
- target.add(reviewersContainer);
- }
-
- });
-
- reviewersContainer.add(new WebMarkupContainer("prePopulateHint") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(getPullRequest().getStatus() == Status.PENDING_APPROVAL);
- }
-
- });
-
- return fragment;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new NewRequestResourceReference()));
- }
-
- @Override
- protected void onDetach() {
- commitsModel.detach();
- requestModel.detach();
-
- super.onDetach();
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Depot depot) {
- setResponsePage(RequestListPage.class, paramsOf(depot));
- }
-
- @Override
- public CommentPos getMark() {
- return mark;
- }
-
- @Override
- public String getMarkUrl(CommentPos mark) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- state.mark = mark;
- state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());
- state.rightSide = new DepotAndBranch(source.getDepot(), getPullRequest().getHeadCommitHash());
- state.pathFilter = pathFilter;
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- state.whitespaceOption = whitespaceOption;
- state.compareWithMergeBase = false;
- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();
- }
-
- @Override
- public CodeComment getOpenComment() {
- if (commentId != null)
- return GitPlex.getInstance(CodeCommentManager.class).load(commentId);
- else
- return null;
- }
-
- @Override
- public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
- if (comment != null) {
- commentId = comment.getId();
- mark = comment.getCommentPos();
- } else {
- commentId = null;
- }
- }
-
- @Override
- public String getCommentUrl(CodeComment comment) {
- RevisionComparePage.State state = new RevisionComparePage.State();
- mark = comment.getCommentPos();
- state.commentId = comment.getId();
- state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());
- state.rightSide = new DepotAndBranch(source.getDepot(), getPullRequest().getHeadCommitHash());
- state.pathFilter = pathFilter;
- state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
- state.whitespaceOption = whitespaceOption;
- state.compareWithMergeBase = false;
- return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();
- }
-
- @Override
- public void onMark(AjaxRequestTarget target, CommentPos mark) {
- this.mark = mark;
- }
-
- @Override
- public void onAddComment(AjaxRequestTarget target, CommentPos mark) {
- this.commentId = null;
- this.mark = mark;
- }
-
- @Override
- public String getAnchor() {
- return null;
- }
-
-}
+package com.gitplex.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 java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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.Button;
+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.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+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.model.PropertyModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+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;
+import com.gitplex.commons.lang.diff.WhitespaceOption;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
+@SuppressWarnings("serial")
+public class NewRequestPage extends DepotPage implements CommentSupport {
+
+ private static final String TAB_PANEL_ID = "tabPanel";
+
+ private DepotAndBranch target;
+
+ private DepotAndBranch source;
+
+ private IModel<List<RevCommit>> commitsModel;
+
+ private IModel<PullRequest> requestModel;
+
+ private Long commentId;
+
+ private CommentPos mark;
+
+ private String pathFilter;
+
+ private String blameFile;
+
+ private WhitespaceOption whitespaceOption = WhitespaceOption.DEFAULT;
+
+ public static PageParameters paramsOf(Depot depot, DepotAndBranch target, DepotAndBranch source) {
+ PageParameters params = paramsOf(depot);
+ params.set("target", target.toString());
+ params.set("source", source.toString());
+ return params;
+ }
+
+ public NewRequestPage(PageParameters params) {
+ super(params);
+
+ if (getDepot().getDefaultBranch() == null)
+ throw new RestartResponseException(NoBranchesPage.class, paramsOf(getDepot()));
+
+ Account currentUser = getLoginUser();
+ if (currentUser == null)
+ throw new RestartResponseAtInterceptPageException(LoginPage.class);
+
+ PullRequest prevRequest = null;
+ String targetParam = params.get("target").toString();
+ String sourceParam = params.get("source").toString();
+ if (targetParam != null) {
+ target = new DepotAndBranch(targetParam);
+ } else {
+ prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getDepot(), getLoginUser());
+ if (prevRequest != null && prevRequest.getTarget().getObjectId(false) != null) {
+ target = prevRequest.getTarget();
+ } else if (getDepot().getForkedFrom() != null) {
+ target = new DepotAndBranch(getDepot().getForkedFrom(),
+ getDepot().getForkedFrom().getDefaultBranch());
+ } else {
+ target = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());
+ }
+ }
+
+ if (sourceParam != null) {
+ source = new DepotAndBranch(sourceParam);
+ } else {
+ if (prevRequest == null)
+ prevRequest = GitPlex.getInstance(PullRequestManager.class).findLatest(getDepot(), getLoginUser());
+ if (prevRequest != null && prevRequest.getSource().getObjectId(false) != null) {
+ source = prevRequest.getSource();
+ } else if (getDepot().getForkedFrom() != null) {
+ source = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());
+ } else {
+ source = new DepotAndBranch(getDepot(), getDepot().getDefaultBranch());
+ }
+ }
+
+ PullRequest pullRequest;
+ if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen())
+ pullRequest = prevRequest;
+ else
+ pullRequest = GitPlex.getInstance(PullRequestManager.class).findOpen(target, source);
+
+ if (pullRequest == null) {
+ pullRequest = new PullRequest();
+ pullRequest.setTarget(target);
+ pullRequest.setSource(source);
+ pullRequest.setSubmitter(currentUser);
+
+ PullRequestManager pullRequestManager = GitPlex.getInstance(PullRequestManager.class);
+ List<IntegrationStrategy> strategies = pullRequestManager.getApplicableIntegrationStrategies(pullRequest);
+ Preconditions.checkState(!strategies.isEmpty());
+ pullRequest.setIntegrationStrategy(strategies.get(0));
+
+ ObjectPermission writePermission = ObjectPermission.ofDepotWrite(getDepot());
+ if (currentUser.asSubject().isPermitted(writePermission))
+ pullRequest.setAssignee(currentUser);
+ else
+ pullRequest.setAssignee(getDepot().getAccount());
+
+ ObjectId baseCommitId = GitUtils.getMergeBase(
+ target.getDepot().getRepository(), target.getObjectId(),
+ source.getDepot().getRepository(), source.getObjectId(),
+ GitUtils.branch2ref(source.getBranch()));
+
+ pullRequest.setBaseCommitHash(baseCommitId.name());
+ if (pullRequest.getBaseCommitHash().equals(source.getObjectName())) {
+ CloseInfo closeInfo = new CloseInfo();
+ closeInfo.setCloseDate(new Date());
+ closeInfo.setCloseStatus(CloseInfo.Status.INTEGRATED);
+ pullRequest.setCloseInfo(closeInfo);
+ }
+
+ PullRequestUpdate update = new PullRequestUpdate();
+ pullRequest.addUpdate(update);
+ update.setRequest(pullRequest);
+ update.setHeadCommitHash(source.getObjectName());
+ update.setMergeCommitHash(pullRequest.getBaseCommitHash());
+
+ requestModel = Model.of(pullRequest);
+ } else {
+ Long requestId = pullRequest.getId();
+ requestModel = new LoadableDetachableModel<PullRequest>() {
+
+ @Override
+ protected PullRequest load() {
+ return GitPlex.getInstance(PullRequestManager.class).load(requestId);
+ }
+
+ };
+ requestModel.setObject(pullRequest);
+ }
+
+ commitsModel = new LoadableDetachableModel<List<RevCommit>>() {
+
+ @Override
+ protected List<RevCommit> load() {
+ PullRequest request = getPullRequest();
+ List<RevCommit> commits = new ArrayList<>();
+ try (RevWalk revWalk = new RevWalk(source.getDepot().getRepository())) {
+ ObjectId headId = ObjectId.fromString(request.getHeadCommitHash());
+ revWalk.markStart(revWalk.parseCommit(headId));
+ ObjectId baseId = ObjectId.fromString(request.getBaseCommitHash());
+ revWalk.markUninteresting(revWalk.parseCommit(baseId));
+ revWalk.forEach(c->commits.add(c));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return commits;
+ }
+
+ };
+
+ }
+
+ private PullRequest getPullRequest() {
+ return requestModel.getObject();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ setOutputMarkupId(true);
+
+ add(new AffinalBranchPicker("target", target.getDepotId(), target.getBranch()) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {
+ PageParameters params = paramsOf(depot, new DepotAndBranch(depot, branch), source);
+ setResponsePage(NewRequestPage.class, params);
+ }
+
+ });
+ PageParameters params = CommitDetailPage.paramsOf(target.getDepot(), target.getObjectName());
+ Link<Void> targetCommitLink = new BookmarkablePageLink<Void>("targetCommitLink", CommitDetailPage.class, params);
+ targetCommitLink.add(new Label("message", target.getCommit().getShortMessage()));
+ add(targetCommitLink);
+
+ add(new AffinalBranchPicker("source", source.getDepotId(), source.getBranch()) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Depot depot, String branch) {
+ PageParameters params = paramsOf(getDepot(), NewRequestPage.this.target,
+ new DepotAndBranch(depot, branch));
+ setResponsePage(NewRequestPage.class, params);
+ }
+
+ });
+ params = CommitDetailPage.paramsOf(source.getDepot(), source.getObjectName());
+ Link<Void> sourceCommitLink = new BookmarkablePageLink<Void>("sourceCommitLink", CommitDetailPage.class, params);
+ sourceCommitLink.add(new Label("message", source.getCommit().getShortMessage()));
+ add(sourceCommitLink);
+
+ add(new Link<Void>("swap") {
+
+ @Override
+ public void onClick() {
+ PageParameters params = paramsOf(getPullRequest().getSourceDepot(),
+ getPullRequest().getSource(), getPullRequest().getTarget());
+ setResponsePage(NewRequestPage.class, params);
+ }
+
+ });
+
+ Fragment fragment;
+ if (getPullRequest().getId() != null) {
+ fragment = newOpenedFrag();
+ } else if (getPullRequest().getSource().equals(getPullRequest().getTarget())) {
+ fragment = newSameBranchFrag();
+ } else if (getPullRequest().getStatus() == INTEGRATED) {
+ fragment = newIntegratedFrag();
+ } else if (getPullRequest().getStatus() == PENDING_UPDATE) {
+ fragment = newRejectedFrag();
+ } else {
+ fragment = newCanSendFrag();
+ }
+ add(fragment);
+
+ List<Tab> tabs = new ArrayList<>();
+
+ tabs.add(new AjaxActionTab(Model.of("Commits")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component panel = newCommitsPanel();
+ getPage().replace(panel);
+ target.add(panel);
+ }
+
+ });
+
+ tabs.add(new AjaxActionTab(Model.of("Files")) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component panel = newRevDiffPanel();
+ getPage().replace(panel);
+ target.add(panel);
+ }
+
+ });
+
+ add(new Tabbable("tabs", tabs) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(getPullRequest().getStatus() != INTEGRATED);
+ }
+
+ });
+
+ add(newCommitsPanel());
+ }
+
+ private Component newCommitsPanel() {
+ return new CommitListPanel(TAB_PANEL_ID, depotModel, commitsModel) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getPullRequest().getStatus() != INTEGRATED);
+ }
+
+ }.setOutputMarkupId(true);
+ }
+
+ private RevisionDiffPanel newRevDiffPanel() {
+ PullRequest request = getPullRequest();
+
+ IModel<Depot> depotModel = new LoadableDetachableModel<Depot>() {
+
+ @Override
+ protected Depot load() {
+ Depot depot = source.getDepot();
+ depot.cacheObjectId(source.getRevision(),
+ ObjectId.fromString(getPullRequest().getHeadCommitHash()));
+ return depot;
+ }
+
+ };
+
+ IModel<String> blameModel = new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return blameFile;
+ }
+
+ @Override
+ public void setObject(String object) {
+ blameFile = object;
+ }
+
+ };
+ IModel<String> pathFilterModel = new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return pathFilter;
+ }
+
+ @Override
+ public void setObject(String object) {
+ pathFilter = object;
+ }
+
+ };
+ IModel<WhitespaceOption> whitespaceOptionModel = new IModel<WhitespaceOption>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public WhitespaceOption getObject() {
+ return whitespaceOption;
+ }
+
+ @Override
+ public void setObject(WhitespaceOption object) {
+ whitespaceOption = object;
+ }
+
+ };
+
+ /*
+ * we are passing source revision here instead of head commit hash of latest update
+ * as we want to preserve the branch name in case they are useful at some point
+ * later. Also it is guaranteed to be resolved to the same commit has as we've cached
+ * it above when loading the depot
+ */
+ RevisionDiffPanel diffPanel = new RevisionDiffPanel(TAB_PANEL_ID, depotModel,
+ new Model<PullRequest>(null), request.getBaseCommitHash(),
+ source.getRevision(), pathFilterModel, whitespaceOptionModel, blameModel, this) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getPullRequest().getStatus() != INTEGRATED);
+ }
+
+ };
+ diffPanel.setOutputMarkupId(true);
+ return diffPanel;
+ }
+
+ private Fragment newOpenedFrag() {
+ Fragment fragment = new Fragment("status", "openedFrag", this);
+ fragment.add(new Label("no", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return getPullRequest().getId().toString();
+ }
+ }));
+ fragment.add(new Link<Void>("link") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return getPullRequest().getTitle();
+ }
+ }));
+ }
+
+ @Override
+ public void onClick() {
+ PageParameters params = RequestDetailPage.paramsOf(getPullRequest());
+ setResponsePage(RequestOverviewPage.class, params);
+ }
+
+ });
+
+ return fragment;
+ }
+
+ private Fragment newSameBranchFrag() {
+ return new Fragment("status", "sameBranchFrag", this);
+ }
+
+ private Fragment newIntegratedFrag() {
+ Fragment fragment = new Fragment("status", "integratedFrag", this);
+ fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource()));
+ fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget()));
+ fragment.add(new Link<Void>("swapBranches") {
+
+ @Override
+ public void onClick() {
+ setResponsePage(
+ NewRequestPage.class,
+ paramsOf(getDepot(), getPullRequest().getSource(), getPullRequest().getTarget()));
+ }
+
+ });
+ return fragment;
+ }
+
+ private Fragment newRejectedFrag() {
+ Fragment fragment = new Fragment("status", "rejectedFrag", this);
+ fragment.add(new ListView<String>("reasons", new LoadableDetachableModel<List<String>>() {
+
+ @Override
+ protected List<String> load() {
+ return getPullRequest().checkGates(false).getReasons();
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<String> item) {
+ item.add(new Label("reason", item.getModelObject()));
+ }
+
+ });
+
+ return fragment;
+ }
+
+ private Fragment newCanSendFrag() {
+ Fragment fragment = new Fragment("status", "canSendFrag", this);
+ final Form<?> form = new Form<Void>("form");
+ fragment.add(form);
+
+ form.add(new Button("send") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ Dao dao = GitPlex.getInstance(Dao.class);
+ DepotAndBranch target = getPullRequest().getTarget();
+ DepotAndBranch source = getPullRequest().getSource();
+ if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName())
+ || !source.getObjectName().equals(getPullRequest().getSource().getObjectName())) {
+ getSession().warn("Either target branch or source branch has new commits just now, please re-check.");
+ setResponsePage(NewRequestPage.class, paramsOf(getDepot(), target, source));
+ } else {
+ getPullRequest().setSource(source);
+ getPullRequest().setTarget(target);
+ for (PullRequestReviewInvitation invitation: getPullRequest().getReviewInvitations())
+ invitation.setUser(dao.load(Account.class, invitation.getUser().getId()));
+
+ getPullRequest().setAssignee(dao.load(Account.class, getPullRequest().getAssignee().getId()));
+
+ GitPlex.getInstance(PullRequestManager.class).open(getPullRequest());
+
+ setResponsePage(RequestOverviewPage.class, RequestOverviewPage.paramsOf(getPullRequest()));
+ }
+ }
+
+ });
+
+ WebMarkupContainer titleContainer = new WebMarkupContainer("title");
+ form.add(titleContainer);
+ final TextField<String> titleInput = new TextField<String>("title", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ if (getPullRequest().getTitle() == null) {
+ List<RevCommit> commits = commitsModel.getObject();
+ Preconditions.checkState(!commits.isEmpty());
+ if (commits.size() == 1)
+ getPullRequest().setTitle(commits.get(0).getShortMessage());
+ else
+ getPullRequest().setTitle(getPullRequest().getSource().getBranch());
+ }
+ return getPullRequest().getTitle();
+ }
+
+ @Override
+ public void setObject(String object) {
+ getPullRequest().setTitle(object);
+ }
+
+ });
+ titleInput.setRequired(true);
+ titleContainer.add(titleInput);
+
+ titleContainer.add(new NotificationPanel("feedback", titleInput));
+
+ titleContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return !titleInput.isValid()?" has-error":"";
+ }
+
+ }));
+
+ form.add(new CommentInput("comment", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return getPullRequest().getDescription();
+ }
+
+ @Override
+ public void setObject(String object) {
+ getPullRequest().setDescription(object);
+ }
+
+ }) {
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new DepotAttachmentSupport(getDepot(), getPullRequest().getUUID());
+ }
+
+ @Override
+ protected Depot getDepot() {
+ return NewRequestPage.this.getDepot();
+ }
+
+ });
+
+ WebMarkupContainer assigneeContainer = new WebMarkupContainer("assignee");
+ form.add(assigneeContainer);
+ IModel<Account> assigneeModel = new PropertyModel<>(getPullRequest(), "assignee");
+ AssigneeChoice assigneeChoice = new AssigneeChoice("assignee", depotModel, assigneeModel);
+ assigneeChoice.setRequired(true);
+ assigneeContainer.add(assigneeChoice);
+
+ assigneeContainer.add(new NotificationPanel("feedback", assigneeChoice));
+
+ assigneeContainer.add(AttributeAppender.append("class", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return !assigneeChoice.isValid()?" has-error":"";
+ }
+
+ }));
+
+ WebMarkupContainer reviewersContainer = new WebMarkupContainer("reviewers") {
+
+ @Override
+ protected void onBeforeRender() {
+ super.onBeforeRender();
+ }
+
+ };
+ reviewersContainer.setOutputMarkupId(true);
+ form.add(reviewersContainer);
+ 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);
+ }
+
+ });
+ }
+
+ });
+
+ reviewersContainer.add(new ReviewerChoice("addReviewer", requestModel) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Account user) {
+ super.onSelect(target, user);
+
+ target.add(reviewersContainer);
+ }
+
+ });
+
+ reviewersContainer.add(new WebMarkupContainer("prePopulateHint") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getPullRequest().getStatus() == Status.PENDING_APPROVAL);
+ }
+
+ });
+
+ return fragment;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new NewRequestResourceReference()));
+ }
+
+ @Override
+ protected void onDetach() {
+ commitsModel.detach();
+ requestModel.detach();
+
+ super.onDetach();
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Depot depot) {
+ setResponsePage(RequestListPage.class, paramsOf(depot));
+ }
+
+ @Override
+ public CommentPos getMark() {
+ return mark;
+ }
+
+ @Override
+ public String getMarkUrl(CommentPos mark) {
+ RevisionComparePage.State state = new RevisionComparePage.State();
+ state.mark = mark;
+ state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());
+ state.rightSide = new DepotAndBranch(source.getDepot(), getPullRequest().getHeadCommitHash());
+ state.pathFilter = pathFilter;
+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
+ state.whitespaceOption = whitespaceOption;
+ state.compareWithMergeBase = false;
+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();
+ }
+
+ @Override
+ public CodeComment getOpenComment() {
+ if (commentId != null)
+ return GitPlex.getInstance(CodeCommentManager.class).load(commentId);
+ else
+ return null;
+ }
+
+ @Override
+ public void onCommentOpened(AjaxRequestTarget target, CodeComment comment) {
+ if (comment != null) {
+ commentId = comment.getId();
+ mark = comment.getCommentPos();
+ } else {
+ commentId = null;
+ }
+ }
+
+ @Override
+ public String getCommentUrl(CodeComment comment) {
+ RevisionComparePage.State state = new RevisionComparePage.State();
+ mark = comment.getCommentPos();
+ state.commentId = comment.getId();
+ state.leftSide = new DepotAndBranch(source.getDepot(), getPullRequest().getBaseCommitHash());
+ state.rightSide = new DepotAndBranch(source.getDepot(), getPullRequest().getHeadCommitHash());
+ state.pathFilter = pathFilter;
+ state.tabPanel = RevisionComparePage.TabPanel.CHANGES;
+ state.whitespaceOption = whitespaceOption;
+ state.compareWithMergeBase = false;
+ return urlFor(RevisionComparePage.class, RevisionComparePage.paramsOf(source.getDepot(), state)).toString();
+ }
+
+ @Override
+ public void onMark(AjaxRequestTarget target, CommentPos mark) {
+ this.mark = mark;
+ }
+
+ @Override
+ public void onAddComment(AjaxRequestTarget target, CommentPos mark) {
+ this.commentId = null;
+ this.mark = mark;
+ }
+
+ @Override
+ public String getAnchor() {
+ return null;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java
index 33087cbbf8..b316d01cb9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/NewRequestResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.newrequest;
+package com.gitplex.web.page.depot.pullrequest.newrequest;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/new-request.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/new-request.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/newrequest/new-request.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/newrequest/new-request.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
index 381e66a295..9e9396960a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ApprovalHintPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.component.comment.CodeCommentFilter;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
+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;
@SuppressWarnings("serial")
public class ApprovalHintPanel extends GenericPanel<PullRequest> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
index 5842370fe3..88d634e42d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/IntegrationHintPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
+package com.gitplex.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.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.web.component.comment.CodeCommentFilter;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
+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;
@SuppressWarnings("serial")
public class IntegrationHintPanel extends GenericPanel<PullRequest> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
index 749f9b9eb5..4d524a215c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/PullRequestOperation.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
+package com.gitplex.web.page.depot.pullrequest.requestdetail;
-import static com.pmease.gitplex.core.entity.PullRequest.Status.PENDING_INTEGRATE;
+import static com.gitplex.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.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.Status;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.PullRequestReviewManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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;
@SuppressWarnings("serial")
public enum PullRequestOperation {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
index 94a23bf1a0..e2edaf3929 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailPage.java
@@ -1,17 +1,17 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
-
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_IF_NECESSARY;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.APPROVE;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.DISCARD;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.INTEGRATE;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.REOPEN;
-import static com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH;
+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;
import java.util.ArrayList;
import java.util.Collection;
@@ -55,42 +55,42 @@ 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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.wicket.WicketUtils;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.PageTabLink;
-import com.pmease.commons.wicket.component.tabbable.Tab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
-import com.pmease.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.Status;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.manager.VisitInfoManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.BranchLink;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.component.pullrequest.verificationstatus.VerificationStatusPanel;
-import com.pmease.gitplex.web.model.EntityModel;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview.IntegrationPreviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.util.DateUtils;
-import com.pmease.gitplex.web.websocket.PullRequestChanged;
-import com.pmease.gitplex.web.websocket.PullRequestChangedRegion;
+import com.gitplex.commons.hibernate.dao.Dao;
+import com.gitplex.commons.wicket.WicketUtils;
+import com.gitplex.commons.wicket.behavior.markdown.AttachmentSupport;
+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.Tab;
+import com.gitplex.commons.wicket.component.tabbable.Tabbable;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java
index 29e21dc995..0f44ec1a76 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/RequestDetailResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
+package com.gitplex.web.page.depot.pullrequest.requestdetail;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
index 3492fe2dc7..1fa45f4ae9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ResolveConflictInstructionPanel.java
@@ -1,9 +1,9 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
+package com.gitplex.web.page.depot.pullrequest.requestdetail;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_ALWAYS;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.MERGE_WITH_SQUASH;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_SOURCE_ONTO_TARGET;
-import static com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy.REBASE_TARGET_ONTO_SOURCE;
+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 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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
+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;
@SuppressWarnings("serial")
class ResolveConflictInstructionPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
index a21520d384..7cbf8390ec 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/UpdateChangesLink.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail;
+package com.gitplex.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.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
+import com.gitplex.core.entity.PullRequestUpdate;
+import com.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
@SuppressWarnings("serial")
public class UpdateChangesLink extends BookmarkablePageLink<Void> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ajax-indicator.gif b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ajax-indicator.gif
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/ajax-indicator.gif
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/ajax-indicator.gif
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
index ae49be447c..a6bc171aff 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.changes;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -32,27 +32,27 @@ 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.pmease.commons.git.GitUtils;
-import com.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.commons.wicket.behavior.AbstractPostAjaxBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.support.CodeCommentActivity;
-import com.pmease.gitplex.core.entity.support.CommentPos;
-import com.pmease.gitplex.core.manager.CodeCommentManager;
-import com.pmease.gitplex.web.component.diff.revision.CommentSupport;
-import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.websocket.CodeCommentChangedRegion;
-import com.pmease.gitplex.web.websocket.PullRequestChanged;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.lang.diff.WhitespaceOption;
+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;
@SuppressWarnings("serial")
public class RequestChangesPage extends RequestDetailPage implements CommentSupport {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java
index 9979880e3b..a3bff6a1f2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/RequestChangesResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes;
+package com.gitplex.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.pmease.gitplex.web.page.base.BaseDependentResourceReference;
+import com.gitplex.web.page.base.BaseDependentResourceReference;
public class RequestChangesResourceReference extends BaseDependentResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.js b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.js
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.js
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/changes/request-changes.js
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
similarity index 79%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
index 5883c58d05..a610aa0714 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.codecomments;
+package com.gitplex.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.pmease.gitplex.core.entity.CodeComment;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.web.component.comment.CodeCommentAware;
-import com.pmease.gitplex.web.component.comment.CodeCommentFilter;
-import com.pmease.gitplex.web.component.comment.CodeCommentListPanel;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
+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;
@SuppressWarnings("serial")
public class RequestCodeCommentsPage extends RequestDetailPage implements CodeCommentAware {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
index 4ea8406433..4b1efbab16 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview;
+package com.gitplex.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.pmease.commons.lang.diff.WhitespaceOption;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.IntegrationPreview;
-import com.pmease.gitplex.web.component.diff.revision.RevisionDiffPanel;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.websocket.PullRequestChanged;
+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;
@SuppressWarnings("serial")
public class IntegrationPreviewPage extends RequestDetailPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java
index cf87c8619c..7709de7a61 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/IntegrationPreviewResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.integrationpreview;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/integrationpreview/integration-preview.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java
index 3266475eaf..1dc327ba7b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/PullRequestActivity.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;
import java.io.Serializable;
import java.util.Date;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
index 63dffbca57..d5a2afa968 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;
import java.util.ArrayList;
import java.util.Arrays;
@@ -33,46 +33,46 @@ 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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.wicket.ConfirmOnClick;
-import com.pmease.commons.wicket.behavior.TooltipBehavior;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequest.IntegrationStrategy;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.entity.PullRequestReference;
-import com.pmease.gitplex.core.entity.PullRequestReview;
-import com.pmease.gitplex.core.entity.PullRequestReviewInvitation;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.core.entity.PullRequestWatch;
-import com.pmease.gitplex.core.manager.PullRequestCommentManager;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.security.ObjectPermission;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.component.pullrequest.requestassignee.AssigneeChoice;
-import com.pmease.gitplex.web.component.pullrequest.requestreviewer.ReviewerAvatar;
-import com.pmease.gitplex.web.component.pullrequest.requestreviewer.ReviewerChoice;
-import com.pmease.gitplex.web.component.pullrequest.reviewresult.ReviewResultIcon;
-import com.pmease.gitplex.web.model.EntityModel;
-import com.pmease.gitplex.web.model.ReviewersModel;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.RequestDetailPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.RequestCommentDeleted;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.CommentedActivity;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.OpenedActivity;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.ReferencedActivity;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.StatusChangeActivity;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity.UpdatedActivity;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.RequestListPage;
-import com.pmease.gitplex.web.websocket.PullRequestChanged;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java
similarity index 80%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java
index 4d5cbe7c3b..82f01afbb8 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.overview;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
index 766244df26..1dc9fa1bc6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/SinceChangesLink.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview;
+package com.gitplex.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.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.changes.RequestChangesPage;
-import com.pmease.gitplex.web.websocket.PullRequestChanged;
+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;
@SuppressWarnings("serial")
public class SinceChangesLink extends BookmarkablePageLink<Void> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
index 89472df384..65014aceb5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedActivity.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.manager.PullRequestCommentManager;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
+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;
@SuppressWarnings("serial")
public class CommentedActivity implements PullRequestActivity {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
index 03af5b20de..ec050fec72 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/CommentedPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.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.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmListener;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestComment;
-import com.pmease.gitplex.core.manager.PullRequestCommentManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;
-import com.pmease.gitplex.web.util.DateUtils;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
similarity index 70%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
index 70a5a7286b..b0ea49edc1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedActivity.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
+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;
@SuppressWarnings("serial")
public class OpenedActivity implements PullRequestActivity {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
index c5ee58c421..1054964918 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/OpenedPanel.java
@@ -1,183 +1,183 @@
-package com.pmease.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.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.Model;
-import org.hibernate.StaleStateException;
-
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.manager.PullRequestManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.util.DateUtils;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-
-@SuppressWarnings("serial")
-class OpenedPanel extends GenericPanel<PullRequest> {
-
- public OpenedPanel(String id, IModel<PullRequest> model) {
- super(id, model);
- }
-
- private Component newViewer() {
- Fragment viewer = new Fragment("body", "viewFrag", this);
-
- String description = getPullRequest().getDescription();
- if (StringUtils.isNotBlank(description)) {
- MarkdownEditSupport editSupport;
- if (SecurityUtils.canModify(getPullRequest())) {
- editSupport = new MarkdownEditSupport() {
-
- @Override
- public void setContent(String content) {
- getPullRequest().setDescription(content);
- GitPlex.getInstance(PullRequestManager.class).save(getPullRequest());
- }
-
- @Override
- public long getVersion() {
- return getPullRequest().getVersion();
- }
-
- };
- } else {
- editSupport = null;
- }
- viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return getPullRequest().getDescription();
- }
-
- }, editSupport));
- } else {
- viewer.add(new Label("content", "<i>No description</i>").setEscapeModelStrings(false));
- }
-
- WebMarkupContainer actions = new WebMarkupContainer("actions");
- actions.setVisible(SecurityUtils.canModify(getPullRequest()));
- actions.add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Fragment editor = new Fragment("body", "editFrag", OpenedPanel.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 = getPullRequest().getVersion();
- CommentInput input = new CommentInput("input", Model.of(getPullRequest().getDescription())) {
-
- @Override
- protected AttachmentSupport getAttachmentSupport() {
- return new DepotAttachmentSupport(getPullRequest().getTargetDepot(),
- getPullRequest().getUUID());
- }
-
- @Override
- protected Depot getDepot() {
- return getPullRequest().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 (getPullRequest().getVersion() != lastVersion)
- throw new StaleStateException("");
- getPullRequest().setDescription(input.getModelObject());
- GitPlex.getInstance(Dao.class).persist(getPullRequest());
-
- 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();
-
- add(new AccountLink("user", getPullRequest().getSubmitter()));
- add(new Label("age", DateUtils.formatAge(getPullRequest().getSubmitDate())));
-
- add(newViewer());
- }
-
- private PullRequest getPullRequest() {
- return getModelObject();
- }
-
-}
+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.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.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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
+@SuppressWarnings("serial")
+class OpenedPanel extends GenericPanel<PullRequest> {
+
+ public OpenedPanel(String id, IModel<PullRequest> model) {
+ super(id, model);
+ }
+
+ private Component newViewer() {
+ Fragment viewer = new Fragment("body", "viewFrag", this);
+
+ String description = getPullRequest().getDescription();
+ if (StringUtils.isNotBlank(description)) {
+ MarkdownEditSupport editSupport;
+ if (SecurityUtils.canModify(getPullRequest())) {
+ editSupport = new MarkdownEditSupport() {
+
+ @Override
+ public void setContent(String content) {
+ getPullRequest().setDescription(content);
+ GitPlex.getInstance(PullRequestManager.class).save(getPullRequest());
+ }
+
+ @Override
+ public long getVersion() {
+ return getPullRequest().getVersion();
+ }
+
+ };
+ } else {
+ editSupport = null;
+ }
+ viewer.add(new MarkdownPanel("content", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return getPullRequest().getDescription();
+ }
+
+ }, editSupport));
+ } else {
+ viewer.add(new Label("content", "<i>No description</i>").setEscapeModelStrings(false));
+ }
+
+ WebMarkupContainer actions = new WebMarkupContainer("actions");
+ actions.setVisible(SecurityUtils.canModify(getPullRequest()));
+ actions.add(new AjaxLink<Void>("edit") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Fragment editor = new Fragment("body", "editFrag", OpenedPanel.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 = getPullRequest().getVersion();
+ CommentInput input = new CommentInput("input", Model.of(getPullRequest().getDescription())) {
+
+ @Override
+ protected AttachmentSupport getAttachmentSupport() {
+ return new DepotAttachmentSupport(getPullRequest().getTargetDepot(),
+ getPullRequest().getUUID());
+ }
+
+ @Override
+ protected Depot getDepot() {
+ return getPullRequest().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 (getPullRequest().getVersion() != lastVersion)
+ throw new StaleStateException("");
+ getPullRequest().setDescription(input.getModelObject());
+ GitPlex.getInstance(Dao.class).persist(getPullRequest());
+
+ 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();
+
+ add(new AccountLink("user", getPullRequest().getSubmitter()));
+ add(new Label("age", DateUtils.formatAge(getPullRequest().getSubmitDate())));
+
+ add(newViewer());
+ }
+
+ private PullRequest getPullRequest() {
+ return getModelObject();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
index ceb474c67f..f151596d73 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedActivity.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequestReference;
-import com.pmease.gitplex.core.manager.PullRequestReferenceManager;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
+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;
@SuppressWarnings("serial")
public class ReferencedActivity implements PullRequestActivity {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
index cf40581dfd..b698da19c3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/ReferencedPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+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;
@@ -6,13 +6,13 @@ import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestReference;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.pullrequest.requeststatus.RequestStatusPanel;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.util.DateUtils;
+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> {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
similarity index 59%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
index e4fa3bef62..29532dfd69 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import com.pmease.commons.wicket.AjaxEvent;
+import com.gitplex.commons.wicket.AjaxEvent;
public class RequestCommentDeleted extends AjaxEvent {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
similarity index 72%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
index 0dbc18a304..ce6835951a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
+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;
@SuppressWarnings("serial")
public class StatusChangeActivity implements PullRequestActivity {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
index d1ffe20a8f..53b5ba046e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/StatusChangePanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
@@ -18,22 +18,22 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.hibernate.StaleStateException;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmLeaveListener;
-import com.pmease.commons.wicket.behavior.markdown.AttachmentSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownEditSupport;
-import com.pmease.commons.wicket.component.markdown.MarkdownPanel;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestStatusChange;
-import com.pmease.gitplex.core.manager.PullRequestStatusChangeManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.comment.CommentInput;
-import com.pmease.gitplex.web.component.comment.DepotAttachmentSupport;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.SinceChangesLink;
-import com.pmease.gitplex.web.util.DateUtils;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
index 0381f13be0..bc24b9f378 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedActivity.java
@@ -1,14 +1,14 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.activity;
+package com.gitplex.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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.PullRequestActivity;
+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;
@SuppressWarnings("serial")
public class UpdatedActivity implements PullRequestActivity {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
index 6820d91bb4..8bfcb0afef 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/activity/UpdatedPanel.java
@@ -1,150 +1,150 @@
-package com.pmease.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.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.PullRequestUpdate;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.commitmessage.ExpandableCommitMessagePanel;
-import com.pmease.gitplex.web.component.pullrequest.verificationstatus.VerificationStatusPanel;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.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();
- }
-
-}
+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();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/request-overview.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/request-overview.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/overview/request-overview.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/overview/request-overview.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/request-detail.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/request-detail.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestdetail/request-detail.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestdetail/request-detail.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java
index 1c356969a6..0bd9ce1e3c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListPage.java
@@ -1,438 +1,438 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestlist;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-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.AbstractLink;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
-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.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.wicket.component.menu.MenuItem;
-import com.pmease.commons.wicket.component.menu.MenuLink;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.BranchLink;
-import com.pmease.gitplex.web.component.pullrequest.requeststatus.RequestStatusPanel;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.newrequest.NewRequestPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestdetail.overview.RequestOverviewPage;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.SearchOption.Direction;
-import com.pmease.gitplex.web.page.depot.pullrequest.requestlist.SearchOption.Status;
-import com.pmease.gitplex.web.util.DateUtils;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
-
-@SuppressWarnings("serial")
-public class RequestListPage extends DepotPage {
-
- private static final Map<SortOption, String> sortNames = new LinkedHashMap<>();
-
- static {
- sortNames.put(new SortOption("submitDate", false), "Newest");
- sortNames.put(new SortOption("submitDate", true), "Oldest");
- sortNames.put(new SortOption("lastEventDate", false), "Recently updated");
- sortNames.put(new SortOption("lastEventDate", true), "Least recently updated");
- }
-
- private SearchOption searchOption;
-
- private SortOption sortOption;
-
- public RequestListPage(PageParameters params) {
- super(params);
-
- searchOption = new SearchOption(params);
- sortOption = new SortOption(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new MenuLink("filters") {
-
- @Override
- protected List<MenuItem> getMenuItems() {
- List<MenuItem> menuItems = new ArrayList<>();
-
- Account currentUser = GitPlex.getInstance(AccountManager.class).getCurrent();
- if (currentUser != null) {
- final String userName = currentUser.getName();
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "Open requests assigned to me";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new Link<Void>(id) {
-
- @Override
- public void onClick() {
- searchOption = new SearchOption();
- searchOption.setStatus(Status.OPEN);
- searchOption.setAssigneeName(userName);
-
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- }
-
- });
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "Open requests submitted by me";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new Link<Void>(id) {
-
- @Override
- public void onClick() {
- searchOption = new SearchOption();
- searchOption.setStatus(Status.OPEN);
- searchOption.setSubmitterName(userName);
-
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- }
-
- });
- }
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "All open requests";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new Link<Void>(id) {
-
- @Override
- public void onClick() {
- searchOption = new SearchOption();
- searchOption.setStatus(Status.OPEN);
-
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- }
-
- });
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "Incoming open requests";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new Link<Void>(id) {
-
- @Override
- public void onClick() {
- searchOption = new SearchOption();
- searchOption.setDirection(Direction.INCOMING);
- searchOption.setStatus(Status.OPEN);
-
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- }
-
- });
- menuItems.add(new MenuItem() {
-
- @Override
- public String getIconClass() {
- return null;
- }
-
- @Override
- public String getLabel() {
- return "Outgoing open requests";
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new Link<Void>(id) {
-
- @Override
- public void onClick() {
- searchOption = new SearchOption();
- searchOption.setDirection(Direction.OUTGOING);
- searchOption.setStatus(Status.OPEN);
-
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- }
-
- });
- return menuItems;
- }
-
- });
-
- add(new MenuLink("sortBy") {
-
- @Override
- protected List<MenuItem> getMenuItems() {
- List<MenuItem> menuItems = new ArrayList<>();
-
- for (Map.Entry<SortOption, String> entry: sortNames.entrySet()) {
- final SortOption sortOption = entry.getKey();
- final String displayName = entry.getValue();
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return displayName;
- }
-
- @Override
- public String getIconClass() {
- if (RequestListPage.this.sortOption.equals(sortOption))
- return "fa fa-check";
- else
- return null;
- }
-
- @Override
- public AbstractLink newLink(String id) {
- return new Link<Void>(id) {
-
- @Override
- public void onClick() {
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- }
-
- });
- }
-
- return menuItems;
- }
-
- });
-
- add(new Link<Void>("newRequest") {
-
- @Override
- public void onClick() {
- DepotPage page = (DepotPage) getPage();
- setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(page.getDepot()));
- }
-
- });
-
- Form<?> form = new Form<Void>("filterForm") {
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
-
- setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
- }
-
- };
- form.add(BeanContext.editBean("editor", searchOption));
- add(form);
-
- List<IColumn<PullRequest, Void>> columns = new ArrayList<>();
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Pull Request")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem,
- String componentId, final IModel<PullRequest> rowModel) {
- PullRequest request = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "requestFrag", RequestListPage.this);
- fragment.add(new Label("number", "#" + request.getNumber()));
- fragment.add(new BookmarkablePageLink<Void>("title", RequestOverviewPage.class,
- RequestOverviewPage.paramsOf(request)) {
-
- @Override
- public IModel<?> getBody() {
- return Model.of(rowModel.getObject().getTitle());
- }
-
- });
-
- fragment.add(new RequestStatusPanel("status", rowModel, false));
- fragment.add(new AccountLink("submitter", rowModel.getObject().getSubmitter()));
- fragment.add(new BranchLink("target", request.getTarget()));
- if (request.getSource() != null)
- fragment.add(new BranchLink("source", request.getSource()));
- else
- fragment.add(new Label("source").setVisible(false));
-
- fragment.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));
-
- WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");
- if (request.getLastEvent() != null) {
- if (request.getLastEvent().getUser() != null)
- lastEventContainer.add(new AccountLink("user", request.getLastEvent().getUser()));
- else
- lastEventContainer.add(new WebMarkupContainer("user").setVisible(false));
- String description = request.getLastEvent().getType();
- lastEventContainer.add(new Label("description", description));
- lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getLastEvent().getDate())));
- } else {
- lastEventContainer.add(new WebMarkupContainer("user"));
- lastEventContainer.add(new WebMarkupContainer("description"));
- lastEventContainer.add(new WebMarkupContainer("date"));
- lastEventContainer.setVisible(false);
- }
- fragment.add(lastEventContainer);
-
- cellItem.add(fragment);
-
- Date lastActivityDate;
- if (request.getLastEvent() != null)
- lastActivityDate = request.getLastEvent().getDate();
- else
- lastActivityDate = request.getSubmitDate();
- cellItem.add(AttributeAppender.append("class",
- request.isVisitedAfter(lastActivityDate)?"request":"request new"));
- }
-
- });
-
- IDataProvider<PullRequest> dataProvider = new IDataProvider<PullRequest>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Iterator<? extends PullRequest> iterator(long first, long count) {
- DepotPage page = (DepotPage) getPage();
-
- EntityCriteria<PullRequest> criteria = searchOption.getCriteria(page.getDepot());
- criteria.addOrder(sortOption.getOrder());
- return GitPlex.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();
- }
-
- @Override
- public long size() {
- DepotPage page = (DepotPage) getPage();
- return GitPlex.getInstance(Dao.class).count(searchOption.getCriteria(page.getDepot()));
- }
-
- @Override
- public IModel<PullRequest> model(PullRequest object) {
- final Long pullRequestId = object.getId();
- return new LoadableDetachableModel<PullRequest>() {
-
- @Override
- protected PullRequest load() {
- return GitPlex.getInstance(Dao.class).load(PullRequest.class, pullRequestId);
- }
-
- };
- }
-
- };
- DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,
- dataProvider, Constants.DEFAULT_PAGE_SIZE);
- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
- dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
-
- @Override
- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
- return new BootstrapPagingNavigator(navigatorId, dataTable);
- }
-
- });
- add(dataTable);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new RequestListResourceReference()));
- }
-
- public static PageParameters paramsOf(Depot depot, SearchOption searchOption, SortOption sortOption) {
- PageParameters params = paramsOf(depot);
- searchOption.fillPageParams(params);
- sortOption.fillPageParams(params);
- return params;
- }
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Depot depot) {
- setResponsePage(RequestListPage.class, paramsOf(depot));
- }
-
-}
+package com.gitplex.web.page.depot.pullrequest.requestlist;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+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.AbstractLink;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+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.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 de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator;
+
+@SuppressWarnings("serial")
+public class RequestListPage extends DepotPage {
+
+ private static final Map<SortOption, String> sortNames = new LinkedHashMap<>();
+
+ static {
+ sortNames.put(new SortOption("submitDate", false), "Newest");
+ sortNames.put(new SortOption("submitDate", true), "Oldest");
+ sortNames.put(new SortOption("lastEventDate", false), "Recently updated");
+ sortNames.put(new SortOption("lastEventDate", true), "Least recently updated");
+ }
+
+ private SearchOption searchOption;
+
+ private SortOption sortOption;
+
+ public RequestListPage(PageParameters params) {
+ super(params);
+
+ searchOption = new SearchOption(params);
+ sortOption = new SortOption(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new MenuLink("filters") {
+
+ @Override
+ protected List<MenuItem> getMenuItems() {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ Account currentUser = GitPlex.getInstance(AccountManager.class).getCurrent();
+ if (currentUser != null) {
+ final String userName = currentUser.getName();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "Open requests assigned to me";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ searchOption = new SearchOption();
+ searchOption.setStatus(Status.OPEN);
+ searchOption.setAssigneeName(userName);
+
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ }
+
+ });
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "Open requests submitted by me";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ searchOption = new SearchOption();
+ searchOption.setStatus(Status.OPEN);
+ searchOption.setSubmitterName(userName);
+
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ }
+
+ });
+ }
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "All open requests";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ searchOption = new SearchOption();
+ searchOption.setStatus(Status.OPEN);
+
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ }
+
+ });
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "Incoming open requests";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ searchOption = new SearchOption();
+ searchOption.setDirection(Direction.INCOMING);
+ searchOption.setStatus(Status.OPEN);
+
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ }
+
+ });
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getIconClass() {
+ return null;
+ }
+
+ @Override
+ public String getLabel() {
+ return "Outgoing open requests";
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ searchOption = new SearchOption();
+ searchOption.setDirection(Direction.OUTGOING);
+ searchOption.setStatus(Status.OPEN);
+
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
+ }
+
+ });
+
+ add(new MenuLink("sortBy") {
+
+ @Override
+ protected List<MenuItem> getMenuItems() {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ for (Map.Entry<SortOption, String> entry: sortNames.entrySet()) {
+ final SortOption sortOption = entry.getKey();
+ final String displayName = entry.getValue();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return displayName;
+ }
+
+ @Override
+ public String getIconClass() {
+ if (RequestListPage.this.sortOption.equals(sortOption))
+ return "fa fa-check";
+ else
+ return null;
+ }
+
+ @Override
+ public AbstractLink newLink(String id) {
+ return new Link<Void>(id) {
+
+ @Override
+ public void onClick() {
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ }
+
+ });
+ }
+
+ return menuItems;
+ }
+
+ });
+
+ add(new Link<Void>("newRequest") {
+
+ @Override
+ public void onClick() {
+ DepotPage page = (DepotPage) getPage();
+ setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(page.getDepot()));
+ }
+
+ });
+
+ Form<?> form = new Form<Void>("filterForm") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+
+ setResponsePage(RequestListPage.class, paramsOf(getDepot(), searchOption, sortOption));
+ }
+
+ };
+ form.add(BeanContext.editBean("editor", searchOption));
+ add(form);
+
+ List<IColumn<PullRequest, Void>> columns = new ArrayList<>();
+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Pull Request")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem,
+ String componentId, final IModel<PullRequest> rowModel) {
+ PullRequest request = rowModel.getObject();
+ Fragment fragment = new Fragment(componentId, "requestFrag", RequestListPage.this);
+ fragment.add(new Label("number", "#" + request.getNumber()));
+ fragment.add(new BookmarkablePageLink<Void>("title", RequestOverviewPage.class,
+ RequestOverviewPage.paramsOf(request)) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(rowModel.getObject().getTitle());
+ }
+
+ });
+
+ fragment.add(new RequestStatusPanel("status", rowModel, false));
+ fragment.add(new AccountLink("submitter", rowModel.getObject().getSubmitter()));
+ fragment.add(new BranchLink("target", request.getTarget()));
+ if (request.getSource() != null)
+ fragment.add(new BranchLink("source", request.getSource()));
+ else
+ fragment.add(new Label("source").setVisible(false));
+
+ fragment.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));
+
+ WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");
+ if (request.getLastEvent() != null) {
+ if (request.getLastEvent().getUser() != null)
+ lastEventContainer.add(new AccountLink("user", request.getLastEvent().getUser()));
+ else
+ lastEventContainer.add(new WebMarkupContainer("user").setVisible(false));
+ String description = request.getLastEvent().getType();
+ lastEventContainer.add(new Label("description", description));
+ lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getLastEvent().getDate())));
+ } else {
+ lastEventContainer.add(new WebMarkupContainer("user"));
+ lastEventContainer.add(new WebMarkupContainer("description"));
+ lastEventContainer.add(new WebMarkupContainer("date"));
+ lastEventContainer.setVisible(false);
+ }
+ fragment.add(lastEventContainer);
+
+ cellItem.add(fragment);
+
+ Date lastActivityDate;
+ if (request.getLastEvent() != null)
+ lastActivityDate = request.getLastEvent().getDate();
+ else
+ lastActivityDate = request.getSubmitDate();
+ cellItem.add(AttributeAppender.append("class",
+ request.isVisitedAfter(lastActivityDate)?"request":"request new"));
+ }
+
+ });
+
+ IDataProvider<PullRequest> dataProvider = new IDataProvider<PullRequest>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Iterator<? extends PullRequest> iterator(long first, long count) {
+ DepotPage page = (DepotPage) getPage();
+
+ EntityCriteria<PullRequest> criteria = searchOption.getCriteria(page.getDepot());
+ criteria.addOrder(sortOption.getOrder());
+ return GitPlex.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();
+ }
+
+ @Override
+ public long size() {
+ DepotPage page = (DepotPage) getPage();
+ return GitPlex.getInstance(Dao.class).count(searchOption.getCriteria(page.getDepot()));
+ }
+
+ @Override
+ public IModel<PullRequest> model(PullRequest object) {
+ final Long pullRequestId = object.getId();
+ return new LoadableDetachableModel<PullRequest>() {
+
+ @Override
+ protected PullRequest load() {
+ return GitPlex.getInstance(Dao.class).load(PullRequest.class, pullRequestId);
+ }
+
+ };
+ }
+
+ };
+ DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,
+ dataProvider, Constants.DEFAULT_PAGE_SIZE);
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
+ dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {
+
+ @Override
+ protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {
+ return new BootstrapPagingNavigator(navigatorId, dataTable);
+ }
+
+ });
+ add(dataTable);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(CssHeaderItem.forReference(new RequestListResourceReference()));
+ }
+
+ public static PageParameters paramsOf(Depot depot, SearchOption searchOption, SortOption sortOption) {
+ PageParameters params = paramsOf(depot);
+ searchOption.fillPageParams(params);
+ sortOption.fillPageParams(params);
+ return params;
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Depot depot) {
+ setResponsePage(RequestListPage.class, paramsOf(depot));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java
index 5c643a5c9d..5ff9840c60 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/RequestListResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestlist;
+package com.gitplex.web.page.depot.pullrequest.requestlist;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java
index 93ab4eb2ff..fbed906fdc 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SearchOption.java
@@ -1,226 +1,226 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestlist;
-
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofSource;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofSourceDepot;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofTarget;
-import static com.pmease.gitplex.core.entity.PullRequest.CriterionHelper.ofTargetDepot;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import javax.validation.constraints.NotNull;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.hibernate.criterion.Restrictions;
-
-import com.pmease.commons.hibernate.dao.EntityCriteria;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.annotation.AccountChoice;
-import com.pmease.gitplex.core.annotation.BranchChoice;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.PullRequest;
-import com.pmease.gitplex.core.entity.support.DepotAndBranch;
-
-@SuppressWarnings("serial")
-@Editable
-public class SearchOption implements Serializable {
-
- private static final String PARAM_DIRECTION = "direction";
-
- private static final String PARAM_STATUS = "status";
-
- private static final String PARAM_ASSIGNEE = "assignee";
-
- private static final String PARAM_SUBMITTER = "submitter";
-
- private static final String PARAM_BRANCH = "branch";
-
- private static final String PARAM_TITLE = "title";
-
- private static final String PARAM_BEGIN_DATE = "begin";
-
- private static final String PARAM_END_DATE = "end";
-
- public enum Direction {INCOMING, OUTGOING, ALL};
-
- public enum Status {OPEN, CLOSED, ALL};
-
- private Direction direction = Direction.ALL;
-
- private Status status = Status.OPEN;
-
- private String assigneeName;
-
- private String submitterName;
-
- private String branch;
-
- private String title;
-
- private Date beginDate;
-
- private Date endDate;
-
- @Editable(order=50)
- @NotNull
- public Direction getDirection() {
- return direction;
- }
-
- public void setDirection(Direction direction) {
- this.direction = direction;
- }
-
- @Editable(order=100)
- @NotNull
- public Status getStatus() {
- return status;
- }
-
- public void setStatus(Status status) {
- this.status = status;
- }
-
- @Editable(order=200, name="Assigned To")
- @AccountChoice
- public String getAssigneeName() {
- return assigneeName;
- }
-
- public void setAssigneeName(String assigneeName) {
- this.assigneeName = assigneeName;
- }
-
- @Editable(order=300, name="Submitted By")
- @AccountChoice
- public String getSubmitterName() {
- return submitterName;
- }
-
- public void setSubmitterName(String submitterName) {
- this.submitterName = submitterName;
- }
-
- @Editable(order=400, description="Target branch for incoming request, or source branch for outgoing request")
- @BranchChoice
- public String getBranch() {
- return branch;
- }
-
- public void setBranch(String branch) {
- this.branch = branch;
- }
-
- @Editable(order=500, name="Title Containing")
- public String getTitle() {
- return title;
- }
-
- public void setTitle(String title) {
- this.title = title;
- }
-
- @Editable(order=700, name="Submitted After", description="Date should be specified with format <i>yyyy-MM-dd</i>.")
- public Date getBeginDate() {
- return beginDate;
- }
-
- public void setBeginDate(Date beginDate) {
- this.beginDate = beginDate;
- }
-
- @Editable(order=800, name="Submitted Before", description="Date should be specified with format <i>yyyy-MM-dd</i>.")
- public Date getEndDate() {
- return endDate;
- }
-
- public void setEndDate(Date endDate) {
- this.endDate = endDate;
- }
-
- public SearchOption() {
- }
-
- public SearchOption(PageParameters params) {
- String value = params.get(PARAM_DIRECTION).toString();
- if (value != null)
- direction = Direction.valueOf(value);
-
- value = params.get(PARAM_STATUS).toString();
- if (value != null)
- status = Status.valueOf(value);
-
- assigneeName = params.get(PARAM_ASSIGNEE).toString();
-
- submitterName = params.get(PARAM_SUBMITTER).toString();
-
- branch = params.get(PARAM_BRANCH).toString();
- title = params.get(PARAM_TITLE).toString();
-
- value = params.get(PARAM_BEGIN_DATE).toString();
- if (value != null)
- beginDate = new Date(Long.valueOf(value));
-
- value = params.get(PARAM_END_DATE).toString();
- if (value != null)
- endDate = new Date(Long.valueOf(value));
- }
-
- public EntityCriteria<PullRequest> getCriteria(Depot depot) {
- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
- if (direction == Direction.INCOMING) {
- if (branch != null)
- criteria.add(ofTarget(new DepotAndBranch(depot, branch)));
- else
- criteria.add(ofTargetDepot(depot));
- } else if (direction == Direction.OUTGOING) {
- if (branch != null)
- criteria.add(ofSource(new DepotAndBranch(depot, branch)));
- else
- criteria.add(ofSourceDepot(depot));
- } else if (branch != null) {
- criteria.add(Restrictions.or(
- ofTarget(new DepotAndBranch(depot, branch)),
- ofSource(new DepotAndBranch(depot, branch))));
- } else {
- criteria.add(Restrictions.or(ofTargetDepot(depot), ofSourceDepot(depot)));
- }
-
- if (status == Status.OPEN)
- criteria.add(PullRequest.CriterionHelper.ofOpen());
- else if (status == Status.CLOSED)
- criteria.add(PullRequest.CriterionHelper.ofClosed());
-
- if (submitterName != null) {
- criteria.createCriteria("submitter").add(Restrictions.eq("name", submitterName));
- }
- if (assigneeName != null) {
- criteria.createCriteria("assignee").add(Restrictions.eq("name", assigneeName));
- }
- if (title != null)
- criteria.add(Restrictions.ilike("title", "%" + title + "%"));
- if (beginDate != null)
- criteria.add(Restrictions.ge("createDate", beginDate));
- if (endDate != null)
- criteria.add(Restrictions.le("createDate", endDate));
- return criteria;
- }
-
- public void fillPageParams(PageParameters params) {
- params.set(PARAM_DIRECTION, direction.name());
- params.set(PARAM_STATUS, status.name());
- if (assigneeName != null)
- params.set(PARAM_ASSIGNEE, assigneeName);
- if (submitterName != null)
- params.set(PARAM_SUBMITTER, submitterName);
- if (branch != null)
- params.set(PARAM_BRANCH, branch);
- if (title != null)
- params.set(PARAM_TITLE, title);
- if (beginDate != null)
- params.set(PARAM_BEGIN_DATE, beginDate.getTime());
- if (endDate != null)
- params.set(PARAM_END_DATE, endDate.getTime());
- }
-
-}
+package com.gitplex.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 java.io.Serializable;
+import java.util.Date;
+
+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;
+
+@SuppressWarnings("serial")
+@Editable
+public class SearchOption implements Serializable {
+
+ private static final String PARAM_DIRECTION = "direction";
+
+ private static final String PARAM_STATUS = "status";
+
+ private static final String PARAM_ASSIGNEE = "assignee";
+
+ private static final String PARAM_SUBMITTER = "submitter";
+
+ private static final String PARAM_BRANCH = "branch";
+
+ private static final String PARAM_TITLE = "title";
+
+ private static final String PARAM_BEGIN_DATE = "begin";
+
+ private static final String PARAM_END_DATE = "end";
+
+ public enum Direction {INCOMING, OUTGOING, ALL};
+
+ public enum Status {OPEN, CLOSED, ALL};
+
+ private Direction direction = Direction.ALL;
+
+ private Status status = Status.OPEN;
+
+ private String assigneeName;
+
+ private String submitterName;
+
+ private String branch;
+
+ private String title;
+
+ private Date beginDate;
+
+ private Date endDate;
+
+ @Editable(order=50)
+ @NotNull
+ public Direction getDirection() {
+ return direction;
+ }
+
+ public void setDirection(Direction direction) {
+ this.direction = direction;
+ }
+
+ @Editable(order=100)
+ @NotNull
+ public Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(Status status) {
+ this.status = status;
+ }
+
+ @Editable(order=200, name="Assigned To")
+ @AccountChoice
+ public String getAssigneeName() {
+ return assigneeName;
+ }
+
+ public void setAssigneeName(String assigneeName) {
+ this.assigneeName = assigneeName;
+ }
+
+ @Editable(order=300, name="Submitted By")
+ @AccountChoice
+ public String getSubmitterName() {
+ return submitterName;
+ }
+
+ public void setSubmitterName(String submitterName) {
+ this.submitterName = submitterName;
+ }
+
+ @Editable(order=400, description="Target branch for incoming request, or source branch for outgoing request")
+ @BranchChoice
+ public String getBranch() {
+ return branch;
+ }
+
+ public void setBranch(String branch) {
+ this.branch = branch;
+ }
+
+ @Editable(order=500, name="Title Containing")
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ @Editable(order=700, name="Submitted After", description="Date should be specified with format <i>yyyy-MM-dd</i>.")
+ public Date getBeginDate() {
+ return beginDate;
+ }
+
+ public void setBeginDate(Date beginDate) {
+ this.beginDate = beginDate;
+ }
+
+ @Editable(order=800, name="Submitted Before", description="Date should be specified with format <i>yyyy-MM-dd</i>.")
+ public Date getEndDate() {
+ return endDate;
+ }
+
+ public void setEndDate(Date endDate) {
+ this.endDate = endDate;
+ }
+
+ public SearchOption() {
+ }
+
+ public SearchOption(PageParameters params) {
+ String value = params.get(PARAM_DIRECTION).toString();
+ if (value != null)
+ direction = Direction.valueOf(value);
+
+ value = params.get(PARAM_STATUS).toString();
+ if (value != null)
+ status = Status.valueOf(value);
+
+ assigneeName = params.get(PARAM_ASSIGNEE).toString();
+
+ submitterName = params.get(PARAM_SUBMITTER).toString();
+
+ branch = params.get(PARAM_BRANCH).toString();
+ title = params.get(PARAM_TITLE).toString();
+
+ value = params.get(PARAM_BEGIN_DATE).toString();
+ if (value != null)
+ beginDate = new Date(Long.valueOf(value));
+
+ value = params.get(PARAM_END_DATE).toString();
+ if (value != null)
+ endDate = new Date(Long.valueOf(value));
+ }
+
+ public EntityCriteria<PullRequest> getCriteria(Depot depot) {
+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);
+ if (direction == Direction.INCOMING) {
+ if (branch != null)
+ criteria.add(ofTarget(new DepotAndBranch(depot, branch)));
+ else
+ criteria.add(ofTargetDepot(depot));
+ } else if (direction == Direction.OUTGOING) {
+ if (branch != null)
+ criteria.add(ofSource(new DepotAndBranch(depot, branch)));
+ else
+ criteria.add(ofSourceDepot(depot));
+ } else if (branch != null) {
+ criteria.add(Restrictions.or(
+ ofTarget(new DepotAndBranch(depot, branch)),
+ ofSource(new DepotAndBranch(depot, branch))));
+ } else {
+ criteria.add(Restrictions.or(ofTargetDepot(depot), ofSourceDepot(depot)));
+ }
+
+ if (status == Status.OPEN)
+ criteria.add(PullRequest.CriterionHelper.ofOpen());
+ else if (status == Status.CLOSED)
+ criteria.add(PullRequest.CriterionHelper.ofClosed());
+
+ if (submitterName != null) {
+ criteria.createCriteria("submitter").add(Restrictions.eq("name", submitterName));
+ }
+ if (assigneeName != null) {
+ criteria.createCriteria("assignee").add(Restrictions.eq("name", assigneeName));
+ }
+ if (title != null)
+ criteria.add(Restrictions.ilike("title", "%" + title + "%"));
+ if (beginDate != null)
+ criteria.add(Restrictions.ge("createDate", beginDate));
+ if (endDate != null)
+ criteria.add(Restrictions.le("createDate", endDate));
+ return criteria;
+ }
+
+ public void fillPageParams(PageParameters params) {
+ params.set(PARAM_DIRECTION, direction.name());
+ params.set(PARAM_STATUS, status.name());
+ if (assigneeName != null)
+ params.set(PARAM_ASSIGNEE, assigneeName);
+ if (submitterName != null)
+ params.set(PARAM_SUBMITTER, submitterName);
+ if (branch != null)
+ params.set(PARAM_BRANCH, branch);
+ if (title != null)
+ params.set(PARAM_TITLE, title);
+ if (beginDate != null)
+ params.set(PARAM_BEGIN_DATE, beginDate.getTime());
+ if (endDate != null)
+ params.set(PARAM_END_DATE, endDate.getTime());
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java
index 3f5f4d83c4..a20d75ef31 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/SortOption.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.pullrequest.requestlist;
+package com.gitplex.web.page.depot.pullrequest.requestlist;
import java.io.Serializable;
@@ -7,7 +7,7 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.hibernate.criterion.Order;
-import com.pmease.commons.util.WordUtils;
+import com.gitplex.commons.util.WordUtils;
public class SortOption implements Serializable {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/request-list.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/request-list.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/pullrequest/requestlist/request-list.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/pullrequest/requestlist/request-list.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.java
similarity index 73%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.java
index 384f98e21c..a47b99da8f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting;
+package com.gitplex.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.pmease.commons.wicket.component.tabbable.PageTab;
-import com.pmease.commons.wicket.component.tabbable.Tabbable;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotCollaboratorListPage;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotEffectivePrivilegePage;
-import com.pmease.gitplex.web.page.depot.setting.authorization.DepotTeamListPage;
-import com.pmease.gitplex.web.page.depot.setting.commitmessagetransform.CommitMessageTransformPage;
-import com.pmease.gitplex.web.page.depot.setting.gatekeeper.GateKeeperPage;
-import com.pmease.gitplex.web.page.depot.setting.general.GeneralSettingPage;
-import com.pmease.gitplex.web.page.depot.setting.integrationpolicy.IntegrationPolicyPage;
+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;
@SuppressWarnings("serial")
public abstract class DepotSettingPage extends DepotPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingResourceReference.java
index 5fb70e48d2..4abe07e811 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting;
+package com.gitplex.web.page.depot.setting;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTab.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTab.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTab.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTab.java
index c8b7ea520d..2e8e51c64d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTab.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTab.java
@@ -1,75 +1,75 @@
-package com.pmease.gitplex.web.page.depot.setting;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.model.Model;
-
-import com.pmease.commons.wicket.component.tabbable.PageTab;
-
-@SuppressWarnings("serial")
-public class DepotSettingTab extends PageTab {
-
- private final String iconClass;
-
- public DepotSettingTab(String title, String iconClass,
- Class<? extends DepotSettingPage> mainPageClass) {
- super(Model.of(title), mainPageClass);
- this.iconClass = iconClass;
- }
-
- public DepotSettingTab(String title, String iconClass,
- Class<? extends DepotSettingPage> mainPageClass,
- Class<? extends DepotSettingPage> additionalPageClass1) {
- super(Model.of(title), mainPageClass, additionalPageClass1);
- this.iconClass = iconClass;
- }
-
- public DepotSettingTab(String title, String iconClass,
- Class<? extends DepotSettingPage> mainPageClass,
- Class<? extends DepotSettingPage> additionalPageClass1,
- Class<? extends DepotSettingPage> additionalPageClass2) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);
- this.iconClass = iconClass;
- }
-
- public DepotSettingTab(String title, String iconClass,
- Class<? extends DepotSettingPage> mainPageClass,
- Class<? extends DepotSettingPage> additionalPageClass1,
- Class<? extends DepotSettingPage> additionalPageClass2,
- Class<? extends DepotSettingPage> additionalPageClass3) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);
- this.iconClass = iconClass;
- }
-
- public DepotSettingTab(String title, String iconClass,
- Class<? extends DepotSettingPage> mainPageClass,
- Class<? extends DepotSettingPage> additionalPageClass1,
- Class<? extends DepotSettingPage> additionalPageClass2,
- Class<? extends DepotSettingPage> additionalPageClass3,
- Class<? extends DepotSettingPage> additionalPageClass4) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,
- additionalPageClass3, additionalPageClass4);
- this.iconClass = iconClass;
- }
-
- public DepotSettingTab(String title, String iconClass,
- Class<? extends DepotSettingPage> mainPageClass,
- Class<? extends DepotSettingPage> additionalPageClass1,
- Class<? extends DepotSettingPage> additionalPageClass2,
- Class<? extends DepotSettingPage> additionalPageClass3,
- Class<? extends DepotSettingPage> additionalPageClass4,
- Class<? extends DepotSettingPage> additionalPageClass5) {
- super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,
- additionalPageClass3, additionalPageClass4, additionalPageClass5);
- this.iconClass = iconClass;
- }
-
- @Override
- public Component render(String componentId) {
- return new DepotSettingTabLink(componentId, this);
- }
-
- public String getIconClass() {
- return iconClass;
- }
-
-}
+package com.gitplex.web.page.depot.setting;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.Model;
+
+import com.gitplex.commons.wicket.component.tabbable.PageTab;
+
+@SuppressWarnings("serial")
+public class DepotSettingTab extends PageTab {
+
+ private final String iconClass;
+
+ public DepotSettingTab(String title, String iconClass,
+ Class<? extends DepotSettingPage> mainPageClass) {
+ super(Model.of(title), mainPageClass);
+ this.iconClass = iconClass;
+ }
+
+ public DepotSettingTab(String title, String iconClass,
+ Class<? extends DepotSettingPage> mainPageClass,
+ Class<? extends DepotSettingPage> additionalPageClass1) {
+ super(Model.of(title), mainPageClass, additionalPageClass1);
+ this.iconClass = iconClass;
+ }
+
+ public DepotSettingTab(String title, String iconClass,
+ Class<? extends DepotSettingPage> mainPageClass,
+ Class<? extends DepotSettingPage> additionalPageClass1,
+ Class<? extends DepotSettingPage> additionalPageClass2) {
+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2);
+ this.iconClass = iconClass;
+ }
+
+ public DepotSettingTab(String title, String iconClass,
+ Class<? extends DepotSettingPage> mainPageClass,
+ Class<? extends DepotSettingPage> additionalPageClass1,
+ Class<? extends DepotSettingPage> additionalPageClass2,
+ Class<? extends DepotSettingPage> additionalPageClass3) {
+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2, additionalPageClass3);
+ this.iconClass = iconClass;
+ }
+
+ public DepotSettingTab(String title, String iconClass,
+ Class<? extends DepotSettingPage> mainPageClass,
+ Class<? extends DepotSettingPage> additionalPageClass1,
+ Class<? extends DepotSettingPage> additionalPageClass2,
+ Class<? extends DepotSettingPage> additionalPageClass3,
+ Class<? extends DepotSettingPage> additionalPageClass4) {
+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,
+ additionalPageClass3, additionalPageClass4);
+ this.iconClass = iconClass;
+ }
+
+ public DepotSettingTab(String title, String iconClass,
+ Class<? extends DepotSettingPage> mainPageClass,
+ Class<? extends DepotSettingPage> additionalPageClass1,
+ Class<? extends DepotSettingPage> additionalPageClass2,
+ Class<? extends DepotSettingPage> additionalPageClass3,
+ Class<? extends DepotSettingPage> additionalPageClass4,
+ Class<? extends DepotSettingPage> additionalPageClass5) {
+ super(Model.of(title), mainPageClass, additionalPageClass1, additionalPageClass2,
+ additionalPageClass3, additionalPageClass4, additionalPageClass5);
+ this.iconClass = iconClass;
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new DepotSettingTabLink(componentId, this);
+ }
+
+ public String getIconClass() {
+ return iconClass;
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTabLink.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTabLink.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTabLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTabLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.java
index d9209ae5bd..aaae92fd91 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/DepotSettingTabLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/DepotSettingTabLink.java
@@ -1,33 +1,33 @@
-package com.pmease.gitplex.web.page.depot.setting;
-
-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.link.Link;
-import org.apache.wicket.markup.html.panel.Panel;
-
-@SuppressWarnings("serial")
-public class DepotSettingTabLink extends Panel {
-
- private final DepotSettingTab tab;
-
- public DepotSettingTabLink(String id, DepotSettingTab tab) {
- super(id);
-
- this.tab = tab;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- DepotSettingPage page = (DepotSettingPage) getPage();
- Link<Void> link = new BookmarkablePageLink<Void>("link",
- tab.getMainPageClass(), DepotSettingPage.paramsOf(page.getDepot()));
- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));
- link.add(new Label("label", tab.getTitleModel()));
- add(link);
- }
-
-}
+package com.gitplex.web.page.depot.setting;
+
+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.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+
+@SuppressWarnings("serial")
+public class DepotSettingTabLink extends Panel {
+
+ private final DepotSettingTab tab;
+
+ public DepotSettingTabLink(String id, DepotSettingTab tab) {
+ super(id);
+
+ this.tab = tab;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ DepotSettingPage page = (DepotSettingPage) getPage();
+ Link<Void> link = new BookmarkablePageLink<Void>("link",
+ tab.getMainPageClass(), DepotSettingPage.paramsOf(page.getDepot()));
+ link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", tab.getIconClass())));
+ link.add(new Label("label", tab.getTitleModel()));
+ add(link);
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
index 05b5602d9c..9528cf1b75 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotCollaboratorListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.authorization;
+package com.gitplex.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.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.UserAuthorizationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.accountchoice.AbstractAccountChoiceProvider;
-import com.pmease.gitplex.web.component.accountchoice.AccountChoiceResourceReference;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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 {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
index 4e89997091..e54efddd5f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotEffectivePrivilegePage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.authorization;
+package com.gitplex.web.page.depot.setting.authorization;
import java.util.ArrayList;
import java.util.Collection;
@@ -20,22 +20,22 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.entity.UserAuthorization;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorDepotListPage;
-import com.pmease.gitplex.web.page.account.collaborators.CollaboratorPrivilegeSourcePage;
-import com.pmease.gitplex.web.page.account.members.MemberEffectivePrivilegePage;
-import com.pmease.gitplex.web.page.account.members.MemberPrivilegeSourcePage;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java
index c0f1c3c2d8..46d8cb6d82 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/authorization/DepotTeamListPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.authorization;
+package com.gitplex.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.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.component.select2.SelectToAddChoice;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.Team;
-import com.pmease.gitplex.core.entity.TeamAuthorization;
-import com.pmease.gitplex.core.manager.TeamAuthorizationManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.core.security.privilege.DepotPrivilege;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.greaterprivilege.GreaterPrivilegesPanel;
-import com.pmease.gitplex.web.component.privilegeselection.PrivilegeSelectionPanel;
-import com.pmease.gitplex.web.component.teamchoice.AbstractTeamChoiceProvider;
-import com.pmease.gitplex.web.component.teamchoice.TeamChoiceResourceReference;
-import com.pmease.gitplex.web.depotaccess.DepotAccess;
-import com.pmease.gitplex.web.page.account.teams.TeamDepotListPage;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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;
@SuppressWarnings("serial")
public class DepotTeamListPage extends DepotSettingPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
index 671031afd7..0a545eb103 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/commitmessagetransform/CommitMessageTransformPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.commitmessagetransform;
+package com.gitplex.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.pmease.commons.wicket.editable.PropertyDescriptor;
-import com.pmease.commons.wicket.editable.reflection.ReflectionPropertyEditor;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.CommitMessageTransformSetting;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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;
@SuppressWarnings("serial")
public class CommitMessageTransformPage extends DepotSettingPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/depot-setting.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/depot-setting.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/depot-setting.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/depot-setting.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
index 2ea17e09fe..d100774273 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperDropBehavior.java
@@ -1,157 +1,157 @@
-package com.pmease.gitplex.web.page.depot.setting.gatekeeper;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.pmease.commons.wicket.behavior.dragdrop.DropBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.AndGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.AndOrGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.CompositeGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.ConditionalGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.DefaultGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.gatekeeper.NotGateKeeper;
-import com.pmease.gitplex.core.manager.DepotManager;
-
-abstract class GateKeeperDropBehavior extends DropBehavior {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onDropped(AjaxRequestTarget target, String dragData) {
- List<Integer> dragPosition = Splitter.on(":").splitToList(dragData)
- .stream()
- .mapToInt(Integer::parseInt)
- .boxed()
- .collect(Collectors.toList());
- List<Integer> dropPosition = getPosition();
- GateKeeperPage page = (GateKeeperPage) getComponent().getPage();
- Depot depot = page.getDepot();
- AndGateKeeper root = (AndGateKeeper) depot.getGateKeeper();
- GateKeeper dragParent = getParentGateKeeper(root, dragPosition);
- GateKeeper dropParent = getParentGateKeeper(root, dropPosition);
- int dragIndex = dragPosition.get(dragPosition.size()-1);
- int dropIndex = dropPosition.get(dropPosition.size()-1);
- GateKeeper drag = getGateKeeper(dragParent, dragIndex);
- GateKeeper drop = getGateKeeper(dropParent, dropIndex);
- if (drop instanceof DefaultGateKeeper) {
- if (dragParent instanceof AndOrGateKeeper) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dragParent;
- andOrGateKeeper.getGateKeepers().remove(dragIndex);
- } else if (dragParent instanceof ConditionalGateKeeper) {
- ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dragParent;
- if (dragIndex == 0)
- conditionalGateKeeper.setIfGate(new DefaultGateKeeper());
- else
- conditionalGateKeeper.setThenGate(new DefaultGateKeeper());
- } else {
- NotGateKeeper notGateKeeper = (NotGateKeeper) dragParent;
- notGateKeeper.setGateKeeper(new DefaultGateKeeper());
- }
- if (dropParent instanceof AndOrGateKeeper) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dropParent;
- andOrGateKeeper.getGateKeepers().add(drag);
- } else if (dropParent instanceof ConditionalGateKeeper) {
- ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dropParent;
- if (dropIndex == 0)
- conditionalGateKeeper.setIfGate(drag);
- else
- conditionalGateKeeper.setThenGate(drag);
- } else {
- NotGateKeeper notGateKeeper = (NotGateKeeper) dropParent;
- notGateKeeper.setGateKeeper(drag);
- }
- } else {
- if (dragParent instanceof AndOrGateKeeper) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dragParent;
- andOrGateKeeper.getGateKeepers().set(dragIndex, drop);
- } else if (dragParent instanceof ConditionalGateKeeper) {
- ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dragParent;
- if (dragIndex == 0)
- conditionalGateKeeper.setIfGate(drop);
- else
- conditionalGateKeeper.setThenGate(drop);
- } else {
- NotGateKeeper notGateKeeper = (NotGateKeeper) dragParent;
- notGateKeeper.setGateKeeper(drop);
- }
- if (dropParent instanceof AndOrGateKeeper) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dropParent;
- andOrGateKeeper.getGateKeepers().set(dropIndex, drag);
- } else if (dropParent instanceof ConditionalGateKeeper) {
- ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dropParent;
- if (dropIndex == 0)
- conditionalGateKeeper.setIfGate(drag);
- else
- conditionalGateKeeper.setThenGate(drag);
- } else {
- NotGateKeeper notGateKeeper = (NotGateKeeper) dropParent;
- notGateKeeper.setGateKeeper(drag);
- }
- }
- depot.setGateKeepers((ArrayList<GateKeeper>) root.getGateKeepers());
- GitPlex.getInstance(DepotManager.class).save(depot, null, null);
- page.onGateKeeperChanged(target);
- }
-
- private GateKeeper getParentGateKeeper(GateKeeper rootGateKeeper, List<Integer> position) {
- Preconditions.checkArgument(!position.isEmpty() && rootGateKeeper instanceof CompositeGateKeeper);
- if (position.size() == 1) {
- return rootGateKeeper;
- } else if (rootGateKeeper instanceof AndOrGateKeeper) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) rootGateKeeper;
- return getParentGateKeeper(andOrGateKeeper.getGateKeepers().get(position.get(0)), position.subList(1, position.size()));
- } else if (rootGateKeeper instanceof ConditionalGateKeeper) {
- ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) rootGateKeeper;
- if (position.get(0) == 0)
- return getParentGateKeeper(conditionalGateKeeper.getIfGate(), position.subList(1, position.size()));
- else
- return getParentGateKeeper(conditionalGateKeeper.getThenGate(), position.subList(1, position.size()));
- } else {
- NotGateKeeper notGateKeeper = (NotGateKeeper) rootGateKeeper;
- return getParentGateKeeper(notGateKeeper.getGateKeeper(), position.subList(1, position.size()));
- }
- }
-
- private GateKeeper getGateKeeper(GateKeeper parentGateKeeper, int index) {
- if (parentGateKeeper instanceof AndOrGateKeeper) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) parentGateKeeper;
- if (index < andOrGateKeeper.getGateKeepers().size())
- return andOrGateKeeper.getGateKeepers().get(index);
- else
- return new DefaultGateKeeper();
- } else if (parentGateKeeper instanceof ConditionalGateKeeper) {
- ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) parentGateKeeper;
- if (index == 0)
- return conditionalGateKeeper.getIfGate();
- else
- return conditionalGateKeeper.getThenGate();
- } else {
- NotGateKeeper notGateKeeper = (NotGateKeeper) parentGateKeeper;
- return notGateKeeper.getGateKeeper();
- }
- }
-
- protected abstract List<Integer> getPosition();
-
- @Override
- protected String getAccept() {
- return String.format("function(draggable) {"
- + " var $drag = $(draggable).parent().parent();"
- + " if ($drag.hasClass('gate-keeper')) {"
- + " var $drop = $('#%s');"
- + " return !jQuery.contains($drag[0], $drop[0]) && !jQuery.contains($drop[0], $drag[0]);"
- + " } else {"
- + " return false;"
- + " }"
- + "}", getComponent().getMarkupId(true));
- }
-
-}
+package com.gitplex.web.page.depot.setting.gatekeeper;
+
+import java.util.ArrayList;
+import java.util.List;
+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;
+
+abstract class GateKeeperDropBehavior extends DropBehavior {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onDropped(AjaxRequestTarget target, String dragData) {
+ List<Integer> dragPosition = Splitter.on(":").splitToList(dragData)
+ .stream()
+ .mapToInt(Integer::parseInt)
+ .boxed()
+ .collect(Collectors.toList());
+ List<Integer> dropPosition = getPosition();
+ GateKeeperPage page = (GateKeeperPage) getComponent().getPage();
+ Depot depot = page.getDepot();
+ AndGateKeeper root = (AndGateKeeper) depot.getGateKeeper();
+ GateKeeper dragParent = getParentGateKeeper(root, dragPosition);
+ GateKeeper dropParent = getParentGateKeeper(root, dropPosition);
+ int dragIndex = dragPosition.get(dragPosition.size()-1);
+ int dropIndex = dropPosition.get(dropPosition.size()-1);
+ GateKeeper drag = getGateKeeper(dragParent, dragIndex);
+ GateKeeper drop = getGateKeeper(dropParent, dropIndex);
+ if (drop instanceof DefaultGateKeeper) {
+ if (dragParent instanceof AndOrGateKeeper) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dragParent;
+ andOrGateKeeper.getGateKeepers().remove(dragIndex);
+ } else if (dragParent instanceof ConditionalGateKeeper) {
+ ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dragParent;
+ if (dragIndex == 0)
+ conditionalGateKeeper.setIfGate(new DefaultGateKeeper());
+ else
+ conditionalGateKeeper.setThenGate(new DefaultGateKeeper());
+ } else {
+ NotGateKeeper notGateKeeper = (NotGateKeeper) dragParent;
+ notGateKeeper.setGateKeeper(new DefaultGateKeeper());
+ }
+ if (dropParent instanceof AndOrGateKeeper) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dropParent;
+ andOrGateKeeper.getGateKeepers().add(drag);
+ } else if (dropParent instanceof ConditionalGateKeeper) {
+ ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dropParent;
+ if (dropIndex == 0)
+ conditionalGateKeeper.setIfGate(drag);
+ else
+ conditionalGateKeeper.setThenGate(drag);
+ } else {
+ NotGateKeeper notGateKeeper = (NotGateKeeper) dropParent;
+ notGateKeeper.setGateKeeper(drag);
+ }
+ } else {
+ if (dragParent instanceof AndOrGateKeeper) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dragParent;
+ andOrGateKeeper.getGateKeepers().set(dragIndex, drop);
+ } else if (dragParent instanceof ConditionalGateKeeper) {
+ ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dragParent;
+ if (dragIndex == 0)
+ conditionalGateKeeper.setIfGate(drop);
+ else
+ conditionalGateKeeper.setThenGate(drop);
+ } else {
+ NotGateKeeper notGateKeeper = (NotGateKeeper) dragParent;
+ notGateKeeper.setGateKeeper(drop);
+ }
+ if (dropParent instanceof AndOrGateKeeper) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) dropParent;
+ andOrGateKeeper.getGateKeepers().set(dropIndex, drag);
+ } else if (dropParent instanceof ConditionalGateKeeper) {
+ ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) dropParent;
+ if (dropIndex == 0)
+ conditionalGateKeeper.setIfGate(drag);
+ else
+ conditionalGateKeeper.setThenGate(drag);
+ } else {
+ NotGateKeeper notGateKeeper = (NotGateKeeper) dropParent;
+ notGateKeeper.setGateKeeper(drag);
+ }
+ }
+ depot.setGateKeepers((ArrayList<GateKeeper>) root.getGateKeepers());
+ GitPlex.getInstance(DepotManager.class).save(depot, null, null);
+ page.onGateKeeperChanged(target);
+ }
+
+ private GateKeeper getParentGateKeeper(GateKeeper rootGateKeeper, List<Integer> position) {
+ Preconditions.checkArgument(!position.isEmpty() && rootGateKeeper instanceof CompositeGateKeeper);
+ if (position.size() == 1) {
+ return rootGateKeeper;
+ } else if (rootGateKeeper instanceof AndOrGateKeeper) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) rootGateKeeper;
+ return getParentGateKeeper(andOrGateKeeper.getGateKeepers().get(position.get(0)), position.subList(1, position.size()));
+ } else if (rootGateKeeper instanceof ConditionalGateKeeper) {
+ ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) rootGateKeeper;
+ if (position.get(0) == 0)
+ return getParentGateKeeper(conditionalGateKeeper.getIfGate(), position.subList(1, position.size()));
+ else
+ return getParentGateKeeper(conditionalGateKeeper.getThenGate(), position.subList(1, position.size()));
+ } else {
+ NotGateKeeper notGateKeeper = (NotGateKeeper) rootGateKeeper;
+ return getParentGateKeeper(notGateKeeper.getGateKeeper(), position.subList(1, position.size()));
+ }
+ }
+
+ private GateKeeper getGateKeeper(GateKeeper parentGateKeeper, int index) {
+ if (parentGateKeeper instanceof AndOrGateKeeper) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) parentGateKeeper;
+ if (index < andOrGateKeeper.getGateKeepers().size())
+ return andOrGateKeeper.getGateKeepers().get(index);
+ else
+ return new DefaultGateKeeper();
+ } else if (parentGateKeeper instanceof ConditionalGateKeeper) {
+ ConditionalGateKeeper conditionalGateKeeper = (ConditionalGateKeeper) parentGateKeeper;
+ if (index == 0)
+ return conditionalGateKeeper.getIfGate();
+ else
+ return conditionalGateKeeper.getThenGate();
+ } else {
+ NotGateKeeper notGateKeeper = (NotGateKeeper) parentGateKeeper;
+ return notGateKeeper.getGateKeeper();
+ }
+ }
+
+ protected abstract List<Integer> getPosition();
+
+ @Override
+ protected String getAccept() {
+ return String.format("function(draggable) {"
+ + " var $drag = $(draggable).parent().parent();"
+ + " if ($drag.hasClass('gate-keeper')) {"
+ + " var $drop = $('#%s');"
+ + " return !jQuery.contains($drag[0], $drop[0]) && !jQuery.contains($drop[0], $drag[0]);"
+ + " } else {"
+ + " return false;"
+ + " }"
+ + "}", getComponent().getMarkupId(true));
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
index a4c5a38855..818d9f82c2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperEditor.java
@@ -1,83 +1,83 @@
-package com.pmease.gitplex.web.page.depot.setting.gatekeeper;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-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.Panel;
-
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-
-@SuppressWarnings("serial")
-abstract class GateKeeperEditor extends Panel {
-
- private GateKeeper gateKeeper;
-
- public GateKeeperEditor(String id, GateKeeper gateKeeper) {
- super(id);
- this.gateKeeper = SerializationUtils.clone(gateKeeper);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- String iconClass = EditableUtils.getIcon(gateKeeper.getClass());
- if (iconClass == null)
- iconClass = "fa-lock";
- add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", iconClass)));
- add(new Label("name", EditableUtils.getName(gateKeeper.getClass())));
- add(new Label("description", EditableUtils.getDescription(gateKeeper.getClass())).setEscapeModelStrings(false));
-
- Form<?> form = new Form<Void>("form");
- add(form);
- form.add(new NotificationPanel("feedback", form));
- form.add(BeanContext.editBean("beanEditor", gateKeeper));
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- onSave(target, gateKeeper);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.getAttributes().put("type", "submit");
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(GateKeeperEditor.this);
- }
-
- });
-
- setOutputMarkupId(true);
- }
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
- protected abstract void onSave(AjaxRequestTarget target, GateKeeper gateKeeper);
-}
+package com.gitplex.web.page.depot.setting.gatekeeper;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+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.Panel;
+
+import com.gitplex.core.gatekeeper.GateKeeper;
+import com.gitplex.commons.wicket.editable.BeanContext;
+import com.gitplex.commons.wicket.editable.EditableUtils;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
+@SuppressWarnings("serial")
+abstract class GateKeeperEditor extends Panel {
+
+ private GateKeeper gateKeeper;
+
+ public GateKeeperEditor(String id, GateKeeper gateKeeper) {
+ super(id);
+ this.gateKeeper = SerializationUtils.clone(gateKeeper);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ String iconClass = EditableUtils.getIcon(gateKeeper.getClass());
+ if (iconClass == null)
+ iconClass = "fa-lock";
+ add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", iconClass)));
+ add(new Label("name", EditableUtils.getName(gateKeeper.getClass())));
+ add(new Label("description", EditableUtils.getDescription(gateKeeper.getClass())).setEscapeModelStrings(false));
+
+ Form<?> form = new Form<Void>("form");
+ add(form);
+ form.add(new NotificationPanel("feedback", form));
+ form.add(BeanContext.editBean("beanEditor", gateKeeper));
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target, gateKeeper);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.getAttributes().put("type", "submit");
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(GateKeeperEditor.this);
+ }
+
+ });
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ protected abstract void onSave(AjaxRequestTarget target, GateKeeper gateKeeper);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java
similarity index 76%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java
index cade81dde5..8fa6a08e24 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperLink.java
@@ -1,56 +1,56 @@
-package com.pmease.gitplex.web.page.depot.setting.gatekeeper;
-
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.floating.AlignPlacement;
-import com.pmease.commons.wicket.component.floating.FloatingPanel;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-
-@SuppressWarnings("serial")
-abstract class GateKeeperLink extends DropdownLink {
-
- public GateKeeperLink(String id) {
- super(id, true, new AlignPlacement(50, 50, 50, 50));
- }
-
- @Override
- protected void onInitialize(FloatingPanel dropdown) {
- super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "gate-keeper-selector"));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new GateKeeperDropBehavior() {
-
- @Override
- protected List<Integer> getPosition() {
- return GateKeeperLink.this.getPosition();
- }
-
- });
- }
-
- @Override
- protected Component newContent(String id) {
- return new GateKeeperSelector(id) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- close();
- GateKeeperLink.this.onSelect(target, gateKeeperClass);
- }
- };
- }
-
- protected abstract void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass);
-
- protected abstract List<Integer> getPosition();
-}
+package com.gitplex.web.page.depot.setting.gatekeeper;
+
+import java.util.List;
+
+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;
+
+@SuppressWarnings("serial")
+abstract class GateKeeperLink extends DropdownLink {
+
+ public GateKeeperLink(String id) {
+ super(id, true, new AlignPlacement(50, 50, 50, 50));
+ }
+
+ @Override
+ protected void onInitialize(FloatingPanel dropdown) {
+ super.onInitialize(dropdown);
+ dropdown.add(AttributeAppender.append("class", "gate-keeper-selector"));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new GateKeeperDropBehavior() {
+
+ @Override
+ protected List<Integer> getPosition() {
+ return GateKeeperLink.this.getPosition();
+ }
+
+ });
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new GateKeeperSelector(id) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
+ close();
+ GateKeeperLink.this.onSelect(target, gateKeeperClass);
+ }
+ };
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass);
+
+ protected abstract List<Integer> getPosition();
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java
index 1e55879aeb..a0dc5315a6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.gatekeeper;
+package com.gitplex.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.pmease.commons.util.ReflectionUtils;
-import com.pmease.commons.wicket.component.modal.ModalPanel;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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 jersey.repackaged.com.google.common.collect.Lists;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
index 40d76e8ad6..81bceec88e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperPanel.java
@@ -1,457 +1,457 @@
-package com.pmease.gitplex.web.page.depot.setting.gatekeeper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-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.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-import com.google.common.base.Joiner;
-import com.pmease.commons.util.ReflectionUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmListener;
-import com.pmease.commons.wicket.behavior.dragdrop.DragBehavior;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.commons.wicket.component.modal.ModalPanel;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.gatekeeper.AbstractGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.AndGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.AndOrGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.ConditionalGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.DefaultGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.gatekeeper.NotGateKeeper;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;
-
-@SuppressWarnings("serial")
-abstract class GateKeeperPanel extends Panel {
-
- private final GateKeeper gateKeeper;
-
- private final List<Integer> position;
-
- public GateKeeperPanel(String id, GateKeeper gateKeeper, List<Integer> position) {
- super(id);
- this.gateKeeper = gateKeeper;
- this.position = position;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer container = new WebMarkupContainer("container");
- add(container);
-
- if(!gateKeeper.isEnabled())
- container.add(AttributeAppender.append("class", "disabled"));
-
- if (position.size()%2 == 0) {
- container.add(AttributeAppender.append("class", "even panel-danger"));
- } else {
- container.add(AttributeAppender.append("class", "odd panel-success"));
- }
-
- Class<? extends GateKeeper> clazz = gateKeeper.getClass();
- String title = EditableUtils.getName(clazz);
- container.add(new Label("title", title));
- container.add(new WebMarkupContainer("dragHandle").add(new DragBehavior(Joiner.on(":").join(position), title)));
- container.add(new ModalLink("edit") {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- setVisible(EditableUtils.hasEditableProperties(clazz));
- }
-
- @Override
- protected Component newContent(String id) {
- return new GateKeeperEditor(id, gateKeeper) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
- GateKeeperPanel.this.onChange(target, gateKeeper);
- }
-
- };
- }
-
- });
-
- container.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 gatekeeper?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onDelete(target);
- }
-
- });
-
- container.add(new AjaxLink<Void>("enable") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- ((AbstractGateKeeper) gateKeeper).setEnabled(!gateKeeper.isEnabled());
- onChange(target, gateKeeper);
- }
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- if (gateKeeper.isEnabled()) {
- tag.append("class", "fa-check-square-o", " ");
- } else {
- tag.append("class", "fa-square-o", " ");
- }
- }
-
- }.add(AttributeAppender.append("title", Model.of(gateKeeper.isEnabled()?"Disable this gatekeeper":"Enable this gatekeeper"))));
-
- container.add(new WebMarkupContainer("help").add(new TooltipBehavior(Model.of(EditableUtils.getDescription(gateKeeper.getClass())))));
-
- container.add(new WebMarkupContainer("editor").setOutputMarkupPlaceholderTag(true).setVisible(false));
-
- if (AndOrGateKeeper.class.isAssignableFrom(clazz)) {
- AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) gateKeeper;
- Fragment fragment;
- if (andOrGateKeeper instanceof AndGateKeeper)
- fragment = new Fragment("content", "andFrag", GateKeeperPanel.this);
- else
- fragment = new Fragment("content", "orFrag", GateKeeperPanel.this);
-
- fragment.add(new ListView<GateKeeper>("children", andOrGateKeeper.getGateKeepers()) {
-
- @Override
- protected void populateItem(ListItem<GateKeeper> item) {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(item.getIndex());
- item.add(new GateKeeperPanel("child", item.getModelObject(), newPosition) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- andOrGateKeeper.getGateKeepers().remove(item.getIndex());
- GateKeeperPanel.this.onChange(target, andOrGateKeeper);
- }
-
- @Override
- protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
- andOrGateKeeper.getGateKeepers().set(item.getIndex(), gateKeeper);
- GateKeeperPanel.this.onChange(target, andOrGateKeeper);
- }
-
- });
- }
-
- });
- fragment.add(new GateKeeperLink("childTypeSelectorTrigger") {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- final GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
- if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
- andOrGateKeeper.getGateKeepers().add(gateKeeper);
- GateKeeperPanel.this.onChange(target, andOrGateKeeper);
- } else {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new GateKeeperEditor(id, gateKeeper) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
- fragment.replace(new WebMarkupContainer("childEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
- andOrGateKeeper.getGateKeepers().add(gateKeeper);
- GateKeeperPanel.this.onChange(target, andOrGateKeeper);
- }
-
- };
- }
-
- };
- }
- }
-
- @Override
- protected List<Integer> getPosition() {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(andOrGateKeeper.getGateKeepers().size());
- return newPosition;
- }
-
- });
-
- fragment.add(new WebMarkupContainer("childEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
- container.add(fragment);
- } else if (clazz == NotGateKeeper.class) {
- final NotGateKeeper notGateKeeper = (NotGateKeeper) gateKeeper;
- final Fragment fragment = new Fragment("content", "notFrag", GateKeeperPanel.this);
-
- if (notGateKeeper.getGateKeeper() instanceof DefaultGateKeeper) {
- fragment.add(new GateKeeperLink("gateKeeperTypeSelectorTrigger") {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- final GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
- if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
- notGateKeeper.setGateKeeper(gateKeeper);
- GateKeeperPanel.this.onChange(target, notGateKeeper);
- } else {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new GateKeeperEditor(id, gateKeeper) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
- fragment.replace(new WebMarkupContainer("gateKeeperEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
- notGateKeeper.setGateKeeper(gateKeeper);
- GateKeeperPanel.this.onChange(target, notGateKeeper);
- }
-
- };
- }
-
- };
- }
- }
-
- @Override
- protected List<Integer> getPosition() {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(0);
- return newPosition;
- }
-
- });
-
- fragment.add(new WebMarkupContainer("gateKeeper").setVisible(false));
- fragment.add(new WebMarkupContainer("gateKeeperEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
- } else {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(0);
- fragment.add(new GateKeeperPanel("gateKeeper", notGateKeeper.getGateKeeper(), newPosition) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- notGateKeeper.setGateKeeper(new DefaultGateKeeper());
- GateKeeperPanel.this.onChange(target, notGateKeeper);
- }
-
- @Override
- protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
- notGateKeeper.setGateKeeper(gateKeeper);
- GateKeeperPanel.this.onChange(target, notGateKeeper);
- }
-
- });
- fragment.add(new WebMarkupContainer("gateKeeperTypeSelectorTrigger").setVisible(false));
- fragment.add(new WebMarkupContainer("gateKeeperTypeSelector").setVisible(false));
- fragment.add(new WebMarkupContainer("gateKeeperEditor").setVisible(false));
- }
- container.add(fragment);
- } else if (clazz == ConditionalGateKeeper.class) {
- ConditionalGateKeeper ifThenGateKeeper = (ConditionalGateKeeper) gateKeeper;
- Fragment fragment = new Fragment("content", "ifThenFrag", GateKeeperPanel.this);
-
- if (ifThenGateKeeper.getIfGate() instanceof DefaultGateKeeper) {
- fragment.add(new GateKeeperLink("ifGate") {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
- if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
- ifThenGateKeeper.setIfGate(gateKeeper);
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- } else {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new GateKeeperEditor(id, gateKeeper) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
- fragment.replace(new WebMarkupContainer("ifEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
- ifThenGateKeeper.setIfGate(gateKeeper);
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- }
-
- };
- }
-
- };
- }
- }
-
- @Override
- public IModel<?> getBody() {
- return Model.of("Define gatekeeper <i class='fa fa-plus-circle'></i>");
- }
-
- @Override
- protected List<Integer> getPosition() {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(0);
- return newPosition;
- }
-
- }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "well gate-keeper-add")));
- } else {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(0);
- fragment.add(new GateKeeperPanel("ifGate", ifThenGateKeeper.getIfGate(), newPosition) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- ifThenGateKeeper.setIfGate(new DefaultGateKeeper());
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- }
-
- @Override
- protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
- ifThenGateKeeper.setIfGate(gateKeeper);
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- }
-
- });
- }
- fragment.add(new WebMarkupContainer("ifEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
-
- if (ifThenGateKeeper.getThenGate() instanceof DefaultGateKeeper) {
- fragment.add(new GateKeeperLink("thenGate") {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
- final GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
- if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
- ifThenGateKeeper.setThenGate(gateKeeper);
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- } else {
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- return new GateKeeperEditor(id, gateKeeper) {
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close(target);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
- close(target);
- fragment.replace(new WebMarkupContainer("thenEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
- ifThenGateKeeper.setThenGate(gateKeeper);
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- }
-
- };
- }
-
- };
- }
- }
-
- @Override
- public IModel<?> getBody() {
- return Model.of("Define gatekeeper <i class='fa fa-plus-circle'></i>");
- }
-
- @Override
- protected List<Integer> getPosition() {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(1);
- return newPosition;
- }
-
- }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "well gate-keeper-add")));
- } else {
- List<Integer> newPosition = new ArrayList<>(position);
- newPosition.add(1);
- fragment.add(new GateKeeperPanel("thenGate", ifThenGateKeeper.getThenGate(), newPosition) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- ifThenGateKeeper.setThenGate(new DefaultGateKeeper());
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- }
-
- @Override
- protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
- ifThenGateKeeper.setThenGate(gateKeeper);
- GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
- }
-
- });
- }
- fragment.add(new WebMarkupContainer("thenEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
-
- container.add(fragment);
- } else {
- Fragment fragment = new Fragment("content", "otherFrag", GateKeeperPanel.this);
- fragment.add(BeanContext.viewBean("viewer", gateKeeper));
- container.add(fragment);
- }
-
- add(new GateKeeperDropBehavior() {
-
- @Override
- protected List<Integer> getPosition() {
- return position;
- }
-
- });
- }
-
- protected abstract void onDelete(AjaxRequestTarget target);
-
- protected abstract void onChange(AjaxRequestTarget target, GateKeeper gateKeeper);
-
-}
+package com.gitplex.web.page.depot.setting.gatekeeper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+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;
+import com.gitplex.commons.wicket.behavior.dragdrop.DragBehavior;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipBehavior;
+
+@SuppressWarnings("serial")
+abstract class GateKeeperPanel extends Panel {
+
+ private final GateKeeper gateKeeper;
+
+ private final List<Integer> position;
+
+ public GateKeeperPanel(String id, GateKeeper gateKeeper, List<Integer> position) {
+ super(id);
+ this.gateKeeper = gateKeeper;
+ this.position = position;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebMarkupContainer container = new WebMarkupContainer("container");
+ add(container);
+
+ if(!gateKeeper.isEnabled())
+ container.add(AttributeAppender.append("class", "disabled"));
+
+ if (position.size()%2 == 0) {
+ container.add(AttributeAppender.append("class", "even panel-danger"));
+ } else {
+ container.add(AttributeAppender.append("class", "odd panel-success"));
+ }
+
+ Class<? extends GateKeeper> clazz = gateKeeper.getClass();
+ String title = EditableUtils.getName(clazz);
+ container.add(new Label("title", title));
+ container.add(new WebMarkupContainer("dragHandle").add(new DragBehavior(Joiner.on(":").join(position), title)));
+ container.add(new ModalLink("edit") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(EditableUtils.hasEditableProperties(clazz));
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new GateKeeperEditor(id, gateKeeper) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ close(target);
+ GateKeeperPanel.this.onChange(target, gateKeeper);
+ }
+
+ };
+ }
+
+ });
+
+ container.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 gatekeeper?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onDelete(target);
+ }
+
+ });
+
+ container.add(new AjaxLink<Void>("enable") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ ((AbstractGateKeeper) gateKeeper).setEnabled(!gateKeeper.isEnabled());
+ onChange(target, gateKeeper);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ if (gateKeeper.isEnabled()) {
+ tag.append("class", "fa-check-square-o", " ");
+ } else {
+ tag.append("class", "fa-square-o", " ");
+ }
+ }
+
+ }.add(AttributeAppender.append("title", Model.of(gateKeeper.isEnabled()?"Disable this gatekeeper":"Enable this gatekeeper"))));
+
+ container.add(new WebMarkupContainer("help").add(new TooltipBehavior(Model.of(EditableUtils.getDescription(gateKeeper.getClass())))));
+
+ container.add(new WebMarkupContainer("editor").setOutputMarkupPlaceholderTag(true).setVisible(false));
+
+ if (AndOrGateKeeper.class.isAssignableFrom(clazz)) {
+ AndOrGateKeeper andOrGateKeeper = (AndOrGateKeeper) gateKeeper;
+ Fragment fragment;
+ if (andOrGateKeeper instanceof AndGateKeeper)
+ fragment = new Fragment("content", "andFrag", GateKeeperPanel.this);
+ else
+ fragment = new Fragment("content", "orFrag", GateKeeperPanel.this);
+
+ fragment.add(new ListView<GateKeeper>("children", andOrGateKeeper.getGateKeepers()) {
+
+ @Override
+ protected void populateItem(ListItem<GateKeeper> item) {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(item.getIndex());
+ item.add(new GateKeeperPanel("child", item.getModelObject(), newPosition) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ andOrGateKeeper.getGateKeepers().remove(item.getIndex());
+ GateKeeperPanel.this.onChange(target, andOrGateKeeper);
+ }
+
+ @Override
+ protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ andOrGateKeeper.getGateKeepers().set(item.getIndex(), gateKeeper);
+ GateKeeperPanel.this.onChange(target, andOrGateKeeper);
+ }
+
+ });
+ }
+
+ });
+ fragment.add(new GateKeeperLink("childTypeSelectorTrigger") {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
+ final GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
+ if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
+ andOrGateKeeper.getGateKeepers().add(gateKeeper);
+ GateKeeperPanel.this.onChange(target, andOrGateKeeper);
+ } else {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new GateKeeperEditor(id, gateKeeper) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ close(target);
+ fragment.replace(new WebMarkupContainer("childEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
+ andOrGateKeeper.getGateKeepers().add(gateKeeper);
+ GateKeeperPanel.this.onChange(target, andOrGateKeeper);
+ }
+
+ };
+ }
+
+ };
+ }
+ }
+
+ @Override
+ protected List<Integer> getPosition() {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(andOrGateKeeper.getGateKeepers().size());
+ return newPosition;
+ }
+
+ });
+
+ fragment.add(new WebMarkupContainer("childEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
+ container.add(fragment);
+ } else if (clazz == NotGateKeeper.class) {
+ final NotGateKeeper notGateKeeper = (NotGateKeeper) gateKeeper;
+ final Fragment fragment = new Fragment("content", "notFrag", GateKeeperPanel.this);
+
+ if (notGateKeeper.getGateKeeper() instanceof DefaultGateKeeper) {
+ fragment.add(new GateKeeperLink("gateKeeperTypeSelectorTrigger") {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
+ final GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
+ if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
+ notGateKeeper.setGateKeeper(gateKeeper);
+ GateKeeperPanel.this.onChange(target, notGateKeeper);
+ } else {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new GateKeeperEditor(id, gateKeeper) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ close(target);
+ fragment.replace(new WebMarkupContainer("gateKeeperEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
+ notGateKeeper.setGateKeeper(gateKeeper);
+ GateKeeperPanel.this.onChange(target, notGateKeeper);
+ }
+
+ };
+ }
+
+ };
+ }
+ }
+
+ @Override
+ protected List<Integer> getPosition() {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(0);
+ return newPosition;
+ }
+
+ });
+
+ fragment.add(new WebMarkupContainer("gateKeeper").setVisible(false));
+ fragment.add(new WebMarkupContainer("gateKeeperEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
+ } else {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(0);
+ fragment.add(new GateKeeperPanel("gateKeeper", notGateKeeper.getGateKeeper(), newPosition) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ notGateKeeper.setGateKeeper(new DefaultGateKeeper());
+ GateKeeperPanel.this.onChange(target, notGateKeeper);
+ }
+
+ @Override
+ protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ notGateKeeper.setGateKeeper(gateKeeper);
+ GateKeeperPanel.this.onChange(target, notGateKeeper);
+ }
+
+ });
+ fragment.add(new WebMarkupContainer("gateKeeperTypeSelectorTrigger").setVisible(false));
+ fragment.add(new WebMarkupContainer("gateKeeperTypeSelector").setVisible(false));
+ fragment.add(new WebMarkupContainer("gateKeeperEditor").setVisible(false));
+ }
+ container.add(fragment);
+ } else if (clazz == ConditionalGateKeeper.class) {
+ ConditionalGateKeeper ifThenGateKeeper = (ConditionalGateKeeper) gateKeeper;
+ Fragment fragment = new Fragment("content", "ifThenFrag", GateKeeperPanel.this);
+
+ if (ifThenGateKeeper.getIfGate() instanceof DefaultGateKeeper) {
+ fragment.add(new GateKeeperLink("ifGate") {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
+ GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
+ if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
+ ifThenGateKeeper.setIfGate(gateKeeper);
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ } else {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new GateKeeperEditor(id, gateKeeper) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ close(target);
+ fragment.replace(new WebMarkupContainer("ifEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
+ ifThenGateKeeper.setIfGate(gateKeeper);
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ }
+
+ };
+ }
+
+ };
+ }
+ }
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("Define gatekeeper <i class='fa fa-plus-circle'></i>");
+ }
+
+ @Override
+ protected List<Integer> getPosition() {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(0);
+ return newPosition;
+ }
+
+ }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "well gate-keeper-add")));
+ } else {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(0);
+ fragment.add(new GateKeeperPanel("ifGate", ifThenGateKeeper.getIfGate(), newPosition) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ ifThenGateKeeper.setIfGate(new DefaultGateKeeper());
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ }
+
+ @Override
+ protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ ifThenGateKeeper.setIfGate(gateKeeper);
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ }
+
+ });
+ }
+ fragment.add(new WebMarkupContainer("ifEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
+
+ if (ifThenGateKeeper.getThenGate() instanceof DefaultGateKeeper) {
+ fragment.add(new GateKeeperLink("thenGate") {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass) {
+ final GateKeeper gateKeeper = ReflectionUtils.instantiateClass(gateKeeperClass);
+ if (EditableUtils.isDefaultInstanceValid(gateKeeperClass)) {
+ ifThenGateKeeper.setThenGate(gateKeeper);
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ } else {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new GateKeeperEditor(id, gateKeeper) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close(target);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ close(target);
+ fragment.replace(new WebMarkupContainer("thenEditor").setOutputMarkupPlaceholderTag(true).setVisible(true));
+ ifThenGateKeeper.setThenGate(gateKeeper);
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ }
+
+ };
+ }
+
+ };
+ }
+ }
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of("Define gatekeeper <i class='fa fa-plus-circle'></i>");
+ }
+
+ @Override
+ protected List<Integer> getPosition() {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(1);
+ return newPosition;
+ }
+
+ }.setEscapeModelStrings(false).add(AttributeAppender.append("class", "well gate-keeper-add")));
+ } else {
+ List<Integer> newPosition = new ArrayList<>(position);
+ newPosition.add(1);
+ fragment.add(new GateKeeperPanel("thenGate", ifThenGateKeeper.getThenGate(), newPosition) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ ifThenGateKeeper.setThenGate(new DefaultGateKeeper());
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ }
+
+ @Override
+ protected void onChange(AjaxRequestTarget target, GateKeeper gateKeeper) {
+ ifThenGateKeeper.setThenGate(gateKeeper);
+ GateKeeperPanel.this.onChange(target, ifThenGateKeeper);
+ }
+
+ });
+ }
+ fragment.add(new WebMarkupContainer("thenEditor").setOutputMarkupPlaceholderTag(true).setVisible(false));
+
+ container.add(fragment);
+ } else {
+ Fragment fragment = new Fragment("content", "otherFrag", GateKeeperPanel.this);
+ fragment.add(BeanContext.viewBean("viewer", gateKeeper));
+ container.add(fragment);
+ }
+
+ add(new GateKeeperDropBehavior() {
+
+ @Override
+ protected List<Integer> getPosition() {
+ return position;
+ }
+
+ });
+ }
+
+ protected abstract void onDelete(AjaxRequestTarget target);
+
+ protected abstract void onChange(AjaxRequestTarget target, GateKeeper gateKeeper);
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
similarity index 84%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
index 2e05c696ac..00037fffcb 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/gatekeeper/GateKeeperSelector.java
@@ -1,123 +1,123 @@
-package com.pmease.gitplex.web.page.depot.setting.gatekeeper;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-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.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import com.google.common.base.Preconditions;
-import com.pmease.commons.loader.ImplementationRegistry;
-import com.pmease.commons.wicket.behavior.CollapseBehavior;
-import com.pmease.commons.wicket.component.AccordionPanel;
-import com.pmease.commons.wicket.editable.EditableUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.gatekeeper.DefaultGateKeeper;
-import com.pmease.gitplex.core.gatekeeper.GateKeeper;
-import com.pmease.gitplex.core.gatekeeper.TeamAwareGateKeeper;
-import com.pmease.gitplex.web.page.account.AccountPage;
-
-@SuppressWarnings("serial")
-abstract class GateKeeperSelector extends Panel {
-
- public GateKeeperSelector(String id) {
- super(id);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- final Map<String, List<Class<?>>> gateKeeperClasses = new LinkedHashMap<>();
- gateKeeperClasses.put(GateKeeper.CATEGORY_BASIC, new ArrayList<Class<?>>());
- gateKeeperClasses.put(GateKeeper.CATEGORY_USER, new ArrayList<Class<?>>());
- gateKeeperClasses.put(GateKeeper.CATEGORY_COMPOSITION, new ArrayList<Class<?>>());
-
- Account account = ((AccountPage)getPage()).getAccount();
-
- List<Class<?>> implementations = new ArrayList<>();
-
- for (Class<?> clazz: GitPlex.getInstance(ImplementationRegistry.class).getImplementations(GateKeeper.class)) {
- if (account.isOrganization() || !TeamAwareGateKeeper.class.isAssignableFrom(clazz))
- implementations.add(clazz);
- }
-
- implementations.remove(DefaultGateKeeper.class);
- implementations.sort((o1, o2) -> EditableUtils.getOrder(o1) - EditableUtils.getOrder(o2));
-
- for (Class<?> implementation: implementations) {
- List<Class<?>> categoryClasses = null;
- for (Map.Entry<String, List<Class<?>>> entry: gateKeeperClasses.entrySet()) {
- if (entry.getKey().equals(EditableUtils.getCategory(implementation))) {
- categoryClasses = entry.getValue();
- break;
- }
- }
- if (categoryClasses == null)
- categoryClasses = gateKeeperClasses.get(GateKeeper.CATEGORY_BASIC);
- categoryClasses.add(implementation);
- }
-
- for (Iterator<Map.Entry<String, List<Class<?>>>> it = gateKeeperClasses.entrySet().iterator(); it.hasNext();) {
- if (it.next().getValue().isEmpty())
- it.remove();
- }
-
- AccordionPanel accordion = new AccordionPanel("accordion");
- add(accordion);
- accordion.add(new ListView<String>("categories", new ArrayList<String>(gateKeeperClasses.keySet())) {
-
- @Override
- protected void populateItem(ListItem<String> categoryItem) {
- final String category = categoryItem.getModelObject();
-
- List<Class<?>> gateKeepersOfCategory = gateKeeperClasses.get(category);
- Preconditions.checkNotNull(gateKeepersOfCategory);
-
- WebMarkupContainer collapsible = new WebMarkupContainer("collapsible");
- categoryItem.add(collapsible);
- collapsible.add(new ListView<Class<?>>("gateKeepers", gateKeepersOfCategory) {
-
- @Override
- protected void populateItem(ListItem<Class<?>> gateKeeperItem) {
- final Class<?> gateKeeperClass = gateKeeperItem.getModelObject();
- AjaxLink<Void> link = new AjaxLink<Void>("gateKeeper") {
-
- @SuppressWarnings("unchecked")
- @Override
- public void onClick(AjaxRequestTarget target) {
- onSelect(target, (Class<? extends GateKeeper>) gateKeeperClass);
- }
-
- };
- gateKeeperItem.add(link);
- String icon = EditableUtils.getIcon(gateKeeperClass);
- if (icon == null)
- icon = "fa-lock";
- link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", icon)));
- link.add(new Label("name", EditableUtils.getName(gateKeeperClass)));
- link.add(new Label("description", EditableUtils.getDescription(gateKeeperClass)).setEscapeModelStrings(false));
- }
-
- });
-
- WebMarkupContainer collapseTrigger = new WebMarkupContainer("collapseTrigger");
- categoryItem.add(collapseTrigger);
- collapseTrigger.add(new Label("name", category)).add(new CollapseBehavior(collapsible));
- }
-
- });
- }
-
- protected abstract void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass);
-}
+package com.gitplex.web.page.depot.setting.gatekeeper;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+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.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;
+
+@SuppressWarnings("serial")
+abstract class GateKeeperSelector extends Panel {
+
+ public GateKeeperSelector(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ final Map<String, List<Class<?>>> gateKeeperClasses = new LinkedHashMap<>();
+ gateKeeperClasses.put(GateKeeper.CATEGORY_BASIC, new ArrayList<Class<?>>());
+ gateKeeperClasses.put(GateKeeper.CATEGORY_USER, new ArrayList<Class<?>>());
+ gateKeeperClasses.put(GateKeeper.CATEGORY_COMPOSITION, new ArrayList<Class<?>>());
+
+ Account account = ((AccountPage)getPage()).getAccount();
+
+ List<Class<?>> implementations = new ArrayList<>();
+
+ for (Class<?> clazz: GitPlex.getInstance(ImplementationRegistry.class).getImplementations(GateKeeper.class)) {
+ if (account.isOrganization() || !TeamAwareGateKeeper.class.isAssignableFrom(clazz))
+ implementations.add(clazz);
+ }
+
+ implementations.remove(DefaultGateKeeper.class);
+ implementations.sort((o1, o2) -> EditableUtils.getOrder(o1) - EditableUtils.getOrder(o2));
+
+ for (Class<?> implementation: implementations) {
+ List<Class<?>> categoryClasses = null;
+ for (Map.Entry<String, List<Class<?>>> entry: gateKeeperClasses.entrySet()) {
+ if (entry.getKey().equals(EditableUtils.getCategory(implementation))) {
+ categoryClasses = entry.getValue();
+ break;
+ }
+ }
+ if (categoryClasses == null)
+ categoryClasses = gateKeeperClasses.get(GateKeeper.CATEGORY_BASIC);
+ categoryClasses.add(implementation);
+ }
+
+ for (Iterator<Map.Entry<String, List<Class<?>>>> it = gateKeeperClasses.entrySet().iterator(); it.hasNext();) {
+ if (it.next().getValue().isEmpty())
+ it.remove();
+ }
+
+ AccordionPanel accordion = new AccordionPanel("accordion");
+ add(accordion);
+ accordion.add(new ListView<String>("categories", new ArrayList<String>(gateKeeperClasses.keySet())) {
+
+ @Override
+ protected void populateItem(ListItem<String> categoryItem) {
+ final String category = categoryItem.getModelObject();
+
+ List<Class<?>> gateKeepersOfCategory = gateKeeperClasses.get(category);
+ Preconditions.checkNotNull(gateKeepersOfCategory);
+
+ WebMarkupContainer collapsible = new WebMarkupContainer("collapsible");
+ categoryItem.add(collapsible);
+ collapsible.add(new ListView<Class<?>>("gateKeepers", gateKeepersOfCategory) {
+
+ @Override
+ protected void populateItem(ListItem<Class<?>> gateKeeperItem) {
+ final Class<?> gateKeeperClass = gateKeeperItem.getModelObject();
+ AjaxLink<Void> link = new AjaxLink<Void>("gateKeeper") {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onSelect(target, (Class<? extends GateKeeper>) gateKeeperClass);
+ }
+
+ };
+ gateKeeperItem.add(link);
+ String icon = EditableUtils.getIcon(gateKeeperClass);
+ if (icon == null)
+ icon = "fa-lock";
+ link.add(new WebMarkupContainer("icon").add(AttributeAppender.append("class", icon)));
+ link.add(new Label("name", EditableUtils.getName(gateKeeperClass)));
+ link.add(new Label("description", EditableUtils.getDescription(gateKeeperClass)).setEscapeModelStrings(false));
+ }
+
+ });
+
+ WebMarkupContainer collapseTrigger = new WebMarkupContainer("collapseTrigger");
+ categoryItem.add(collapseTrigger);
+ collapseTrigger.add(new Label("name", category)).add(new CollapseBehavior(collapsible));
+ }
+
+ });
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, Class<? extends GateKeeper> gateKeeperClass);
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/general/GeneralSettingPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/general/GeneralSettingPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/general/GeneralSettingPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/general/GeneralSettingPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.java
index b9617f11cd..87c0596258 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/general/GeneralSettingPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/general/GeneralSettingPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.general;
+package com.gitplex.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.pmease.commons.wicket.component.modal.ModalPanel;
-import com.pmease.commons.wicket.component.select2.Response;
-import com.pmease.commons.wicket.component.select2.ResponseFiller;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.accountchoice.AbstractAccountChoiceProvider;
-import com.pmease.gitplex.web.component.accountchoice.AccountSingleChoice;
-import com.pmease.gitplex.web.component.confirmdelete.ConfirmDeleteDepotModal;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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;
@SuppressWarnings("serial")
public class GeneralSettingPage extends DepotSettingPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
index f0fd094a6e..104ca586cd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyEditor.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.integrationpolicy;
+package com.gitplex.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.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
+import com.gitplex.core.entity.support.IntegrationPolicy;
+import com.gitplex.commons.wicket.editable.BeanContext;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
similarity index 88%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
index c84456596e..cad4dd9e3c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.integrationpolicy;
+package com.gitplex.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.pmease.commons.wicket.behavior.sortable.SortBehavior;
-import com.pmease.commons.wicket.behavior.sortable.SortPosition;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.page.depot.setting.DepotSettingPage;
+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;
@SuppressWarnings("serial")
public class IntegrationPolicyPage extends DepotSettingPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
index 1833b5308f..1b67de9cb9 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/setting/integrationpolicy/IntegrationPolicyPanel.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.setting.integrationpolicy;
+package com.gitplex.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.pmease.commons.wicket.ajaxlistener.ConfirmListener;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.gitplex.core.entity.support.IntegrationPolicy;
+import com.gitplex.core.entity.support.IntegrationPolicy;
+import com.gitplex.commons.wicket.ajaxlistener.ConfirmListener;
+import com.gitplex.commons.wicket.editable.BeanContext;
@SuppressWarnings("serial")
abstract class IntegrationPolicyPanel extends Panel {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.java
index 539843ddc0..8bc12a72ef 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.tags;
+package com.gitplex.web.page.depot.tags;
import java.util.Iterator;
import java.util.List;
@@ -33,24 +33,24 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTag;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.commons.wicket.ajaxlistener.ConfirmListener;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.commons.wicket.behavior.clipboard.CopyClipboardBehavior;
-import com.pmease.commons.wicket.component.modal.ModalLink;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.AccountLink;
-import com.pmease.gitplex.web.component.archivemenulink.ArchiveMenuLink;
-import com.pmease.gitplex.web.component.contributorpanel.ContributorPanel;
-import com.pmease.gitplex.web.component.revisionpicker.RevisionPicker;
-import com.pmease.gitplex.web.page.depot.DepotPage;
-import com.pmease.gitplex.web.page.depot.NoBranchesPage;
-import com.pmease.gitplex.web.page.depot.commit.CommitDetailPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.util.DateUtils;
+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;
+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 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.pmease.gitplex.web.Constants.DEFAULT_PAGE_SIZE) {
+ com.gitplex.web.Constants.DEFAULT_PAGE_SIZE) {
@Override
protected void populateItem(ListItem<RefInfo> item) {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsResourceReference.java
index 4d9bb2aec8..fbc5aade33 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/DepotTagsResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/DepotTagsResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.depot.tags;
+package com.gitplex.web.page.depot.tags;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/depot-tags.css b/gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/depot-tags.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/depot/tags/depot-tags.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/depot/tags/depot-tags.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/BaseErrorPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/error/BaseErrorPage.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/BaseErrorPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/BaseErrorPage.java
index f4c86ea558..ad646a2387 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/BaseErrorPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/error/BaseErrorPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.error;
+package com.gitplex.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.pmease.gitplex.web.page.base.BasePage;
+import com.gitplex.web.page.base.BasePage;
@SuppressWarnings("serial")
public abstract class BaseErrorPage extends BasePage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ErrorPageResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/error/ErrorPageResourceReference.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ErrorPageResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/ErrorPageResourceReference.java
index cb170bf0a7..3515508b14 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ErrorPageResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/error/ErrorPageResourceReference.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.page.error;
+package com.gitplex.web.page.error;
-import com.pmease.gitplex.web.page.base.BaseDependentCssResourceReference;
+import com.gitplex.web.page.base.BaseDependentCssResourceReference;
public class ErrorPageResourceReference extends BaseDependentCssResourceReference {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ExpectedExceptionPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ExpectedExceptionPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ExpectedExceptionPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.java
similarity index 89%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ExpectedExceptionPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.java
index a4261e832b..21a9643910 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/ExpectedExceptionPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/error/ExpectedExceptionPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.error;
+package com.gitplex.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.pmease.commons.util.WordUtils;
-import com.pmease.commons.wicket.component.MultilineLabel;
-import com.pmease.gitplex.web.page.home.DashboardPage;
+import com.gitplex.web.page.home.DashboardPage;
+import com.gitplex.commons.util.WordUtils;
+import com.gitplex.commons.wicket.component.MultilineLabel;
@SuppressWarnings("serial")
public class ExpectedExceptionPage extends BaseErrorPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/UnexpectedExceptionPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.html
similarity index 98%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/UnexpectedExceptionPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.html
index fc98306a25..6bfe927a98 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/UnexpectedExceptionPage.html
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.html
@@ -41,7 +41,7 @@
exception. If you believe it is a bug of GitPlex, please send this
error using below form to help us improving quality of the product</div>
- <form action="http://www.pmease.com/gitplex_bug_report" method="post">
+ <form action="http://www.gitplex.com/gitplex_bug_report" method="post">
<div class="actions">
<input type="submit" value="Send Error Report" class="btn btn-primary" onclick="if (validateBugReport()) this.form.submit();return false;"></input>
<input wicket:id="dashboardTop" type="button" value="Back to Dashboard" class="btn btn-primary"></input>
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/UnexpectedExceptionPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.java
similarity index 93%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/UnexpectedExceptionPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/UnexpectedExceptionPage.java
index 855ddc75b1..3a690b4f08 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/UnexpectedExceptionPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/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.pmease.gitplex.web.page.error;
+package com.gitplex.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.pmease.commons.util.FileUtils;
-import com.pmease.commons.util.StringUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.web.page.home.DashboardPage;
-import com.pmease.gitplex.web.util.DateUtils;
+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;
@SuppressWarnings("serial")
public class UnexpectedExceptionPage extends BaseErrorPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/error-page.css b/gitplex.web/src/main/java/com/gitplex/web/page/error/error-page.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/error/error-page.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/error/error-page.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java
index 09ccff1316..3813496477 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.home;
+package com.gitplex.web.page.home;
import java.util.ArrayList;
import java.util.Collections;
@@ -19,17 +19,17 @@ import org.apache.wicket.markup.html.list.PageableListView;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import com.pmease.commons.wicket.behavior.OnTypingDoneBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.entity.OrganizationMembership;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.Constants;
-import com.pmease.gitplex.web.component.avatar.Avatar;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.layout.LayoutPage;
+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.web.Constants;
+import com.gitplex.web.component.avatar.Avatar;
+import com.gitplex.web.page.account.overview.AccountOverviewPage;
+import com.gitplex.web.page.depot.file.DepotFilePage;
+import com.gitplex.web.page.layout.LayoutPage;
+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;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardResourceReference.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardResourceReference.java
index a00b6ff205..18c5371363 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/DashboardResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/home/DashboardResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.home;
+package com.gitplex.web.page.home;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/dashboard.css b/gitplex.web/src/main/java/com/gitplex/web/page/home/dashboard.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/home/dashboard.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/home/dashboard.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.java
index 83da564b88..0c1ea25142 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.init;
+package com.gitplex.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.pmease.commons.util.init.InitStage;
-import com.pmease.commons.util.init.ManualConfig;
-import com.pmease.commons.wicket.component.wizard.ManualConfigStep;
-import com.pmease.commons.wicket.component.wizard.Wizard;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.WebSession;
-import com.pmease.gitplex.web.page.base.BasePage;
+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;
@SuppressWarnings("serial")
public class ServerInitPage extends BasePage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitResourceReference.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitResourceReference.java
index b3e20cac43..5a27d3c771 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/ServerInitResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/init/ServerInitResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.init;
+package com.gitplex.web.page.init;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.java
similarity index 78%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.java
index 847419c1db..8cfed4b1b0 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomePage.java
@@ -1,12 +1,12 @@
-package com.pmease.gitplex.web.page.init;
+package com.gitplex.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.pmease.gitplex.web.page.account.overview.NewDepotPage;
-import com.pmease.gitplex.web.page.account.overview.NewOrganizationPage;
-import com.pmease.gitplex.web.page.layout.LayoutPage;
+import com.gitplex.web.page.account.overview.NewDepotPage;
+import com.gitplex.web.page.account.overview.NewOrganizationPage;
+import com.gitplex.web.page.layout.LayoutPage;
@SuppressWarnings("serial")
public class WelcomePage extends LayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomeResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomeResourceReference.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomeResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomeResourceReference.java
index adf97e2b4d..31de4a11ef 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/WelcomeResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/init/WelcomeResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.init;
+package com.gitplex.web.page.init;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/server-init.css b/gitplex.web/src/main/java/com/gitplex/web/page/init/server-init.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/server-init.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/server-init.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/welcome.css b/gitplex.web/src/main/java/com/gitplex/web/page/init/welcome.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/init/welcome.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/init/welcome.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/CreateDepotPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/CreateDepotPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/CreateDepotPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.java
similarity index 73%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/CreateDepotPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.java
index dd7f3741e3..bb4c2ca6da 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/CreateDepotPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/layout/CreateDepotPage.java
@@ -1,21 +1,21 @@
-package com.pmease.gitplex.web.page.layout;
+package com.gitplex.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.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.web.component.accountchoice.AccountSingleChoice;
-import com.pmease.gitplex.web.component.accountchoice.AdministrativeAccountChoiceProvider;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
+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;
@SuppressWarnings("serial")
public class CreateDepotPage extends LayoutPage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.html
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.html
index 2223540cc0..4bcb6ae2ba 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutPage.html
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.html
@@ -36,10 +36,10 @@
</div>
<div wicket:id="mainFoot" class="foot clearfix">
<div class="pull-left">
- <a href="http://www.pmease.com">PMEase GitPlex</a>, <span wicket:id="productVersion"></span>, <span wicket:id="releaseDate"></span>
+ <a href="http://www.gitplex.com">GitPlex GitPlex</a>, <span wicket:id="productVersion"></span>, <span wicket:id="releaseDate"></span>
</div>
<div class="pull-right">
- <a href="http://www.pmease.com/support">Support</a> | <a href="http://track.pmease.com">Report Bug or Enhancement</a>
+ <a href="http://www.gitplex.com/support">Support</a> | <a href="http://track.gitplex.com">Report Bug or Enhancement</a>
</div>
</div>
</div>
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.java
index 12b1a25252..62b1c6259a 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.layout;
+package com.gitplex.web.page.layout;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -24,34 +24,34 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.protocol.ws.api.WebSocketRequestHandler;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.pmease.commons.loader.AppLoader;
-import com.pmease.commons.loader.Plugin;
-import com.pmease.commons.wicket.component.DropdownLink;
-import com.pmease.commons.wicket.component.floating.AlignPlacement;
-import com.pmease.commons.wicket.component.menu.MenuItem;
-import com.pmease.commons.wicket.component.menu.MenuLink;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
-import com.pmease.commons.wicket.websocket.WebSocketRenderBehavior;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.component.accountselector.OrganizationSelector;
-import com.pmease.gitplex.web.component.avatar.AvatarLink;
-import com.pmease.gitplex.web.component.depotselector.DepotSelector;
-import com.pmease.gitplex.web.page.account.overview.AccountOverviewPage;
-import com.pmease.gitplex.web.page.account.overview.NewOrganizationPage;
-import com.pmease.gitplex.web.page.account.setting.ProfileEditPage;
-import com.pmease.gitplex.web.page.account.tasks.TaskListPage;
-import com.pmease.gitplex.web.page.admin.SystemSettingPage;
-import com.pmease.gitplex.web.page.base.BasePage;
-import com.pmease.gitplex.web.page.depot.file.DepotFilePage;
-import com.pmease.gitplex.web.page.security.LoginPage;
-import com.pmease.gitplex.web.page.security.LogoutPage;
-import com.pmease.gitplex.web.page.security.RegisterPage;
-import com.pmease.gitplex.web.websocket.TaskChangedRegion;
+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.manager.DepotManager;
+import com.gitplex.core.security.SecurityUtils;
+import com.gitplex.web.component.accountselector.OrganizationSelector;
+import com.gitplex.web.component.avatar.AvatarLink;
+import com.gitplex.web.component.depotselector.DepotSelector;
+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.security.LoginPage;
+import com.gitplex.web.page.security.LogoutPage;
+import com.gitplex.web.page.security.RegisterPage;
+import com.gitplex.web.websocket.TaskChangedRegion;
+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.component.menu.MenuItem;
+import com.gitplex.commons.wicket.component.menu.MenuLink;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRenderBehavior;
@SuppressWarnings("serial")
public abstract class LayoutPage extends BasePage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutResourceReference.java
index 4e1aaaccc2..8af540fd44 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/LayoutResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/layout/LayoutResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.layout;
+package com.gitplex.web.page.layout;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/layout.css b/gitplex.web/src/main/java/com/gitplex/web/page/layout/layout.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/layout/layout.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/layout/layout.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java
index 22e0294dbc..7dbc81873f 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.security;
+package com.gitplex.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.pmease.commons.wicket.behavior.testform.TestFormBehavior;
-import com.pmease.commons.wicket.behavior.testform.TestResult;
-import com.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.annotation.Editable;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.manager.MailManager;
-import com.pmease.gitplex.web.page.base.BasePage;
+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 de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetResourceReference.java
index fcfe973730..b9568a9748 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/ForgetResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/ForgetResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.security;
+package com.gitplex.web.page.security;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.java
index 06bbaaa383..93a0e760af 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.security;
+package com.gitplex.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.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.web.WebSession;
-import com.pmease.gitplex.web.page.base.BasePage;
+import com.gitplex.core.GitPlex;
+import com.gitplex.core.manager.ConfigManager;
+import com.gitplex.web.WebSession;
+import com.gitplex.web.page.base.BasePage;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginResourceReference.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/LoginResourceReference.java
index f658a9763b..31e43df941 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LoginResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/LoginResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.security;
+package com.gitplex.web.page.security;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LogoutPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/LogoutPage.java
similarity index 67%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LogoutPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/LogoutPage.java
index 92379db5f8..e982bf528c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/LogoutPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/LogoutPage.java
@@ -1,19 +1,19 @@
-package com.pmease.gitplex.web.page.security;
-
-import org.apache.wicket.RestartResponseException;
-
-import com.pmease.gitplex.web.WebSession;
-import com.pmease.gitplex.web.page.base.BasePage;
-
-@SuppressWarnings("serial")
-public class LogoutPage extends BasePage {
-
- public LogoutPage() {
- WebSession.get().logout();
-
- getSession().warn("You've been logged out");
-
- throw new RestartResponseException(getApplication().getHomePage());
- }
-
-}
+package com.gitplex.web.page.security;
+
+import org.apache.wicket.RestartResponseException;
+
+import com.gitplex.web.WebSession;
+import com.gitplex.web.page.base.BasePage;
+
+@SuppressWarnings("serial")
+public class LogoutPage extends BasePage {
+
+ public LogoutPage() {
+ WebSession.get().logout();
+
+ getSession().warn("You've been logged out");
+
+ throw new RestartResponseException(getApplication().getHomePage());
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.java
similarity index 77%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.java
index 3aa713760b..1bd2a1fac3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterPage.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.security;
+package com.gitplex.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.pmease.commons.wicket.editable.BeanContext;
-import com.pmease.commons.wicket.editable.BeanEditor;
-import com.pmease.commons.wicket.editable.PathSegment;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Account;
-import com.pmease.gitplex.core.manager.AccountManager;
-import com.pmease.gitplex.core.manager.ConfigManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
-import com.pmease.gitplex.web.page.account.AccountPage;
-import com.pmease.gitplex.web.page.account.setting.AvatarEditPage;
-import com.pmease.gitplex.web.page.base.BasePage;
-import com.pmease.gitplex.web.page.home.DashboardPage;
+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;
@SuppressWarnings("serial")
public class RegisterPage extends BasePage {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterResourceReference.java
index b72a840505..e444923184 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/RegisterResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/security/RegisterResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.page.security;
+package com.gitplex.web.page.security;
import org.apache.wicket.request.resource.CssResourceReference;
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/forget.css b/gitplex.web/src/main/java/com/gitplex/web/page/security/forget.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/forget.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/forget.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/login.css b/gitplex.web/src/main/java/com/gitplex/web/page/security/login.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/login.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/login.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/register.css b/gitplex.web/src/main/java/com/gitplex/web/page/security/register.css
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/security/register.css
rename to gitplex.web/src/main/java/com/gitplex/web/page/security/register.css
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/RunModePage.html b/gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/RunModePage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/RunModePage.java b/gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.java
similarity index 87%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/RunModePage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.java
index a9e1f18cd5..f2d1312e80 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/RunModePage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/test/RunModePage.java
@@ -1,50 +1,50 @@
-package com.pmease.gitplex.web.page.test;
-
-import java.io.File;
-import java.io.IOException;
-import java.nio.charset.Charset;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringEscapeUtils;
-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 com.pmease.commons.wicket.page.CommonPage;
-
-import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
-import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
-
-@SuppressWarnings("serial")
-public class RunModePage extends CommonPage {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- String mode = "clike/clike.js";
- String fileName = "clike/test.scala";
-
- response.render(JavaScriptHeaderItem.forReference(
- new WebjarsJavaScriptResourceReference("codemirror/current/addon/runmode/runmode-standalone.js")));
- response.render(JavaScriptHeaderItem.forReference(
- new WebjarsJavaScriptResourceReference("codemirror/current/mode/meta.js")));
- response.render(JavaScriptHeaderItem.forReference(
- new WebjarsJavaScriptResourceReference("codemirror/current/mode/" + mode)));
- response.render(CssHeaderItem.forReference(
- new WebjarsCssResourceReference("codemirror/current/lib/codemirror.css")));
-
- try {
- File file = new File("W:/commons/commons.lang/src/test/java/com/pmease/commons/lang/tokenizers/" + fileName);
- String fileContent = FileUtils.readFileToString(file, Charset.forName("UTF-8"));
- response.render(OnDomReadyHeaderItem.forScript(String.format(
- "var mime = CodeMirror.findModeByFileName('%s').mime;"
- + "CodeMirror.runMode('%s', mime, document.getElementById('code'));",
- fileName, StringEscapeUtils.escapeEcmaScript(fileContent))));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
+package com.gitplex.web.page.test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.Charset;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+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 com.gitplex.commons.wicket.page.CommonPage;
+
+import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference;
+import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference;
+
+@SuppressWarnings("serial")
+public class RunModePage extends CommonPage {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ String mode = "clike/clike.js";
+ String fileName = "clike/test.scala";
+
+ response.render(JavaScriptHeaderItem.forReference(
+ new WebjarsJavaScriptResourceReference("codemirror/current/addon/runmode/runmode-standalone.js")));
+ response.render(JavaScriptHeaderItem.forReference(
+ new WebjarsJavaScriptResourceReference("codemirror/current/mode/meta.js")));
+ response.render(JavaScriptHeaderItem.forReference(
+ new WebjarsJavaScriptResourceReference("codemirror/current/mode/" + mode)));
+ response.render(CssHeaderItem.forReference(
+ new WebjarsCssResourceReference("codemirror/current/lib/codemirror.css")));
+
+ try {
+ File file = new File("W:/gitplex.commons/commons.lang/src/test/java/com/gitplex/commons/lang/tokenizers/" + fileName);
+ String fileContent = FileUtils.readFileToString(file, Charset.forName("UTF-8"));
+ response.render(OnDomReadyHeaderItem.forScript(String.format(
+ "var mime = CodeMirror.findModeByFileName('%s').mime;"
+ + "CodeMirror.runMode('%s', mime, document.getElementById('code'));",
+ fileName, StringEscapeUtils.escapeEcmaScript(fileContent))));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/TestPage.html b/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.html
similarity index 100%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/TestPage.html
rename to gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.html
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/TestPage.java b/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.java
similarity index 58%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/TestPage.java
rename to gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.java
index f729b0ec24..1c34aa442c 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/page/test/TestPage.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/page/test/TestPage.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.page.test;
-
-import com.pmease.commons.wicket.page.CommonPage;
-
-@SuppressWarnings("serial")
-public class TestPage extends CommonPage {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- }
-
-}
+package com.gitplex.web.page.test;
+
+import com.gitplex.commons.wicket.page.CommonPage;
+
+@SuppressWarnings("serial")
+public class TestPage extends CommonPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/ArchiveResource.java b/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResource.java
similarity index 94%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/resource/ArchiveResource.java
rename to gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResource.java
index 1b552dbdcc..cbcd77799b 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/ArchiveResource.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.resource;
+package com.gitplex.web.resource;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -18,12 +18,12 @@ 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.google.common.base.Charsets;
import com.google.common.base.Preconditions;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
public class ArchiveResource extends AbstractResource {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/ArchiveResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResourceReference.java
similarity index 86%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/resource/ArchiveResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResourceReference.java
index b4eb79701f..2e3fffced3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/ArchiveResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/resource/ArchiveResourceReference.java
@@ -1,19 +1,19 @@
-package com.pmease.gitplex.web.resource;
-
-import org.apache.wicket.request.resource.IResource;
-import org.apache.wicket.request.resource.ResourceReference;
-
-public class ArchiveResourceReference extends ResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ArchiveResourceReference() {
- super("archive");
- }
-
- @Override
- public IResource getResource() {
- return new ArchiveResource();
- }
-
-}
+package com.gitplex.web.resource;
+
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
+
+public class ArchiveResourceReference extends ResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public ArchiveResourceReference() {
+ super("archive");
+ }
+
+ @Override
+ public IResource getResource() {
+ return new ArchiveResource();
+ }
+
+}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/AttachmentResource.java b/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResource.java
similarity index 92%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/resource/AttachmentResource.java
rename to gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResource.java
index a13cff1500..1aece038b5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/AttachmentResource.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.resource;
+package com.gitplex.web.resource;
import java.io.File;
import java.io.FileInputStream;
@@ -17,13 +17,13 @@ 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.google.common.base.Charsets;
import com.google.common.base.Preconditions;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.AttachmentManager;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
public class AttachmentResource extends AbstractResource {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/AttachmentResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResourceReference.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/resource/AttachmentResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResourceReference.java
index be158b27a1..96f650c1a2 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/AttachmentResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/resource/AttachmentResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.resource;
+package com.gitplex.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/pmease/gitplex/web/resource/BlobResource.java b/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResource.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/resource/BlobResource.java
rename to gitplex.web/src/main/java/com/gitplex/web/resource/BlobResource.java
index afafd02f7f..6a014ef3e6 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/BlobResource.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResource.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.resource;
+package com.gitplex.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.pmease.commons.git.Blob;
-import com.pmease.commons.git.BlobIdent;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.DepotManager;
-import com.pmease.gitplex.core.security.SecurityUtils;
+import com.gitplex.commons.git.Blob;
+import com.gitplex.commons.git.BlobIdent;
+import com.gitplex.commons.git.GitUtils;
public class BlobResource extends AbstractResource {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/BlobResourceReference.java b/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResourceReference.java
similarity index 90%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/resource/BlobResourceReference.java
rename to gitplex.web/src/main/java/com/gitplex/web/resource/BlobResourceReference.java
index 618e47c00b..c2465b691d 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/resource/BlobResourceReference.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/resource/BlobResourceReference.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.resource;
+package com.gitplex.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/pmease/gitplex/web/util/DateUtils.java b/gitplex.web/src/main/java/com/gitplex/web/util/DateUtils.java
similarity index 83%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/util/DateUtils.java
rename to gitplex.web/src/main/java/com/gitplex/web/util/DateUtils.java
index 55a27d86b0..efb1893162 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/util/DateUtils.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/util/DateUtils.java
@@ -1,24 +1,24 @@
-package com.pmease.gitplex.web.util;
-
-import java.util.Date;
-
-import org.joda.time.DateTime;
-import org.ocpsoft.prettytime.PrettyTime;
-
-import com.pmease.gitplex.web.Constants;
-
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-
- public static String formatAge(Date date) {
- return new PrettyTime().format(date);
- }
-
- public static String formatDate(Date date) {
- return Constants.DATE_FORMATTER.print(new DateTime(date));
- }
-
- public static String formatDateTime(Date date) {
- return Constants.DATETIME_FORMATTER.print(new DateTime(date));
- }
-
+package com.gitplex.web.util;
+
+import java.util.Date;
+
+import org.joda.time.DateTime;
+import org.ocpsoft.prettytime.PrettyTime;
+
+import com.gitplex.web.Constants;
+
+public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
+
+ public static String formatAge(Date date) {
+ return new PrettyTime().format(date);
+ }
+
+ public static String formatDate(Date date) {
+ return Constants.DATE_FORMATTER.print(new DateTime(date));
+ }
+
+ public static String formatDateTime(Date date) {
+ return Constants.DATETIME_FORMATTER.print(new DateTime(date));
+ }
+
}
\ No newline at end of file
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/util/SuggestionUtils.java b/gitplex.web/src/main/java/com/gitplex/web/util/SuggestionUtils.java
similarity index 91%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/util/SuggestionUtils.java
rename to gitplex.web/src/main/java/com/gitplex/web/util/SuggestionUtils.java
index 5b3c575427..5af24e22d1 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/util/SuggestionUtils.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/util/SuggestionUtils.java
@@ -1,4 +1,4 @@
-package com.pmease.gitplex.web.util;
+package com.gitplex.web.util;
import java.util.ArrayList;
import java.util.HashMap;
@@ -10,17 +10,17 @@ 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.pmease.commons.antlr.codeassist.InputSuggestion;
-import com.pmease.commons.git.GitUtils;
-import com.pmease.commons.git.RefInfo;
-import com.pmease.commons.hibernate.dao.Dao;
-import com.pmease.commons.util.Range;
-import com.pmease.commons.util.match.PatternApplied;
-import com.pmease.commons.util.match.WildcardUtils;
-import com.pmease.gitplex.core.GitPlex;
-import com.pmease.gitplex.core.entity.Depot;
-import com.pmease.gitplex.core.manager.CommitInfoManager;
+import com.gitplex.commons.antlr.codeassist.InputSuggestion;
+import com.gitplex.commons.git.GitUtils;
+import com.gitplex.commons.git.RefInfo;
+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;
public class SuggestionUtils {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CodeCommentChangeBroadcaster.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangeBroadcaster.java
similarity index 64%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CodeCommentChangeBroadcaster.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangeBroadcaster.java
index 26abc309a8..d6d76bfbdd 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CodeCommentChangeBroadcaster.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangeBroadcaster.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.wicket.WicketUtils;
-import com.pmease.commons.wicket.websocket.PageKey;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.gitplex.core.event.codecomment.CodeCommentEvent;
+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;
@Singleton
public class CodeCommentChangeBroadcaster {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CodeCommentChangedRegion.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangedRegion.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CodeCommentChangedRegion.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangedRegion.java
index b07cd0c27c..4b72a23ca5 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CodeCommentChangedRegion.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/CodeCommentChangedRegion.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
public class CodeCommentChangedRegion implements WebSocketRegion {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CommitIndexedBroadcaster.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedBroadcaster.java
similarity index 71%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CommitIndexedBroadcaster.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedBroadcaster.java
index 3b7e3f49f4..8181e8b2c3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CommitIndexedBroadcaster.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedBroadcaster.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.gitplex.search.CommitIndexed;
+import com.gitplex.search.CommitIndexed;
+import com.gitplex.commons.loader.Listen;
+import com.gitplex.commons.wicket.websocket.WebSocketManager;
@Singleton
public class CommitIndexedBroadcaster {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CommitIndexedRegion.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedRegion.java
similarity index 85%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CommitIndexedRegion.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedRegion.java
index 4c51c9fb97..1268bc0ea4 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/CommitIndexedRegion.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/CommitIndexedRegion.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
import org.eclipse.jgit.lib.ObjectId;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
public class CommitIndexedRegion implements WebSocketRegion {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChangeBroadcaster.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangeBroadcaster.java
similarity index 64%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChangeBroadcaster.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangeBroadcaster.java
index 1dc7d2bef5..1410f40158 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChangeBroadcaster.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangeBroadcaster.java
@@ -1,13 +1,13 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.wicket.WicketUtils;
-import com.pmease.commons.wicket.websocket.PageKey;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.gitplex.core.event.pullrequest.PullRequestChangeEvent;
+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;
@Singleton
public class PullRequestChangeBroadcaster {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChanged.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChanged.java
similarity index 74%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChanged.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChanged.java
index b3a2654a92..fe2a52abad 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChanged.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChanged.java
@@ -1,8 +1,8 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-import com.pmease.commons.wicket.AjaxEvent;
+import com.gitplex.commons.wicket.AjaxEvent;
public class PullRequestChanged extends AjaxEvent {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChangedRegion.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangedRegion.java
similarity index 82%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChangedRegion.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangedRegion.java
index ebe7a955a1..239af45e9e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/PullRequestChangedRegion.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/PullRequestChangedRegion.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
public class PullRequestChangedRegion implements WebSocketRegion {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/TaskChangeBroadcaster.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangeBroadcaster.java
similarity index 69%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/TaskChangeBroadcaster.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangeBroadcaster.java
index 80fecda3c0..d87087fb0e 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/TaskChangeBroadcaster.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangeBroadcaster.java
@@ -1,11 +1,11 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
import javax.inject.Inject;
import javax.inject.Singleton;
-import com.pmease.commons.loader.Listen;
-import com.pmease.commons.wicket.websocket.WebSocketManager;
-import com.pmease.gitplex.core.event.TaskChangeEvent;
+import com.gitplex.core.event.TaskChangeEvent;
+import com.gitplex.commons.loader.Listen;
+import com.gitplex.commons.wicket.websocket.WebSocketManager;
@Singleton
public class TaskChangeBroadcaster {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/TaskChangedRegion.java b/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangedRegion.java
similarity index 81%
rename from gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/TaskChangedRegion.java
rename to gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangedRegion.java
index 882d45b223..0e7b0092f3 100644
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/websocket/TaskChangedRegion.java
+++ b/gitplex.web/src/main/java/com/gitplex/web/websocket/TaskChangedRegion.java
@@ -1,6 +1,6 @@
-package com.pmease.gitplex.web.websocket;
+package com.gitplex.web.websocket;
-import com.pmease.commons.wicket.websocket.WebSocketRegion;
+import com.gitplex.commons.wicket.websocket.WebSocketRegion;
public class TaskChangedRegion implements WebSocketRegion {
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/assets/Assets.java b/gitplex.web/src/main/java/com/pmease/gitplex/web/assets/Assets.java
deleted file mode 100644
index 5b961593e8..0000000000
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/assets/Assets.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.web.assets;
-
-public class Assets {
-
-}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java b/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java
deleted file mode 100644
index b3ebb54d06..0000000000
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/gitlink/GitLinkRenderer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.gitlink;
-
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.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/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java b/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java
deleted file mode 100644
index ffab11d497..0000000000
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/depotfile/blobview/symbollink/SymbolLinkRenderer.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.pmease.gitplex.web.component.depotfile.blobview.symbollink;
-
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobRenderer;
-import com.pmease.gitplex.web.component.depotfile.blobview.BlobViewContext;
-import com.pmease.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/pmease/gitplex/web/component/diff/revision/DiffViewMode.java b/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/DiffViewMode.java
deleted file mode 100644
index 43ee6152c1..0000000000
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/component/diff/revision/DiffViewMode.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.web.component.diff.revision;
-
-public enum DiffViewMode {
- UNIFIED, SPLIT
-}
diff --git a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/EditSupportLocator.java b/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/EditSupportLocator.java
deleted file mode 100644
index 2c52df2192..0000000000
--- a/gitplex.web/src/main/java/com/pmease/gitplex/web/editable/EditSupportLocator.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.pmease.gitplex.web.editable;
-
-public class EditSupportLocator {
-
-}