diff --git a/core/pom.xml b/core/pom.xml index c5bd7b46da..65b590c407 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -3,14 +3,14 @@ 4.0.0 server-core - com.turbodev + io.onedev server-parent - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev plugin-maven @@ -136,7 +136,7 @@ unbescape - com.turbodev + io.onedev launcher-loader 1.0.0 @@ -170,12 +170,12 @@ tika-core - com.turbodev + io.onedev jsymbol 1.0.0 - com.turbodev + io.onedev jsyntax 1.0.0 @@ -215,7 +215,7 @@ ${flexmark.version} - com.turbodev + io.onedev jsyntax 1.0.0 @@ -267,7 +267,7 @@ - com.turbodev.server.CoreModule + io.onedev.server.CoreModule 5.2.10.Final 1.4.0 4.7.0.201704051617-r diff --git a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarted.java b/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarted.java deleted file mode 100644 index 4fe950c5f8..0000000000 --- a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarted.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.event.lifecycle; - -public class SystemStarted { - -} diff --git a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarting.java b/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarting.java deleted file mode 100644 index 3c090cbd2f..0000000000 --- a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarting.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.event.lifecycle; - -public class SystemStarting { - -} diff --git a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopped.java b/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopped.java deleted file mode 100644 index 563d68a465..0000000000 --- a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopped.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.event.lifecycle; - -public class SystemStopped { - -} diff --git a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopping.java b/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopping.java deleted file mode 100644 index 741321836f..0000000000 --- a/core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopping.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.event.lifecycle; - -public class SystemStopping { - -} diff --git a/core/src/main/java/com/turbodev/server/manager/BatchWorkManager.java b/core/src/main/java/com/turbodev/server/manager/BatchWorkManager.java deleted file mode 100644 index 8d212ead2b..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/BatchWorkManager.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.turbodev.server.manager; - -import com.turbodev.utils.concurrent.Prioritized; -import com.turbodev.server.util.BatchWorker; - -public interface BatchWorkManager { - - void submit(BatchWorker worker, Prioritized work); - -} diff --git a/core/src/main/java/com/turbodev/server/manager/CodeCommentRelationManager.java b/core/src/main/java/com/turbodev/server/manager/CodeCommentRelationManager.java deleted file mode 100644 index e6b9912771..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/CodeCommentRelationManager.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.turbodev.server.manager; - -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentRelation; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.dao.EntityManager; - -public interface CodeCommentRelationManager extends EntityManager { - - CodeCommentRelation find(PullRequest request, CodeComment comment); - -} diff --git a/core/src/main/java/com/turbodev/server/manager/CodeCommentReplyManager.java b/core/src/main/java/com/turbodev/server/manager/CodeCommentReplyManager.java deleted file mode 100644 index 164be37b14..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/CodeCommentReplyManager.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.turbodev.server.manager; - -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.persistence.dao.EntityManager; - -public interface CodeCommentReplyManager extends EntityManager { - - void save(CodeCommentReply reply, CompareContext compareContext, PullRequest request); - -} diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestReferenceManager.java b/core/src/main/java/com/turbodev/server/manager/PullRequestReferenceManager.java deleted file mode 100644 index 95a394c6ed..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestReferenceManager.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.turbodev.server.manager; - -import com.turbodev.server.model.PullRequestReference; -import com.turbodev.server.persistence.dao.EntityManager; - -public interface PullRequestReferenceManager extends EntityManager { - -} diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestTaskManager.java b/core/src/main/java/com/turbodev/server/manager/PullRequestTaskManager.java deleted file mode 100644 index f813948802..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestTaskManager.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.turbodev.server.manager; - -import com.turbodev.server.model.PullRequestTask; -import com.turbodev.server.persistence.dao.EntityManager; - -public interface PullRequestTaskManager extends EntityManager { - -} diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestWatchManager.java b/core/src/main/java/com/turbodev/server/manager/PullRequestWatchManager.java deleted file mode 100644 index 9c146e063e..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestWatchManager.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.turbodev.server.manager; - -import com.turbodev.server.model.PullRequestWatch; -import com.turbodev.server.persistence.dao.EntityManager; - -public interface PullRequestWatchManager extends EntityManager { - -} diff --git a/core/src/main/java/com/turbodev/server/manager/UserInfoManager.java b/core/src/main/java/com/turbodev/server/manager/UserInfoManager.java deleted file mode 100644 index 8274cb164d..0000000000 --- a/core/src/main/java/com/turbodev/server/manager/UserInfoManager.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.turbodev.server.manager; - -import java.util.Date; - -import javax.annotation.Nullable; - -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserFacade; - -public interface UserInfoManager { - - void visit(User user, Project project); - - @Nullable - Date getVisitDate(UserFacade user, ProjectFacade project); - -} diff --git a/core/src/main/java/com/turbodev/server/model/ModelLocator.java b/core/src/main/java/com/turbodev/server/model/ModelLocator.java deleted file mode 100644 index e9a37289d2..0000000000 --- a/core/src/main/java/com/turbodev/server/model/ModelLocator.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.model; - -public class ModelLocator { - -} diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java b/core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java deleted file mode 100644 index 1eca849bf9..0000000000 --- a/core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.turbodev.server.model.support.submitter; - -import java.io.Serializable; - -import javax.annotation.Nullable; - -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; - -@Editable -public interface Submitter extends Serializable { - - boolean matches(Project project, @Nullable User user); - -} diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/GroupRetrieval.java b/core/src/main/java/com/turbodev/server/security/authenticator/ldap/GroupRetrieval.java deleted file mode 100644 index c72ed22f5c..0000000000 --- a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/GroupRetrieval.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.turbodev.server.security.authenticator.ldap; - -import java.io.Serializable; - -import com.turbodev.server.util.editable.annotation.Editable; - -@Editable -public interface GroupRetrieval extends Serializable { - -} diff --git a/core/src/main/java/com/turbodev/server/util/jackson/DefaultView.java b/core/src/main/java/com/turbodev/server/util/jackson/DefaultView.java deleted file mode 100644 index 25157cb2a2..0000000000 --- a/core/src/main/java/com/turbodev/server/util/jackson/DefaultView.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.util.jackson; - -public class DefaultView { - -} diff --git a/core/src/main/java/com/turbodev/server/util/jackson/RestView.java b/core/src/main/java/com/turbodev/server/util/jackson/RestView.java deleted file mode 100644 index 2f90885d0d..0000000000 --- a/core/src/main/java/com/turbodev/server/util/jackson/RestView.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.util.jackson; - -public class RestView { - -} diff --git a/core/src/main/java/com/turbodev/server/util/validation/EntityValidator.java b/core/src/main/java/com/turbodev/server/util/validation/EntityValidator.java deleted file mode 100644 index 539cd523cb..0000000000 --- a/core/src/main/java/com/turbodev/server/util/validation/EntityValidator.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.turbodev.server.util.validation; - -import com.turbodev.server.model.AbstractEntity; - -public interface EntityValidator { - void validate(AbstractEntity entity); -} diff --git a/core/src/main/java/com/turbodev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java similarity index 61% rename from core/src/main/java/com/turbodev/server/CoreModule.java rename to core/src/main/java/io/onedev/server/CoreModule.java index 4172da135b..0fbe75e2bd 100644 --- a/core/src/main/java/com/turbodev/server/CoreModule.java +++ b/core/src/main/java/io/onedev/server/CoreModule.java @@ -1,4 +1,4 @@ -package com.turbodev.server; +package io.onedev.server; import java.io.Serializable; import java.lang.reflect.AnnotatedElement; @@ -35,12 +35,128 @@ import org.hibernate.collection.internal.PersistentBag; import org.hibernate.type.Type; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.launcher.loader.AbstractPlugin; -import com.turbodev.launcher.loader.AbstractPluginModule; -import com.turbodev.utils.ClassUtils; -import com.turbodev.utils.schedule.DefaultTaskScheduler; -import com.turbodev.utils.schedule.TaskScheduler; + +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.loader.AbstractPlugin; +import io.onedev.launcher.loader.AbstractPluginModule; +import io.onedev.server.command.ApplyDBConstraintsCommand; +import io.onedev.server.command.BackupDBCommand; +import io.onedev.server.command.CheckDataVersionCommand; +import io.onedev.server.command.CleanDBCommand; +import io.onedev.server.command.CommandNames; +import io.onedev.server.command.DBDialectCommand; +import io.onedev.server.command.ResetAdminPasswordCommand; +import io.onedev.server.command.RestoreDBCommand; +import io.onedev.server.command.UpgradeCommand; +import io.onedev.server.git.config.GitConfig; +import io.onedev.server.git.jackson.GitObjectMapperConfigurator; +import io.onedev.server.manager.AttachmentManager; +import io.onedev.server.manager.BatchWorkManager; +import io.onedev.server.manager.BranchWatchManager; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CodeCommentRelationInfoManager; +import io.onedev.server.manager.CodeCommentRelationManager; +import io.onedev.server.manager.CodeCommentReplyManager; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.DataManager; +import io.onedev.server.manager.GroupAuthorizationManager; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.manager.MembershipManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.PullRequestCommentManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestReferenceManager; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.manager.PullRequestTaskManager; +import io.onedev.server.manager.PullRequestUpdateManager; +import io.onedev.server.manager.PullRequestWatchManager; +import io.onedev.server.manager.ReviewInvitationManager; +import io.onedev.server.manager.ReviewManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.manager.UserAuthorizationManager; +import io.onedev.server.manager.UserInfoManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.manager.WorkExecutor; +import io.onedev.server.manager.impl.DefaultAttachmentManager; +import io.onedev.server.manager.impl.DefaultBatchWorkManager; +import io.onedev.server.manager.impl.DefaultBranchWatchManager; +import io.onedev.server.manager.impl.DefaultCacheManager; +import io.onedev.server.manager.impl.DefaultCodeCommentManager; +import io.onedev.server.manager.impl.DefaultCodeCommentRelationInfoManager; +import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager; +import io.onedev.server.manager.impl.DefaultCodeCommentReplyManager; +import io.onedev.server.manager.impl.DefaultCommitInfoManager; +import io.onedev.server.manager.impl.DefaultConfigManager; +import io.onedev.server.manager.impl.DefaultDataManager; +import io.onedev.server.manager.impl.DefaultGroupAuthorizationManager; +import io.onedev.server.manager.impl.DefaultGroupManager; +import io.onedev.server.manager.impl.DefaultMailManager; +import io.onedev.server.manager.impl.DefaultMarkdownManager; +import io.onedev.server.manager.impl.DefaultMembershipManager; +import io.onedev.server.manager.impl.DefaultNotificationManager; +import io.onedev.server.manager.impl.DefaultProjectManager; +import io.onedev.server.manager.impl.DefaultPullRequestCommentManager; +import io.onedev.server.manager.impl.DefaultPullRequestManager; +import io.onedev.server.manager.impl.DefaultPullRequestReferenceManager; +import io.onedev.server.manager.impl.DefaultPullRequestStatusChangeManager; +import io.onedev.server.manager.impl.DefaultPullRequestTaskManager; +import io.onedev.server.manager.impl.DefaultPullRequestUpdateManager; +import io.onedev.server.manager.impl.DefaultPullRequestWatchManager; +import io.onedev.server.manager.impl.DefaultReviewInvitationManager; +import io.onedev.server.manager.impl.DefaultReviewManager; +import io.onedev.server.manager.impl.DefaultStorageManager; +import io.onedev.server.manager.impl.DefaultUserAuthorizationManager; +import io.onedev.server.manager.impl.DefaultUserInfoManager; +import io.onedev.server.manager.impl.DefaultUserManager; +import io.onedev.server.manager.impl.DefaultVerificationManager; +import io.onedev.server.manager.impl.DefaultVisitManager; +import io.onedev.server.manager.impl.DefaultWorkExecutor; +import io.onedev.server.manager.impl.NotificationManager; +import io.onedev.server.migration.JpaConverter; +import io.onedev.server.migration.PersistentBagConverter; +import io.onedev.server.persistence.DefaultIdManager; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.DefaultUnitOfWork; +import io.onedev.server.persistence.HibernateInterceptor; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.PersistListener; +import io.onedev.server.persistence.PersistManager; +import io.onedev.server.persistence.PrefixedNamingStrategy; +import io.onedev.server.persistence.SessionFactoryProvider; +import io.onedev.server.persistence.SessionInterceptor; +import io.onedev.server.persistence.SessionProvider; +import io.onedev.server.persistence.TransactionInterceptor; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.DefaultDao; +import io.onedev.server.security.BasicAuthenticationFilter; +import io.onedev.server.security.FilterChainConfigurator; +import io.onedev.server.security.OneDevAuthorizingRealm; +import io.onedev.server.security.OneDevFilterChainResolver; +import io.onedev.server.security.OneDevPasswordService; +import io.onedev.server.security.OneDevRememberMeManager; +import io.onedev.server.security.OneDevWebSecurityManager; +import io.onedev.server.security.authenticator.Authenticator; +import io.onedev.server.util.jackson.ObjectMapperConfigurator; +import io.onedev.server.util.jackson.ObjectMapperProvider; +import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator; +import io.onedev.server.util.jetty.DefaultJettyRunner; +import io.onedev.server.util.jetty.JettyRunner; +import io.onedev.server.util.validation.DefaultEntityValidator; +import io.onedev.server.util.validation.EntityValidator; +import io.onedev.server.util.validation.ValidatorProvider; +import io.onedev.utils.ClassUtils; +import io.onedev.utils.schedule.DefaultTaskScheduler; +import io.onedev.utils.schedule.TaskScheduler; + import com.google.inject.matcher.AbstractMatcher; import com.google.inject.matcher.Matchers; import com.thoughtworks.xstream.XStream; @@ -51,120 +167,6 @@ import com.thoughtworks.xstream.converters.extended.ISO8601SqlTimestampConverter import com.thoughtworks.xstream.converters.reflection.ReflectionProvider; import com.thoughtworks.xstream.core.JVM; import com.thoughtworks.xstream.mapper.MapperWrapper; -import com.turbodev.server.command.ApplyDBConstraintsCommand; -import com.turbodev.server.command.BackupDBCommand; -import com.turbodev.server.command.CheckDataVersionCommand; -import com.turbodev.server.command.CleanDBCommand; -import com.turbodev.server.command.CommandNames; -import com.turbodev.server.command.DBDialectCommand; -import com.turbodev.server.command.ResetAdminPasswordCommand; -import com.turbodev.server.command.RestoreDBCommand; -import com.turbodev.server.command.UpgradeCommand; -import com.turbodev.server.git.config.GitConfig; -import com.turbodev.server.git.jackson.GitObjectMapperConfigurator; -import com.turbodev.server.manager.AttachmentManager; -import com.turbodev.server.manager.BatchWorkManager; -import com.turbodev.server.manager.BranchWatchManager; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CodeCommentRelationInfoManager; -import com.turbodev.server.manager.CodeCommentRelationManager; -import com.turbodev.server.manager.CodeCommentReplyManager; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.DataManager; -import com.turbodev.server.manager.GroupAuthorizationManager; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.manager.MembershipManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.PullRequestCommentManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestReferenceManager; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.manager.PullRequestTaskManager; -import com.turbodev.server.manager.PullRequestUpdateManager; -import com.turbodev.server.manager.PullRequestWatchManager; -import com.turbodev.server.manager.ReviewInvitationManager; -import com.turbodev.server.manager.ReviewManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.manager.UserAuthorizationManager; -import com.turbodev.server.manager.UserInfoManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.manager.WorkExecutor; -import com.turbodev.server.manager.impl.DefaultAttachmentManager; -import com.turbodev.server.manager.impl.DefaultBatchWorkManager; -import com.turbodev.server.manager.impl.DefaultBranchWatchManager; -import com.turbodev.server.manager.impl.DefaultCacheManager; -import com.turbodev.server.manager.impl.DefaultCodeCommentManager; -import com.turbodev.server.manager.impl.DefaultCodeCommentRelationInfoManager; -import com.turbodev.server.manager.impl.DefaultCodeCommentRelationManager; -import com.turbodev.server.manager.impl.DefaultCodeCommentReplyManager; -import com.turbodev.server.manager.impl.DefaultCommitInfoManager; -import com.turbodev.server.manager.impl.DefaultConfigManager; -import com.turbodev.server.manager.impl.DefaultDataManager; -import com.turbodev.server.manager.impl.DefaultGroupAuthorizationManager; -import com.turbodev.server.manager.impl.DefaultGroupManager; -import com.turbodev.server.manager.impl.DefaultMailManager; -import com.turbodev.server.manager.impl.DefaultMarkdownManager; -import com.turbodev.server.manager.impl.DefaultMembershipManager; -import com.turbodev.server.manager.impl.DefaultNotificationManager; -import com.turbodev.server.manager.impl.DefaultProjectManager; -import com.turbodev.server.manager.impl.DefaultPullRequestCommentManager; -import com.turbodev.server.manager.impl.DefaultPullRequestManager; -import com.turbodev.server.manager.impl.DefaultPullRequestReferenceManager; -import com.turbodev.server.manager.impl.DefaultPullRequestStatusChangeManager; -import com.turbodev.server.manager.impl.DefaultPullRequestTaskManager; -import com.turbodev.server.manager.impl.DefaultPullRequestUpdateManager; -import com.turbodev.server.manager.impl.DefaultPullRequestWatchManager; -import com.turbodev.server.manager.impl.DefaultReviewInvitationManager; -import com.turbodev.server.manager.impl.DefaultReviewManager; -import com.turbodev.server.manager.impl.DefaultStorageManager; -import com.turbodev.server.manager.impl.DefaultUserAuthorizationManager; -import com.turbodev.server.manager.impl.DefaultUserInfoManager; -import com.turbodev.server.manager.impl.DefaultUserManager; -import com.turbodev.server.manager.impl.DefaultVerificationManager; -import com.turbodev.server.manager.impl.DefaultVisitManager; -import com.turbodev.server.manager.impl.DefaultWorkExecutor; -import com.turbodev.server.manager.impl.NotificationManager; -import com.turbodev.server.migration.JpaConverter; -import com.turbodev.server.migration.PersistentBagConverter; -import com.turbodev.server.persistence.DefaultIdManager; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.DefaultUnitOfWork; -import com.turbodev.server.persistence.HibernateInterceptor; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.PersistListener; -import com.turbodev.server.persistence.PersistManager; -import com.turbodev.server.persistence.PrefixedNamingStrategy; -import com.turbodev.server.persistence.SessionFactoryProvider; -import com.turbodev.server.persistence.SessionInterceptor; -import com.turbodev.server.persistence.SessionProvider; -import com.turbodev.server.persistence.TransactionInterceptor; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.DefaultDao; -import com.turbodev.server.security.BasicAuthenticationFilter; -import com.turbodev.server.security.FilterChainConfigurator; -import com.turbodev.server.security.TurboDevAuthorizingRealm; -import com.turbodev.server.security.TurboDevFilterChainResolver; -import com.turbodev.server.security.TurboDevPasswordService; -import com.turbodev.server.security.TurboDevRememberMeManager; -import com.turbodev.server.security.TurboDevWebSecurityManager; -import com.turbodev.server.security.authenticator.Authenticator; -import com.turbodev.server.util.jackson.ObjectMapperConfigurator; -import com.turbodev.server.util.jackson.ObjectMapperProvider; -import com.turbodev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator; -import com.turbodev.server.util.jetty.DefaultJettyRunner; -import com.turbodev.server.util.jetty.JettyRunner; -import com.turbodev.server.util.validation.DefaultEntityValidator; -import com.turbodev.server.util.validation.EntityValidator; -import com.turbodev.server.util.validation.ValidatorProvider; /** * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class. @@ -246,12 +248,12 @@ public class CoreModule extends AbstractPluginModule { contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class); contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class); - bind(Realm.class).to(TurboDevAuthorizingRealm.class); - bind(RememberMeManager.class).to(TurboDevRememberMeManager.class); - bind(WebSecurityManager.class).to(TurboDevWebSecurityManager.class); - bind(FilterChainResolver.class).to(TurboDevFilterChainResolver.class); + bind(Realm.class).to(OneDevAuthorizingRealm.class); + bind(RememberMeManager.class).to(OneDevRememberMeManager.class); + bind(WebSecurityManager.class).to(OneDevWebSecurityManager.class); + bind(FilterChainResolver.class).to(OneDevFilterChainResolver.class); bind(BasicAuthenticationFilter.class); - bind(PasswordService.class).to(TurboDevPasswordService.class); + bind(PasswordService.class).to(OneDevPasswordService.class); bind(ShiroFilter.class); install(new ShiroAopModule()); contribute(FilterChainConfigurator.class, new FilterChainConfigurator() { @@ -407,7 +409,7 @@ public class CoreModule extends AbstractPluginModule { @Override protected Class getPluginClass() { - return TurboDev.class; + return OneDev.class; } } diff --git a/core/src/main/java/com/turbodev/server/GitConfigProvider.java b/core/src/main/java/io/onedev/server/GitConfigProvider.java similarity index 76% rename from core/src/main/java/com/turbodev/server/GitConfigProvider.java rename to core/src/main/java/io/onedev/server/GitConfigProvider.java index b038373b57..7f57d06a94 100644 --- a/core/src/main/java/com/turbodev/server/GitConfigProvider.java +++ b/core/src/main/java/io/onedev/server/GitConfigProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server; +package io.onedev.server; import javax.inject.Inject; import javax.inject.Provider; import javax.inject.Singleton; -import com.turbodev.server.git.config.GitConfig; -import com.turbodev.server.manager.ConfigManager; +import io.onedev.server.git.config.GitConfig; +import io.onedev.server.manager.ConfigManager; @Singleton public class GitConfigProvider implements Provider { diff --git a/core/src/main/java/com/turbodev/server/TurboDev.java b/core/src/main/java/io/onedev/server/OneDev.java similarity index 72% rename from core/src/main/java/com/turbodev/server/TurboDev.java rename to core/src/main/java/io/onedev/server/OneDev.java index 5274c493ab..a41cde388f 100644 --- a/core/src/main/java/com/turbodev/server/TurboDev.java +++ b/core/src/main/java/io/onedev/server/OneDev.java @@ -1,4 +1,4 @@ -package com.turbodev.server; +package io.onedev.server; import java.io.ObjectStreamException; import java.io.Serializable; @@ -17,32 +17,32 @@ import org.apache.shiro.util.ThreadContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.launcher.loader.AbstractPlugin; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.launcher.loader.ManagedSerializedForm; -import com.turbodev.utils.init.InitStage; -import com.turbodev.utils.init.ManualConfig; -import com.turbodev.utils.schedule.TaskScheduler; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.event.lifecycle.SystemStarting; -import com.turbodev.server.event.lifecycle.SystemStopped; -import com.turbodev.server.event.lifecycle.SystemStopping; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.DataManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.persistence.PersistManager; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.util.jetty.JettyRunner; -import com.turbodev.server.util.serverconfig.ServerConfig; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.loader.AbstractPlugin; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.launcher.loader.ManagedSerializedForm; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.event.lifecycle.SystemStarting; +import io.onedev.server.event.lifecycle.SystemStopped; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.DataManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.persistence.PersistManager; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.util.jetty.JettyRunner; +import io.onedev.server.util.serverconfig.ServerConfig; +import io.onedev.utils.init.InitStage; +import io.onedev.utils.init.ManualConfig; +import io.onedev.utils.schedule.TaskScheduler; -public class TurboDev extends AbstractPlugin implements Serializable { +public class OneDev extends AbstractPlugin implements Serializable { - public static final String NAME = "TurboDev"; + public static final String NAME = "OneDev"; - private static final Logger logger = LoggerFactory.getLogger(TurboDev.class); + private static final Logger logger = LoggerFactory.getLogger(OneDev.class); private static final Pattern DOCLINK_PATTERN = Pattern.compile("\\d+\\.\\d+"); @@ -67,7 +67,7 @@ public class TurboDev extends AbstractPlugin implements Serializable { private volatile InitStage initStage; @Inject - public TurboDev(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler, + public OneDev(JettyRunner jettyRunner, PersistManager persistManager, TaskScheduler taskScheduler, UnitOfWork unitOfWork, ServerConfig serverConfig, DataManager dataManager, ConfigManager configManager, UserManager userManager, ListenerRegistry listenerRegistry) { this.jettyRunner = jettyRunner; @@ -151,8 +151,8 @@ public class TurboDev extends AbstractPlugin implements Serializable { return initStage == null; } - public static TurboDev getInstance() { - return AppLoader.getInstance(TurboDev.class); + public static OneDev getInstance() { + return AppLoader.getInstance(OneDev.class); } public static T getInstance(Class type) { @@ -186,7 +186,7 @@ public class TurboDev extends AbstractPlugin implements Serializable { } public Object writeReplace() throws ObjectStreamException { - return new ManagedSerializedForm(TurboDev.class); + return new ManagedSerializedForm(OneDev.class); } public String getDocLink() { @@ -194,7 +194,7 @@ public class TurboDev extends AbstractPlugin implements Serializable { Matcher matcher = DOCLINK_PATTERN.matcher(productVersion); if (!matcher.find()) throw new RuntimeException("Unexpected product version format: " + productVersion); - return "https://dev.turbodev.com/projects/turbodev-docs/blob/" + matcher.group(); + return "https://go.onedev.io/projects/onedev-docs/blob/" + matcher.group(); } } diff --git a/core/src/main/java/com/turbodev/server/command/ApplyDBConstraintsCommand.java b/core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java similarity index 84% rename from core/src/main/java/com/turbodev/server/command/ApplyDBConstraintsCommand.java rename to core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java index 103a2b057d..02826d6383 100644 --- a/core/src/main/java/com/turbodev/server/command/ApplyDBConstraintsCommand.java +++ b/core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import java.io.BufferedReader; import java.io.IOException; @@ -14,12 +14,12 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; @Singleton public class ApplyDBConstraintsCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/BackupDBCommand.java b/core/src/main/java/io/onedev/server/command/BackupDBCommand.java similarity index 82% rename from core/src/main/java/com/turbodev/server/command/BackupDBCommand.java rename to core/src/main/java/io/onedev/server/command/BackupDBCommand.java index 81f1b8d215..d3fe1286f7 100644 --- a/core/src/main/java/com/turbodev/server/command/BackupDBCommand.java +++ b/core/src/main/java/io/onedev/server/command/BackupDBCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import java.io.File; @@ -11,15 +11,16 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.ZipUtils; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; +import io.onedev.utils.FileUtils; +import io.onedev.utils.ZipUtils; + import com.google.common.base.Throwables; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; @Singleton public class BackupDBCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/CheckDataVersionCommand.java b/core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java similarity index 77% rename from core/src/main/java/com/turbodev/server/command/CheckDataVersionCommand.java rename to core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java index e10bce0115..17df6da585 100644 --- a/core/src/main/java/com/turbodev/server/command/CheckDataVersionCommand.java +++ b/core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import javax.inject.Inject; import javax.inject.Singleton; @@ -9,12 +9,12 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; @Singleton public class CheckDataVersionCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/CleanDBCommand.java b/core/src/main/java/io/onedev/server/command/CleanDBCommand.java similarity index 78% rename from core/src/main/java/com/turbodev/server/command/CleanDBCommand.java rename to core/src/main/java/io/onedev/server/command/CleanDBCommand.java index 148aa9cb4b..da840274a4 100644 --- a/core/src/main/java/com/turbodev/server/command/CleanDBCommand.java +++ b/core/src/main/java/io/onedev/server/command/CleanDBCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import javax.inject.Inject; import javax.inject.Singleton; @@ -10,12 +10,12 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; @Singleton public class CleanDBCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/CommandNames.java b/core/src/main/java/io/onedev/server/command/CommandNames.java similarity index 95% rename from core/src/main/java/com/turbodev/server/command/CommandNames.java rename to core/src/main/java/io/onedev/server/command/CommandNames.java index cb5740c3a9..30de3702e9 100644 --- a/core/src/main/java/com/turbodev/server/command/CommandNames.java +++ b/core/src/main/java/io/onedev/server/command/CommandNames.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; public class CommandNames { diff --git a/core/src/main/java/com/turbodev/server/command/DBDialectCommand.java b/core/src/main/java/io/onedev/server/command/DBDialectCommand.java similarity index 73% rename from core/src/main/java/com/turbodev/server/command/DBDialectCommand.java rename to core/src/main/java/io/onedev/server/command/DBDialectCommand.java index 3f591526b3..6bf60a3d31 100644 --- a/core/src/main/java/com/turbodev/server/command/DBDialectCommand.java +++ b/core/src/main/java/io/onedev/server/command/DBDialectCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import javax.inject.Inject; import javax.inject.Singleton; @@ -7,11 +7,11 @@ import org.hibernate.Interceptor; import org.hibernate.SessionFactory; import org.hibernate.boot.model.naming.PhysicalNamingStrategy; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; @Singleton public class DBDialectCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/ResetAdminPasswordCommand.java b/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java similarity index 82% rename from core/src/main/java/com/turbodev/server/command/ResetAdminPasswordCommand.java rename to core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java index 5f9d1bb061..9b55771bd3 100644 --- a/core/src/main/java/com/turbodev/server/command/ResetAdminPasswordCommand.java +++ b/core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import javax.inject.Inject; import javax.inject.Singleton; @@ -10,14 +10,14 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; @Singleton public class ResetAdminPasswordCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/RestoreDBCommand.java b/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java similarity index 86% rename from core/src/main/java/com/turbodev/server/command/RestoreDBCommand.java rename to core/src/main/java/io/onedev/server/command/RestoreDBCommand.java index 7b33ee773b..5321e0cc38 100644 --- a/core/src/main/java/com/turbodev/server/command/RestoreDBCommand.java +++ b/core/src/main/java/io/onedev/server/command/RestoreDBCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import java.io.File; @@ -11,15 +11,15 @@ import org.hibernate.boot.model.naming.PhysicalNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.launcher.bootstrap.Command; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.ZipUtils; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.bootstrap.Command; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; +import io.onedev.utils.FileUtils; +import io.onedev.utils.ZipUtils; @Singleton public class RestoreDBCommand extends DefaultPersistManager { diff --git a/core/src/main/java/com/turbodev/server/command/UpgradeCommand.java b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java similarity index 91% rename from core/src/main/java/com/turbodev/server/command/UpgradeCommand.java rename to core/src/main/java/io/onedev/server/command/UpgradeCommand.java index cf98451f63..7217a6c0ec 100644 --- a/core/src/main/java/com/turbodev/server/command/UpgradeCommand.java +++ b/core/src/main/java/io/onedev/server/command/UpgradeCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.command; +package io.onedev.server.command; import java.io.File; import java.io.IOException; @@ -17,20 +17,21 @@ import org.joda.time.format.DateTimeFormat; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.launcher.loader.PluginManager; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.loader.PluginManager; +import io.onedev.server.migration.DatabaseMigrator; +import io.onedev.server.migration.MigrationHelper; +import io.onedev.server.persistence.DefaultPersistManager; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; +import io.onedev.utils.FileUtils; +import io.onedev.utils.StringUtils; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + import com.google.common.base.Charsets; -import com.turbodev.server.migration.DatabaseMigrator; -import com.turbodev.server.migration.MigrationHelper; -import com.turbodev.server.persistence.DefaultPersistManager; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; @Singleton public class UpgradeCommand extends DefaultPersistManager { @@ -71,8 +72,10 @@ public class UpgradeCommand extends DefaultPersistManager { bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap"; } else if (version.startsWith("1.0.0")) { bootstrapClass = "com.gitplex.launcher.bootstrap.Bootstrap"; - } else { + } else if (version.startsWith("1.0.1")) { bootstrapClass = "com.turbodev.launcher.bootstrap.Bootstrap"; + } else { + bootstrapClass = "io.onedev.launcher.bootstrap.Bootstrap"; } Commandline cmdline= new Commandline(System.getProperty("java.home") + "/bin/java"); cmdline.addArgs("-Xmx" + Runtime.getRuntime().maxMemory()/1024/1024 + "m", "-classpath", "*", bootstrapClass, @@ -319,11 +322,11 @@ public class UpgradeCommand extends DefaultPersistManager { if (Integer.parseInt(oldDataVersion.get()) <= 5) { logger.warn("\n" + "************************* IMPORTANT NOTICE *************************\n" - + "* TurboDev password hash algorithm has been changed for security *\n" + + "* OneDev password hash algorithm has been changed for security *\n" + "* reason. Please reset administrator password with the *\n" + "* reset_admin_password command. Other users' password will be *\n" + "* reset and sent to their mail box automatically when they logs *\n" - + "* into TurboDev. *\n" + + "* into OneDev. *\n" + "********************************************************************"); } System.exit(0); @@ -396,10 +399,10 @@ public class UpgradeCommand extends DefaultPersistManager { } cleanAndCopy(Bootstrap.getBootDir(), new File(upgradeDir, "boot")); cleanAndCopy(Bootstrap.getLibDir(), new File(upgradeDir, "lib")); - File turbodevAvatar = new File(upgradeDir, "site/avatars/turbodev.png"); - if (!turbodevAvatar.exists()) { + File onedevAvatar = new File(upgradeDir, "site/avatars/onedev.png"); + if (!onedevAvatar.exists()) { try { - FileUtils.copyFile(new File(Bootstrap.getSiteDir(), "avatars/turbodev.png"), turbodevAvatar); + FileUtils.copyFile(new File(Bootstrap.getSiteDir(), "avatars/onedev.png"), onedevAvatar); } catch (IOException e) { throw new RuntimeException(e); } @@ -416,16 +419,19 @@ public class UpgradeCommand extends DefaultPersistManager { File wrapperConfFile = new File(upgradeDir, "conf/wrapper.conf"); String wrapperConf = FileUtils.readFileToString(wrapperConfFile, Charsets.UTF_8); wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.commons.bootstrap.Bootstrap", - "com.turbodev.launcher.bootstrap.Bootstrap"); + "io.onedev.launcher.bootstrap.Bootstrap"); wrapperConf = StringUtils.replace(wrapperConf, "com.gitplex.launcher.bootstrap.Bootstrap", - "com.turbodev.launcher.bootstrap.Bootstrap"); + "io.onedev.launcher.bootstrap.Bootstrap"); + wrapperConf = StringUtils.replace(wrapperConf, "com.turbodev.launcher.bootstrap.Bootstrap", + "io.onedev.launcher.bootstrap.Bootstrap"); FileUtils.writeStringToFile(wrapperConfFile, wrapperConf, Charsets.UTF_8); File hibernatePropsFile = new File(upgradeDir, "conf/hibernate.properties"); String hibernateProps = FileUtils.readFileToString(hibernatePropsFile, Charsets.UTF_8); hibernateProps = StringUtils.replace(hibernateProps, "hibernate.hikari.autoCommit=false", "hibernate.hikari.autoCommit=true"); - hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "TurboDev"); + hibernateProps = StringUtils.replace(hibernateProps, "GitPlex", "OneDev"); + hibernateProps = StringUtils.replace(hibernateProps, "TurboDev", "OneDev"); if (!hibernateProps.contains("hibernate.connection.autocommit=true")) { hibernateProps = StringUtils.replace(hibernateProps, @@ -440,6 +446,8 @@ public class UpgradeCommand extends DefaultPersistManager { logbackConfig = StringUtils.replace(logbackConfig, "", "1MB"); logbackConfig = StringUtils.replace(logbackConfig, "gitplex", "turbodev"); + logbackConfig = StringUtils.replace(logbackConfig, "com.turbodev", "io.onedev"); + logbackConfig = StringUtils.replace(logbackConfig, "turbodev", "onedev"); FileUtils.writeStringToFile(logbackConfigFile, logbackConfig, Charsets.UTF_8); FileUtils.copyFile(new File(Bootstrap.installDir, "conf/wrapper-license.conf"), diff --git a/core/src/main/java/com/turbodev/server/event/MarkdownAware.java b/core/src/main/java/io/onedev/server/event/MarkdownAware.java similarity index 74% rename from core/src/main/java/com/turbodev/server/event/MarkdownAware.java rename to core/src/main/java/io/onedev/server/event/MarkdownAware.java index c103b62b0f..8179fa078c 100644 --- a/core/src/main/java/com/turbodev/server/event/MarkdownAware.java +++ b/core/src/main/java/io/onedev/server/event/MarkdownAware.java @@ -1,4 +1,4 @@ -package com.turbodev.server.event; +package io.onedev.server.event; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/turbodev/server/event/ProjectRenamed.java b/core/src/main/java/io/onedev/server/event/ProjectRenamed.java similarity index 80% rename from core/src/main/java/com/turbodev/server/event/ProjectRenamed.java rename to core/src/main/java/io/onedev/server/event/ProjectRenamed.java index c062514085..91d99b39f0 100644 --- a/core/src/main/java/com/turbodev/server/event/ProjectRenamed.java +++ b/core/src/main/java/io/onedev/server/event/ProjectRenamed.java @@ -1,6 +1,6 @@ -package com.turbodev.server.event; +package io.onedev.server.event; -import com.turbodev.server.model.Project; +import io.onedev.server.model.Project; public class ProjectRenamed { diff --git a/core/src/main/java/com/turbodev/server/event/RefUpdated.java b/core/src/main/java/io/onedev/server/event/RefUpdated.java similarity index 89% rename from core/src/main/java/com/turbodev/server/event/RefUpdated.java rename to core/src/main/java/io/onedev/server/event/RefUpdated.java index 70b3ed1a39..0d09369d4c 100644 --- a/core/src/main/java/com/turbodev/server/event/RefUpdated.java +++ b/core/src/main/java/io/onedev/server/event/RefUpdated.java @@ -1,8 +1,8 @@ -package com.turbodev.server.event; +package io.onedev.server.event; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.model.Project; +import io.onedev.server.model.Project; public class RefUpdated { diff --git a/core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentCreated.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java similarity index 64% rename from core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentCreated.java rename to core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java index 329a8bce0c..e26f157c77 100644 --- a/core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentCreated.java +++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java @@ -1,11 +1,11 @@ -package com.turbodev.server.event.codecomment; +package io.onedev.server.event.codecomment; import java.util.Date; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="created") public class CodeCommentCreated extends CodeCommentEvent { diff --git a/core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentEvent.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java similarity index 74% rename from core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentEvent.java rename to core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java index e7fd1c113c..d73a1059bb 100644 --- a/core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentEvent.java +++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java @@ -1,13 +1,13 @@ -package com.turbodev.server.event.codecomment; +package io.onedev.server.event.codecomment; import java.util.Date; import javax.annotation.Nullable; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; public abstract class CodeCommentEvent implements MarkdownAware { diff --git a/core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentReplied.java b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java similarity index 69% rename from core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentReplied.java rename to core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java index 40eedc1557..bb4fa3c81d 100644 --- a/core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentReplied.java +++ b/core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java @@ -1,11 +1,11 @@ -package com.turbodev.server.event.codecomment; +package io.onedev.server.event.codecomment; import java.util.Date; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="replied") public class CodeCommentReplied extends CodeCommentEvent { diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java new file mode 100644 index 0000000000..0f551a629e --- /dev/null +++ b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java @@ -0,0 +1,5 @@ +package io.onedev.server.event.lifecycle; + +public class SystemStarted { + +} diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java new file mode 100644 index 0000000000..6a2e29b7b8 --- /dev/null +++ b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java @@ -0,0 +1,5 @@ +package io.onedev.server.event.lifecycle; + +public class SystemStarting { + +} diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java new file mode 100644 index 0000000000..81d2e1afc7 --- /dev/null +++ b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java @@ -0,0 +1,5 @@ +package io.onedev.server.event.lifecycle; + +public class SystemStopped { + +} diff --git a/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java new file mode 100644 index 0000000000..39e48e6403 --- /dev/null +++ b/core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java @@ -0,0 +1,5 @@ +package io.onedev.server.event.lifecycle; + +public class SystemStopping { + +} diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentCreated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java similarity index 65% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentCreated.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java index ee3727ccb5..3ad905c07e 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentCreated.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java @@ -1,12 +1,12 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="added code comment") public class PullRequestCodeCommentCreated extends PullRequestCodeCommentEvent implements MarkdownAware { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java similarity index 71% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentEvent.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java index 712293c1bf..1804a08e25 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentEvent.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java @@ -1,8 +1,8 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.PullRequest; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.PullRequest; public abstract class PullRequestCodeCommentEvent extends PullRequestEvent implements MarkdownAware { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentReplied.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java similarity index 72% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentReplied.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java index 151f93829d..36b40e0e16 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentReplied.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java @@ -1,11 +1,11 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="replied code comment") public class PullRequestCodeCommentReplied extends PullRequestCodeCommentEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCommentCreated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java similarity index 70% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCommentCreated.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java index 3e51baea31..d04e091427 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCommentCreated.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java @@ -1,11 +1,11 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="commented") public class PullRequestCommentCreated extends PullRequestEvent implements MarkdownAware { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java similarity index 73% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestEvent.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java index 9005cd1c7d..133db7d32d 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestEvent.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java @@ -1,11 +1,11 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; import javax.annotation.Nullable; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; public abstract class PullRequestEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestMergePreviewCalculated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java similarity index 66% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestMergePreviewCalculated.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java index b524c7267c..e6360b0c51 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestMergePreviewCalculated.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java @@ -1,10 +1,10 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="merge preview calculated") public class PullRequestMergePreviewCalculated extends PullRequestEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestOpened.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java similarity index 67% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestOpened.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java index f6c8dd739b..1ae46eab6c 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestOpened.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java @@ -1,11 +1,11 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="opened") public class PullRequestOpened extends PullRequestEvent implements MarkdownAware { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestStatusChangeEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestStatusChangeEvent.java similarity index 80% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestStatusChangeEvent.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestStatusChangeEvent.java index a6cbd56354..2ee2c28a72 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestStatusChangeEvent.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestStatusChangeEvent.java @@ -1,10 +1,10 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.User; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.User; public class PullRequestStatusChangeEvent extends PullRequestEvent implements MarkdownAware { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestUpdated.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java similarity index 70% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestUpdated.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java index 80a1a4c65e..242ef04b0d 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestUpdated.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java @@ -1,10 +1,10 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="there are new commits") public class PullRequestUpdated extends PullRequestEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationEvent.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java similarity index 72% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationEvent.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java index 00a78cbcf2..f95a58a7da 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationEvent.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java @@ -1,9 +1,9 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; import java.util.Date; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; public abstract class PullRequestVerificationEvent extends PullRequestEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationFailed.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationFailed.java similarity index 58% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationFailed.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationFailed.java index 4df042e0d2..be51ce1fbc 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationFailed.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationFailed.java @@ -1,7 +1,7 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="there are failed verifications") public class PullRequestVerificationFailed extends PullRequestVerificationEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationInError.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationInError.java similarity index 58% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationInError.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationInError.java index 52a616aab2..2b9feccafc 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationInError.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationInError.java @@ -1,7 +1,7 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="there are verification errors") public class PullRequestVerificationInError extends PullRequestVerificationEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationRunning.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationRunning.java similarity index 58% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationRunning.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationRunning.java index b87f106e27..287d07d4bc 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationRunning.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationRunning.java @@ -1,7 +1,7 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="there are running verifications") public class PullRequestVerificationRunning extends PullRequestVerificationEvent { diff --git a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationSucceeded.java b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationSucceeded.java similarity index 59% rename from core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationSucceeded.java rename to core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationSucceeded.java index a7654b32a8..1505375da7 100644 --- a/core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationSucceeded.java +++ b/core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationSucceeded.java @@ -1,7 +1,7 @@ -package com.turbodev.server.event.pullrequest; +package io.onedev.server.event.pullrequest; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="there are successful verifications") public class PullRequestVerificationSucceeded extends PullRequestVerificationEvent { diff --git a/core/src/main/java/com/turbodev/server/git/BlameBlock.java b/core/src/main/java/io/onedev/server/git/BlameBlock.java similarity index 92% rename from core/src/main/java/com/turbodev/server/git/BlameBlock.java rename to core/src/main/java/io/onedev/server/git/BlameBlock.java index 182b330d82..f0c09be50d 100644 --- a/core/src/main/java/com/turbodev/server/git/BlameBlock.java +++ b/core/src/main/java/io/onedev/server/git/BlameBlock.java @@ -1,10 +1,10 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.util.List; import org.apache.commons.lang3.StringUtils; -import com.turbodev.utils.Range; +import io.onedev.utils.Range; public class BlameBlock { diff --git a/core/src/main/java/com/turbodev/server/git/BlameCommit.java b/core/src/main/java/io/onedev/server/git/BlameCommit.java similarity index 98% rename from core/src/main/java/com/turbodev/server/git/BlameCommit.java rename to core/src/main/java/io/onedev/server/git/BlameCommit.java index 9ea128f6cb..6c50213f9d 100644 --- a/core/src/main/java/com/turbodev/server/git/BlameCommit.java +++ b/core/src/main/java/io/onedev/server/git/BlameCommit.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/core/src/main/java/com/turbodev/server/git/Blob.java b/core/src/main/java/io/onedev/server/git/Blob.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/Blob.java rename to core/src/main/java/io/onedev/server/git/Blob.java index fadeb481f3..849eac27b2 100644 --- a/core/src/main/java/com/turbodev/server/git/Blob.java +++ b/core/src/main/java/io/onedev/server/git/Blob.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.IOException; import java.io.InputStream; @@ -15,7 +15,8 @@ import org.eclipse.jgit.lib.ObjectReader; import com.google.common.base.Charsets; import com.google.common.base.Optional; -import com.turbodev.server.util.ContentDetector; + +import io.onedev.server.util.ContentDetector; public class Blob { diff --git a/core/src/main/java/com/turbodev/server/git/BlobChange.java b/core/src/main/java/io/onedev/server/git/BlobChange.java similarity index 94% rename from core/src/main/java/com/turbodev/server/git/BlobChange.java rename to core/src/main/java/io/onedev/server/git/BlobChange.java index 903f3e04ca..4e09cedae0 100644 --- a/core/src/main/java/com/turbodev/server/git/BlobChange.java +++ b/core/src/main/java/io/onedev/server/git/BlobChange.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; import java.util.ArrayList; @@ -11,12 +11,13 @@ import javax.annotation.Nullable; import org.eclipse.jgit.diff.DiffEntry; import org.eclipse.jgit.diff.DiffEntry.ChangeType; -import com.turbodev.jsyntax.Tokenized; import com.google.common.base.Preconditions; -import com.turbodev.server.util.diff.DiffBlock; -import com.turbodev.server.util.diff.DiffUtils; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.util.diff.DiffMatchPatch.Operation; + +import io.onedev.jsyntax.Tokenized; +import io.onedev.server.util.diff.DiffBlock; +import io.onedev.server.util.diff.DiffUtils; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.util.diff.DiffMatchPatch.Operation; @SuppressWarnings("serial") public abstract class BlobChange implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/git/BlobContent.java b/core/src/main/java/io/onedev/server/git/BlobContent.java similarity index 94% rename from core/src/main/java/com/turbodev/server/git/BlobContent.java rename to core/src/main/java/io/onedev/server/git/BlobContent.java index 9bf1e00d0d..e6f6c99aed 100644 --- a/core/src/main/java/com/turbodev/server/git/BlobContent.java +++ b/core/src/main/java/io/onedev/server/git/BlobContent.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/git/BlobEdits.java b/core/src/main/java/io/onedev/server/git/BlobEdits.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/BlobEdits.java rename to core/src/main/java/io/onedev/server/git/BlobEdits.java index 02947edc61..075fdc6744 100644 --- a/core/src/main/java/com/turbodev/server/git/BlobEdits.java +++ b/core/src/main/java/io/onedev/server/git/BlobEdits.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.IOException; import java.io.Serializable; @@ -30,10 +30,11 @@ import org.eclipse.jgit.treewalk.TreeWalk; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import com.turbodev.server.git.exception.NotTreeException; -import com.turbodev.server.git.exception.ObjectAlreadyExistsException; -import com.turbodev.server.git.exception.ObjectNotFoundException; -import com.turbodev.server.git.exception.ObsoleteCommitException; + +import io.onedev.server.git.exception.NotTreeException; +import io.onedev.server.git.exception.ObjectAlreadyExistsException; +import io.onedev.server.git.exception.ObjectNotFoundException; +import io.onedev.server.git.exception.ObsoleteCommitException; public class BlobEdits implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/git/BlobIdent.java b/core/src/main/java/io/onedev/server/git/BlobIdent.java similarity index 95% rename from core/src/main/java/com/turbodev/server/git/BlobIdent.java rename to core/src/main/java/io/onedev/server/git/BlobIdent.java index 5881409720..9a2bfebb59 100644 --- a/core/src/main/java/com/turbodev/server/git/BlobIdent.java +++ b/core/src/main/java/io/onedev/server/git/BlobIdent.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; import java.util.List; @@ -10,8 +10,9 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import org.eclipse.jgit.lib.FileMode; import com.google.common.base.Objects; -import com.turbodev.server.git.exception.ObjectNotFoundException; -import com.turbodev.server.model.Project; + +import io.onedev.server.git.exception.ObjectNotFoundException; +import io.onedev.server.model.Project; public class BlobIdent implements Serializable, Comparable { diff --git a/core/src/main/java/com/turbodev/server/git/BlobIdentFilter.java b/core/src/main/java/io/onedev/server/git/BlobIdentFilter.java similarity index 91% rename from core/src/main/java/com/turbodev/server/git/BlobIdentFilter.java rename to core/src/main/java/io/onedev/server/git/BlobIdentFilter.java index bc728773d2..31d2365209 100644 --- a/core/src/main/java/com/turbodev/server/git/BlobIdentFilter.java +++ b/core/src/main/java/io/onedev/server/git/BlobIdentFilter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/git/Contribution.java b/core/src/main/java/io/onedev/server/git/Contribution.java similarity index 94% rename from core/src/main/java/com/turbodev/server/git/Contribution.java rename to core/src/main/java/io/onedev/server/git/Contribution.java index 4a93248c42..f13326f1b5 100644 --- a/core/src/main/java/com/turbodev/server/git/Contribution.java +++ b/core/src/main/java/io/onedev/server/git/Contribution.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/git/Contributor.java b/core/src/main/java/io/onedev/server/git/Contributor.java similarity index 89% rename from core/src/main/java/com/turbodev/server/git/Contributor.java rename to core/src/main/java/io/onedev/server/git/Contributor.java index db89eac7cb..6c9707b2ff 100644 --- a/core/src/main/java/com/turbodev/server/git/Contributor.java +++ b/core/src/main/java/io/onedev/server/git/Contributor.java @@ -1,11 +1,11 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; import java.util.Map; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.util.Day; +import io.onedev.server.util.Day; public class Contributor implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/git/GitFilter.java b/core/src/main/java/io/onedev/server/git/GitFilter.java similarity index 84% rename from core/src/main/java/com/turbodev/server/git/GitFilter.java rename to core/src/main/java/io/onedev/server/git/GitFilter.java index 6b7b6cb7a5..ef6d46069d 100644 --- a/core/src/main/java/com/turbodev/server/git/GitFilter.java +++ b/core/src/main/java/io/onedev/server/git/GitFilter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.File; import java.io.IOException; @@ -25,22 +25,22 @@ import org.eclipse.jgit.transport.PacketLineOut; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.concurrent.PrioritizedRunnable; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.command.AdvertiseReceiveRefsCommand; -import com.turbodev.server.git.command.AdvertiseUploadRefsCommand; -import com.turbodev.server.git.command.ReceiveCommand; -import com.turbodev.server.git.command.UploadCommand; -import com.turbodev.server.git.exception.GitException; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.manager.WorkExecutor; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.serverconfig.ServerConfig; +import io.onedev.server.OneDev; +import io.onedev.server.git.command.AdvertiseReceiveRefsCommand; +import io.onedev.server.git.command.AdvertiseUploadRefsCommand; +import io.onedev.server.git.command.ReceiveCommand; +import io.onedev.server.git.command.UploadCommand; +import io.onedev.server.git.exception.GitException; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.manager.WorkExecutor; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.serverconfig.ServerConfig; +import io.onedev.utils.concurrent.PrioritizedRunnable; @Singleton public class GitFilter implements Filter { @@ -51,7 +51,7 @@ public class GitFilter implements Filter { private static final String INFO_REFS = "info/refs"; - private final TurboDev turboDev; + private final OneDev oneDev; private final StorageManager storageManager; @@ -64,9 +64,9 @@ public class GitFilter implements Filter { private final ConfigManager configManager; @Inject - public GitFilter(TurboDev turboDev, StorageManager storageManager, ProjectManager projectManager, + public GitFilter(OneDev oneDev, StorageManager storageManager, ProjectManager projectManager, WorkExecutor workManager, ServerConfig serverConfig, ConfigManager configManager) { - this.turboDev = turboDev; + this.oneDev = oneDev; this.storageManager = storageManager; this.projectManager = projectManager; this.workExecutor = workManager; @@ -124,10 +124,10 @@ public class GitFilter implements Filter { else serverUrl = "https://localhost:" + serverConfig.getSslConfig().getPort(); - environments.put("TURBODEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable()); - environments.put("TURBODEV_URL", serverUrl); - environments.put("TURBODEV_USER_ID", User.getCurrentId().toString()); - environments.put("TURBODEV_REPOSITORY_ID", project.getId().toString()); + environments.put("ONEDEV_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable()); + environments.put("ONEDEV_URL", serverUrl); + environments.put("ONEDEV_USER_ID", User.getCurrentId().toString()); + environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString()); // to be compatible with old repository environments.put("GITPLEX_CURL", configManager.getSystemSetting().getCurlConfig().getExecutable()); @@ -224,12 +224,12 @@ public class GitFilter implements Filter { try { if (GitSmartHttpTools.isInfoRefs(httpRequest)) { - if (turboDev.isReady()) + if (oneDev.isReady()) processRefs(httpRequest, httpResponse); else throw new GitException("Server is not ready"); } else if (GitSmartHttpTools.isReceivePack(httpRequest) || GitSmartHttpTools.isUploadPack(httpRequest)) { - if (turboDev.isReady()) + if (oneDev.isReady()) processPacks(httpRequest, httpResponse); else throw new GitException("Server is not ready"); diff --git a/core/src/main/java/com/turbodev/server/git/GitPostReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java similarity index 92% rename from core/src/main/java/com/turbodev/server/git/GitPostReceiveCallback.java rename to core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java index 686fd1e651..2c90a3a7b4 100644 --- a/core/src/main/java/com/turbodev/server/git/GitPostReceiveCallback.java +++ b/core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.IOException; import java.net.InetAddress; @@ -18,14 +18,15 @@ import org.eclipse.jgit.lib.RefUpdate; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.utils.StringUtils; + import com.google.common.base.Preconditions; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.UnitOfWork; @SuppressWarnings("serial") @Singleton diff --git a/core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java similarity index 90% rename from core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java rename to core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java index f282b34368..1fd47fc57b 100644 --- a/core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java +++ b/core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.IOException; import java.net.InetAddress; @@ -19,22 +19,23 @@ import org.apache.shiro.SecurityUtils; import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.license.LicenseDetail; import com.google.common.base.Preconditions; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.permission.ProjectPermission; + +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.User; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.permission.ProjectPermission; +import io.onedev.utils.StringUtils; +import io.onedev.utils.license.LicenseDetail; @SuppressWarnings("serial") @Singleton @@ -151,7 +152,7 @@ public class GitPreReceiveCallback extends HttpServlet { if (refName.startsWith(PullRequest.REFS_PREFIX) || refName.startsWith(PullRequestUpdate.REFS_PREFIX)) { if (!user.asSubject().isPermitted( new ProjectPermission(project.getFacade(), ProjectPrivilege.ADMIN))) { - error(output, refName, "Only project administrators can update turbodev refs."); + error(output, refName, "Only project administrators can update onedev refs."); break; } } else if (refName.startsWith(Constants.R_HEADS)) { diff --git a/core/src/main/java/com/turbodev/server/git/GitUtils.java b/core/src/main/java/io/onedev/server/git/GitUtils.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/GitUtils.java rename to core/src/main/java/io/onedev/server/git/GitUtils.java index b4ed84ec59..65dac2a69e 100644 --- a/core/src/main/java/com/turbodev/server/git/GitUtils.java +++ b/core/src/main/java/io/onedev/server/git/GitUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.File; import java.io.IOException; @@ -43,19 +43,20 @@ import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.util.SystemReader; import org.eclipse.jgit.util.io.NullOutputStream; -import com.turbodev.utils.LockUtils; -import com.turbodev.utils.PathUtils; import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; import com.google.common.base.Strings; import com.google.common.collect.Iterables; -import com.turbodev.server.git.command.FetchCommand; -import com.turbodev.server.git.command.IsAncestorCommand; -import com.turbodev.server.git.exception.ObsoleteCommitException; -import com.turbodev.server.git.exception.RefUpdateException; -import com.turbodev.server.util.diff.WhitespaceOption; + +import io.onedev.server.git.command.FetchCommand; +import io.onedev.server.git.command.IsAncestorCommand; +import io.onedev.server.git.exception.ObsoleteCommitException; +import io.onedev.server.git.exception.RefUpdateException; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.utils.LockUtils; +import io.onedev.utils.PathUtils; public class GitUtils { diff --git a/core/src/main/java/com/turbodev/server/git/GitVersion.java b/core/src/main/java/io/onedev/server/git/GitVersion.java similarity index 96% rename from core/src/main/java/com/turbodev/server/git/GitVersion.java rename to core/src/main/java/io/onedev/server/git/GitVersion.java index 2595677667..28980cd458 100644 --- a/core/src/main/java/com/turbodev/server/git/GitVersion.java +++ b/core/src/main/java/io/onedev/server/git/GitVersion.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.util.ArrayList; import java.util.Collections; @@ -6,7 +6,7 @@ import java.util.List; import org.apache.commons.lang3.math.NumberUtils; -import com.turbodev.utils.StringUtils; +import io.onedev.utils.StringUtils; public class GitVersion implements Comparable { diff --git a/core/src/main/java/com/turbodev/server/git/LineStats.java b/core/src/main/java/io/onedev/server/git/LineStats.java similarity index 95% rename from core/src/main/java/com/turbodev/server/git/LineStats.java rename to core/src/main/java/io/onedev/server/git/LineStats.java index d76d5bc122..967b9754c7 100644 --- a/core/src/main/java/com/turbodev/server/git/LineStats.java +++ b/core/src/main/java/io/onedev/server/git/LineStats.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; import java.util.Collections; @@ -7,7 +7,7 @@ import java.util.Map; import javax.annotation.Nullable; -import com.turbodev.server.util.Day; +import io.onedev.server.util.Day; public class LineStats implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/git/NameAndEmail.java b/core/src/main/java/io/onedev/server/git/NameAndEmail.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/NameAndEmail.java rename to core/src/main/java/io/onedev/server/git/NameAndEmail.java index 7b41c5c81e..2c131cdcfd 100644 --- a/core/src/main/java/com/turbodev/server/git/NameAndEmail.java +++ b/core/src/main/java/io/onedev/server/git/NameAndEmail.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/git/Output.java b/core/src/main/java/io/onedev/server/git/Output.java similarity index 95% rename from core/src/main/java/com/turbodev/server/git/Output.java rename to core/src/main/java/io/onedev/server/git/Output.java index 5929bfc7cd..9c997b5c4d 100644 --- a/core/src/main/java/com/turbodev/server/git/Output.java +++ b/core/src/main/java/io/onedev/server/git/Output.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.IOException; diff --git a/core/src/main/java/com/turbodev/server/git/RefInfo.java b/core/src/main/java/io/onedev/server/git/RefInfo.java similarity index 98% rename from core/src/main/java/com/turbodev/server/git/RefInfo.java rename to core/src/main/java/io/onedev/server/git/RefInfo.java index a0558618b6..79bfd36922 100644 --- a/core/src/main/java/com/turbodev/server/git/RefInfo.java +++ b/core/src/main/java/io/onedev/server/git/RefInfo.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.IOException; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/git/Submodule.java b/core/src/main/java/io/onedev/server/git/Submodule.java similarity index 96% rename from core/src/main/java/com/turbodev/server/git/Submodule.java rename to core/src/main/java/io/onedev/server/git/Submodule.java index ba002df989..3f8820206d 100644 --- a/core/src/main/java/com/turbodev/server/git/Submodule.java +++ b/core/src/main/java/io/onedev/server/git/Submodule.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/git/command/AdvertiseReceiveRefsCommand.java b/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java similarity index 86% rename from core/src/main/java/com/turbodev/server/git/command/AdvertiseReceiveRefsCommand.java rename to core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java index 8ca738bb3b..a923da37b1 100644 --- a/core/src/main/java/com/turbodev/server/git/command/AdvertiseReceiveRefsCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.io.OutputStream; @@ -6,10 +6,11 @@ import java.io.OutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class AdvertiseReceiveRefsCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(AdvertiseReceiveRefsCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/AdvertiseUploadRefsCommand.java b/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java similarity index 86% rename from core/src/main/java/com/turbodev/server/git/command/AdvertiseUploadRefsCommand.java rename to core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java index 503314f6de..786b46e876 100644 --- a/core/src/main/java/com/turbodev/server/git/command/AdvertiseUploadRefsCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.io.OutputStream; @@ -6,10 +6,11 @@ import java.io.OutputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class AdvertiseUploadRefsCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(AdvertiseUploadRefsCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/BlameCommand.java b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java similarity index 94% rename from core/src/main/java/com/turbodev/server/git/command/BlameCommand.java rename to core/src/main/java/io/onedev/server/git/command/BlameCommand.java index 950a932a9e..494c419957 100644 --- a/core/src/main/java/com/turbodev/server/git/command/BlameCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/BlameCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.ArrayList; @@ -18,14 +18,15 @@ import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.Range; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.ExecuteResult; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; -import com.turbodev.server.git.BlameBlock; -import com.turbodev.server.git.BlameCommit; -import com.turbodev.server.git.GitUtils; + +import io.onedev.server.git.BlameBlock; +import io.onedev.server.git.BlameCommit; +import io.onedev.server.git.GitUtils; +import io.onedev.utils.Range; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.ExecuteResult; +import io.onedev.utils.command.LineConsumer; public class BlameCommand extends GitCommand> { diff --git a/core/src/main/java/com/turbodev/server/git/command/CloneCommand.java b/core/src/main/java/io/onedev/server/git/command/CloneCommand.java similarity index 93% rename from core/src/main/java/com/turbodev/server/git/command/CloneCommand.java rename to core/src/main/java/io/onedev/server/git/command/CloneCommand.java index b2980c348b..7a7646054a 100644 --- a/core/src/main/java/com/turbodev/server/git/command/CloneCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/CloneCommand.java @@ -1,14 +1,15 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class CloneCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(CloneCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/FetchCommand.java b/core/src/main/java/io/onedev/server/git/command/FetchCommand.java similarity index 90% rename from core/src/main/java/com/turbodev/server/git/command/FetchCommand.java rename to core/src/main/java/io/onedev/server/git/command/FetchCommand.java index e5a61ce236..4be2ab54cf 100644 --- a/core/src/main/java/com/turbodev/server/git/command/FetchCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/FetchCommand.java @@ -1,14 +1,15 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class FetchCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(FetchCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/FileChange.java b/core/src/main/java/io/onedev/server/git/command/FileChange.java similarity index 94% rename from core/src/main/java/com/turbodev/server/git/command/FileChange.java rename to core/src/main/java/io/onedev/server/git/command/FileChange.java index faeee26fde..63a6151488 100644 --- a/core/src/main/java/com/turbodev/server/git/command/FileChange.java +++ b/core/src/main/java/io/onedev/server/git/command/FileChange.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/git/command/GitCommand.java b/core/src/main/java/io/onedev/server/git/command/GitCommand.java similarity index 85% rename from core/src/main/java/com/turbodev/server/git/command/GitCommand.java rename to core/src/main/java/io/onedev/server/git/command/GitCommand.java index 2a8c32bf87..59551a8291 100644 --- a/core/src/main/java/com/turbodev/server/git/command/GitCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/GitCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.Map; @@ -10,12 +10,12 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; -import com.turbodev.server.git.GitVersion; -import com.turbodev.server.git.config.GitConfig; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.git.GitVersion; +import io.onedev.server.git.config.GitConfig; +import io.onedev.utils.FileUtils; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; public abstract class GitCommand implements Callable { @@ -74,7 +74,7 @@ public abstract class GitCommand implements Callable { GitVersion gitVersion = new GitVersion(version[0]); if (gitVersion.isOlderThan(new GitVersion(MIN_VERSION))) - return "Version of git is " + gitVersion + ". TurboDev requires at least " + MIN_VERSION; + return "Version of git is " + gitVersion + ". OneDev requires at least " + MIN_VERSION; return null; diff --git a/core/src/main/java/com/turbodev/server/git/command/GitCommit.java b/core/src/main/java/io/onedev/server/git/command/GitCommit.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/command/GitCommit.java rename to core/src/main/java/io/onedev/server/git/command/GitCommit.java index 79e874529a..e91e9876e0 100644 --- a/core/src/main/java/com/turbodev/server/git/command/GitCommit.java +++ b/core/src/main/java/io/onedev/server/git/command/GitCommit.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.Serializable; import java.util.Collection; @@ -12,7 +12,8 @@ import org.apache.commons.lang3.StringUtils; import org.eclipse.jgit.lib.PersonIdent; import com.google.common.base.Preconditions; -import com.turbodev.server.git.GitUtils; + +import io.onedev.server.git.GitUtils; public class GitCommit implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/git/command/IsAncestorCommand.java b/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java similarity index 87% rename from core/src/main/java/com/turbodev/server/git/command/IsAncestorCommand.java rename to core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java index 04247e2c2f..8eec36bb17 100644 --- a/core/src/main/java/com/turbodev/server/git/command/IsAncestorCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.Map; @@ -6,11 +6,12 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.ExecuteResult; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.ExecuteResult; +import io.onedev.utils.command.LineConsumer; + public class IsAncestorCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(IsAncestorCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/ListChangedFilesCommand.java b/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java similarity index 92% rename from core/src/main/java/com/turbodev/server/git/command/ListChangedFilesCommand.java rename to core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java index e63eb50bf9..5a414a1b71 100644 --- a/core/src/main/java/com/turbodev/server/git/command/ListChangedFilesCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.Collection; @@ -10,10 +10,11 @@ import org.eclipse.jgit.util.QuotedString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class ListChangedFilesCommand extends GitCommand> { private static final Logger logger = LoggerFactory.getLogger(ListChangedFilesCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/ListFileChangesCommand.java b/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java similarity index 94% rename from core/src/main/java/com/turbodev/server/git/command/ListFileChangesCommand.java rename to core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java index 920e056e6a..cf8df29fe9 100644 --- a/core/src/main/java/com/turbodev/server/git/command/ListFileChangesCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.ArrayList; @@ -9,10 +9,11 @@ import org.eclipse.jgit.util.QuotedString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class ListFileChangesCommand extends GitCommand> { private static final Logger logger = LoggerFactory.getLogger(ListFileChangesCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/LogCommand.java b/core/src/main/java/io/onedev/server/git/command/LogCommand.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/command/LogCommand.java rename to core/src/main/java/io/onedev/server/git/command/LogCommand.java index 9c6476e420..eaebfa22ac 100644 --- a/core/src/main/java/com/turbodev/server/git/command/LogCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/LogCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.ArrayList; @@ -11,11 +11,12 @@ import org.eclipse.jgit.util.QuotedString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; import com.google.common.base.Splitter; -import com.turbodev.server.git.GitUtils; + +import io.onedev.server.git.GitUtils; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; public abstract class LogCommand extends GitCommand { diff --git a/core/src/main/java/com/turbodev/server/git/command/ReceiveCommand.java b/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java similarity index 88% rename from core/src/main/java/com/turbodev/server/git/command/ReceiveCommand.java rename to core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java index f288daea90..e4792b29d4 100644 --- a/core/src/main/java/com/turbodev/server/git/command/ReceiveCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.io.InputStream; @@ -8,10 +8,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class ReceiveCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/command/RevListCommand.java b/core/src/main/java/io/onedev/server/git/command/RevListCommand.java similarity index 97% rename from core/src/main/java/com/turbodev/server/git/command/RevListCommand.java rename to core/src/main/java/io/onedev/server/git/command/RevListCommand.java index 90328ec7dc..a6254df2a1 100644 --- a/core/src/main/java/com/turbodev/server/git/command/RevListCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/RevListCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.util.ArrayList; @@ -9,8 +9,8 @@ import org.apache.commons.lang3.time.DateFormatUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; public class RevListCommand extends GitCommand> { diff --git a/core/src/main/java/com/turbodev/server/git/command/UploadCommand.java b/core/src/main/java/io/onedev/server/git/command/UploadCommand.java similarity index 88% rename from core/src/main/java/com/turbodev/server/git/command/UploadCommand.java rename to core/src/main/java/io/onedev/server/git/command/UploadCommand.java index 5e95b3c254..4719bc2363 100644 --- a/core/src/main/java/com/turbodev/server/git/command/UploadCommand.java +++ b/core/src/main/java/io/onedev/server/git/command/UploadCommand.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import java.io.File; import java.io.InputStream; @@ -8,10 +8,11 @@ import java.util.Map; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; import com.google.common.base.Preconditions; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; + public class UploadCommand extends GitCommand { private static final Logger logger = LoggerFactory.getLogger(UploadCommand.class); diff --git a/core/src/main/java/com/turbodev/server/git/config/CurlConfig.java b/core/src/main/java/io/onedev/server/git/config/CurlConfig.java similarity index 83% rename from core/src/main/java/com/turbodev/server/git/config/CurlConfig.java rename to core/src/main/java/io/onedev/server/git/config/CurlConfig.java index fadb3f1c16..b43953e7ab 100644 --- a/core/src/main/java/com/turbodev/server/git/config/CurlConfig.java +++ b/core/src/main/java/io/onedev/server/git/config/CurlConfig.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.config; +package io.onedev.server.git.config; import java.io.Serializable; @@ -8,11 +8,11 @@ import org.apache.commons.lang3.exception.ExceptionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.command.Commandline; -import com.turbodev.utils.command.LineConsumer; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.validation.Validatable; -import com.turbodev.server.util.validation.annotation.ClassValidating; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.validation.Validatable; +import io.onedev.server.util.validation.annotation.ClassValidating; +import io.onedev.utils.command.Commandline; +import io.onedev.utils.command.LineConsumer; /** * Git relevant settings. diff --git a/core/src/main/java/com/turbodev/server/git/config/GitConfig.java b/core/src/main/java/io/onedev/server/git/config/GitConfig.java similarity index 75% rename from core/src/main/java/com/turbodev/server/git/config/GitConfig.java rename to core/src/main/java/io/onedev/server/git/config/GitConfig.java index b3ac2ac9a6..ae2cfa3627 100644 --- a/core/src/main/java/com/turbodev/server/git/config/GitConfig.java +++ b/core/src/main/java/io/onedev/server/git/config/GitConfig.java @@ -1,13 +1,13 @@ -package com.turbodev.server.git.config; +package io.onedev.server.git.config; import java.io.Serializable; import javax.validation.ConstraintValidatorContext; -import com.turbodev.server.git.command.GitCommand; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.validation.Validatable; -import com.turbodev.server.util.validation.annotation.ClassValidating; +import io.onedev.server.git.command.GitCommand; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.validation.Validatable; +import io.onedev.server.util.validation.annotation.ClassValidating; /** * Git relevant settings. diff --git a/core/src/main/java/com/turbodev/server/git/config/SpecifiedCurl.java b/core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java similarity index 84% rename from core/src/main/java/com/turbodev/server/git/config/SpecifiedCurl.java rename to core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java index e100b7beb1..4500089f21 100644 --- a/core/src/main/java/com/turbodev/server/git/config/SpecifiedCurl.java +++ b/core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java @@ -1,8 +1,8 @@ -package com.turbodev.server.git.config; +package io.onedev.server.git.config; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="Use Specified curl", order=200) public class SpecifiedCurl extends CurlConfig { diff --git a/core/src/main/java/com/turbodev/server/git/config/SpecifiedGit.java b/core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java similarity index 83% rename from core/src/main/java/com/turbodev/server/git/config/SpecifiedGit.java rename to core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java index 61a6a26e84..add4ed42f8 100644 --- a/core/src/main/java/com/turbodev/server/git/config/SpecifiedGit.java +++ b/core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java @@ -1,8 +1,8 @@ -package com.turbodev.server.git.config; +package io.onedev.server.git.config; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="Use Specified git", order=200) public class SpecifiedGit extends GitConfig { diff --git a/core/src/main/java/com/turbodev/server/git/config/SystemCurl.java b/core/src/main/java/io/onedev/server/git/config/SystemCurl.java similarity index 68% rename from core/src/main/java/com/turbodev/server/git/config/SystemCurl.java rename to core/src/main/java/io/onedev/server/git/config/SystemCurl.java index 930d81b3fe..9a083d7b84 100644 --- a/core/src/main/java/com/turbodev/server/git/config/SystemCurl.java +++ b/core/src/main/java/io/onedev/server/git/config/SystemCurl.java @@ -1,6 +1,6 @@ -package com.turbodev.server.git.config; +package io.onedev.server.git.config; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="Use curl in System Path", order=100) public class SystemCurl extends CurlConfig { diff --git a/core/src/main/java/com/turbodev/server/git/config/SystemGit.java b/core/src/main/java/io/onedev/server/git/config/SystemGit.java similarity index 67% rename from core/src/main/java/com/turbodev/server/git/config/SystemGit.java rename to core/src/main/java/io/onedev/server/git/config/SystemGit.java index 7af7d84e4f..dd43b44238 100644 --- a/core/src/main/java/com/turbodev/server/git/config/SystemGit.java +++ b/core/src/main/java/io/onedev/server/git/config/SystemGit.java @@ -1,6 +1,6 @@ -package com.turbodev.server.git.config; +package io.onedev.server.git.config; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="Use git in System Path", order=100) public class SystemGit extends GitConfig { diff --git a/core/src/main/java/com/turbodev/server/git/exception/GitException.java b/core/src/main/java/io/onedev/server/git/exception/GitException.java similarity index 88% rename from core/src/main/java/com/turbodev/server/git/exception/GitException.java rename to core/src/main/java/io/onedev/server/git/exception/GitException.java index b5ed6c0f52..5d0bb077d2 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/GitException.java +++ b/core/src/main/java/io/onedev/server/git/exception/GitException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; public class GitException extends RuntimeException { diff --git a/core/src/main/java/com/turbodev/server/git/exception/NotFileException.java b/core/src/main/java/io/onedev/server/git/exception/NotFileException.java similarity index 80% rename from core/src/main/java/com/turbodev/server/git/exception/NotFileException.java rename to core/src/main/java/io/onedev/server/git/exception/NotFileException.java index ef8e97e2fa..b70fd84ec7 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/NotFileException.java +++ b/core/src/main/java/io/onedev/server/git/exception/NotFileException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; public class NotFileException extends GitException { diff --git a/core/src/main/java/com/turbodev/server/git/exception/NotTreeException.java b/core/src/main/java/io/onedev/server/git/exception/NotTreeException.java similarity index 80% rename from core/src/main/java/com/turbodev/server/git/exception/NotTreeException.java rename to core/src/main/java/io/onedev/server/git/exception/NotTreeException.java index b4e00083ad..5aedf57e6c 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/NotTreeException.java +++ b/core/src/main/java/io/onedev/server/git/exception/NotTreeException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; public class NotTreeException extends GitException { diff --git a/core/src/main/java/com/turbodev/server/git/exception/ObjectAlreadyExistsException.java b/core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java similarity index 82% rename from core/src/main/java/com/turbodev/server/git/exception/ObjectAlreadyExistsException.java rename to core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java index 92e8c453bc..9ad4b1ead9 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/ObjectAlreadyExistsException.java +++ b/core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; public class ObjectAlreadyExistsException extends GitException { diff --git a/core/src/main/java/com/turbodev/server/git/exception/ObjectNotFoundException.java b/core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.java similarity index 81% rename from core/src/main/java/com/turbodev/server/git/exception/ObjectNotFoundException.java rename to core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.java index e29e3ed696..9abc670bac 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/ObjectNotFoundException.java +++ b/core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; public class ObjectNotFoundException extends GitException { diff --git a/core/src/main/java/com/turbodev/server/git/exception/ObsoleteCommitException.java b/core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java similarity index 91% rename from core/src/main/java/com/turbodev/server/git/exception/ObsoleteCommitException.java rename to core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java index 5d6f8cec43..7a705e0eb8 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/ObsoleteCommitException.java +++ b/core/src/main/java/io/onedev/server/git/exception/ObsoleteCommitException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/turbodev/server/git/exception/RefUpdateException.java b/core/src/main/java/io/onedev/server/git/exception/RefUpdateException.java similarity index 89% rename from core/src/main/java/com/turbodev/server/git/exception/RefUpdateException.java rename to core/src/main/java/io/onedev/server/git/exception/RefUpdateException.java index c97282be50..332d1a62df 100644 --- a/core/src/main/java/com/turbodev/server/git/exception/RefUpdateException.java +++ b/core/src/main/java/io/onedev/server/git/exception/RefUpdateException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.exception; +package io.onedev.server.git.exception; import org.eclipse.jgit.lib.RefUpdate; diff --git a/core/src/main/java/com/turbodev/server/git/jackson/GitObjectMapperConfigurator.java b/core/src/main/java/io/onedev/server/git/jackson/GitObjectMapperConfigurator.java similarity index 84% rename from core/src/main/java/com/turbodev/server/git/jackson/GitObjectMapperConfigurator.java rename to core/src/main/java/io/onedev/server/git/jackson/GitObjectMapperConfigurator.java index f68a21dbd8..4acb23fcb1 100644 --- a/core/src/main/java/com/turbodev/server/git/jackson/GitObjectMapperConfigurator.java +++ b/core/src/main/java/io/onedev/server/git/jackson/GitObjectMapperConfigurator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.jackson; +package io.onedev.server.git.jackson; import javax.inject.Singleton; @@ -6,7 +6,8 @@ import org.eclipse.jgit.lib.ObjectId; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.module.SimpleModule; -import com.turbodev.server.util.jackson.ObjectMapperConfigurator; + +import io.onedev.server.util.jackson.ObjectMapperConfigurator; @Singleton public class GitObjectMapperConfigurator implements ObjectMapperConfigurator { diff --git a/core/src/main/java/com/turbodev/server/git/jackson/ObjectIdDeserializer.java b/core/src/main/java/io/onedev/server/git/jackson/ObjectIdDeserializer.java similarity index 93% rename from core/src/main/java/com/turbodev/server/git/jackson/ObjectIdDeserializer.java rename to core/src/main/java/io/onedev/server/git/jackson/ObjectIdDeserializer.java index a3fb0f9532..32a559d2b2 100644 --- a/core/src/main/java/com/turbodev/server/git/jackson/ObjectIdDeserializer.java +++ b/core/src/main/java/io/onedev/server/git/jackson/ObjectIdDeserializer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.jackson; +package io.onedev.server.git.jackson; import java.io.IOException; diff --git a/core/src/main/java/com/turbodev/server/git/jackson/ObjectIdSerializer.java b/core/src/main/java/io/onedev/server/git/jackson/ObjectIdSerializer.java similarity index 93% rename from core/src/main/java/com/turbodev/server/git/jackson/ObjectIdSerializer.java rename to core/src/main/java/io/onedev/server/git/jackson/ObjectIdSerializer.java index 6eefcd6f66..9025b47d4c 100644 --- a/core/src/main/java/com/turbodev/server/git/jackson/ObjectIdSerializer.java +++ b/core/src/main/java/io/onedev/server/git/jackson/ObjectIdSerializer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.jackson; +package io.onedev.server.git.jackson; import java.io.IOException; diff --git a/core/src/main/java/com/turbodev/server/manager/AttachmentManager.java b/core/src/main/java/io/onedev/server/manager/AttachmentManager.java similarity index 80% rename from core/src/main/java/com/turbodev/server/manager/AttachmentManager.java rename to core/src/main/java/io/onedev/server/manager/AttachmentManager.java index 5c73ddb806..cdae7d0f0d 100644 --- a/core/src/main/java/com/turbodev/server/manager/AttachmentManager.java +++ b/core/src/main/java/io/onedev/server/manager/AttachmentManager.java @@ -1,8 +1,8 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.io.File; -import com.turbodev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.ProjectFacade; public interface AttachmentManager { diff --git a/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java b/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java new file mode 100644 index 0000000000..e0a36c60b2 --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/BatchWorkManager.java @@ -0,0 +1,10 @@ +package io.onedev.server.manager; + +import io.onedev.server.util.BatchWorker; +import io.onedev.utils.concurrent.Prioritized; + +public interface BatchWorkManager { + + void submit(BatchWorker worker, Prioritized work); + +} diff --git a/core/src/main/java/com/turbodev/server/manager/BranchWatchManager.java b/core/src/main/java/io/onedev/server/manager/BranchWatchManager.java similarity index 51% rename from core/src/main/java/com/turbodev/server/manager/BranchWatchManager.java rename to core/src/main/java/io/onedev/server/manager/BranchWatchManager.java index 8b278e9767..96533a2cd6 100644 --- a/core/src/main/java/com/turbodev/server/manager/BranchWatchManager.java +++ b/core/src/main/java/io/onedev/server/manager/BranchWatchManager.java @@ -1,11 +1,11 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; -import com.turbodev.server.model.BranchWatch; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.BranchWatch; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityManager; public interface BranchWatchManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/CacheManager.java b/core/src/main/java/io/onedev/server/manager/CacheManager.java similarity index 71% rename from core/src/main/java/com/turbodev/server/manager/CacheManager.java rename to core/src/main/java/io/onedev/server/manager/CacheManager.java index 6e76a9b866..115829ab19 100644 --- a/core/src/main/java/com/turbodev/server/manager/CacheManager.java +++ b/core/src/main/java/io/onedev/server/manager/CacheManager.java @@ -1,15 +1,15 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Map; import javax.annotation.Nullable; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.util.facade.UserFacade; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.util.facade.UserFacade; public interface CacheManager { diff --git a/core/src/main/java/com/turbodev/server/manager/CodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java similarity index 71% rename from core/src/main/java/com/turbodev/server/manager/CodeCommentManager.java rename to core/src/main/java/io/onedev/server/manager/CodeCommentManager.java index 8021921814..bf19cd9e1a 100644 --- a/core/src/main/java/com/turbodev/server/manager/CodeCommentManager.java +++ b/core/src/main/java/io/onedev/server/manager/CodeCommentManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; import java.util.List; @@ -8,11 +8,11 @@ import javax.annotation.Nullable; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.persistence.dao.EntityManager; public interface CodeCommentManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/CodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java similarity index 58% rename from core/src/main/java/com/turbodev/server/manager/CodeCommentRelationInfoManager.java rename to core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java index 84840714bc..b6ddf938ac 100644 --- a/core/src/main/java/com/turbodev/server/manager/CodeCommentRelationInfoManager.java +++ b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; public interface CodeCommentRelationInfoManager { } diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationManager.java new file mode 100644 index 0000000000..cca741a972 --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationManager.java @@ -0,0 +1,12 @@ +package io.onedev.server.manager; + +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentRelation; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.dao.EntityManager; + +public interface CodeCommentRelationManager extends EntityManager { + + CodeCommentRelation find(PullRequest request, CodeComment comment); + +} diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentReplyManager.java new file mode 100644 index 0000000000..5aef8f4ff2 --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/CodeCommentReplyManager.java @@ -0,0 +1,12 @@ +package io.onedev.server.manager; + +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.persistence.dao.EntityManager; + +public interface CodeCommentReplyManager extends EntityManager { + + void save(CodeCommentReply reply, CompareContext compareContext, PullRequest request); + +} diff --git a/core/src/main/java/com/turbodev/server/manager/CommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java similarity index 84% rename from core/src/main/java/com/turbodev/server/manager/CommitInfoManager.java rename to core/src/main/java/io/onedev/server/manager/CommitInfoManager.java index 99e74e5933..902fd27da2 100644 --- a/core/src/main/java/com/turbodev/server/manager/CommitInfoManager.java +++ b/core/src/main/java/io/onedev/server/manager/CommitInfoManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; import java.util.List; @@ -7,14 +7,14 @@ import java.util.Set; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.git.Contribution; -import com.turbodev.server.git.Contributor; -import com.turbodev.server.git.LineStats; -import com.turbodev.server.git.NameAndEmail; -import com.turbodev.server.model.Project; -import com.turbodev.server.util.Day; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserFacade; +import io.onedev.server.git.Contribution; +import io.onedev.server.git.Contributor; +import io.onedev.server.git.LineStats; +import io.onedev.server.git.NameAndEmail; +import io.onedev.server.model.Project; +import io.onedev.server.util.Day; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserFacade; public interface CommitInfoManager { diff --git a/core/src/main/java/com/turbodev/server/manager/ConfigManager.java b/core/src/main/java/io/onedev/server/manager/ConfigManager.java similarity index 81% rename from core/src/main/java/com/turbodev/server/manager/ConfigManager.java rename to core/src/main/java/io/onedev/server/manager/ConfigManager.java index 2893bfb38a..cb704a3592 100644 --- a/core/src/main/java/com/turbodev/server/manager/ConfigManager.java +++ b/core/src/main/java/io/onedev/server/manager/ConfigManager.java @@ -1,15 +1,15 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import javax.annotation.Nullable; -import com.turbodev.utils.license.LicenseDetail; -import com.turbodev.server.model.Config; -import com.turbodev.server.model.support.setting.BackupSetting; -import com.turbodev.server.model.support.setting.MailSetting; -import com.turbodev.server.model.support.setting.SecuritySetting; -import com.turbodev.server.model.support.setting.SystemSetting; -import com.turbodev.server.persistence.dao.EntityManager; -import com.turbodev.server.security.authenticator.Authenticator; +import io.onedev.server.model.Config; +import io.onedev.server.model.support.setting.BackupSetting; +import io.onedev.server.model.support.setting.MailSetting; +import io.onedev.server.model.support.setting.SecuritySetting; +import io.onedev.server.model.support.setting.SystemSetting; +import io.onedev.server.persistence.dao.EntityManager; +import io.onedev.server.security.authenticator.Authenticator; +import io.onedev.utils.license.LicenseDetail; public interface ConfigManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/DataManager.java b/core/src/main/java/io/onedev/server/manager/DataManager.java similarity index 56% rename from core/src/main/java/com/turbodev/server/manager/DataManager.java rename to core/src/main/java/io/onedev/server/manager/DataManager.java index ae82fe95c9..686e6f2ced 100644 --- a/core/src/main/java/com/turbodev/server/manager/DataManager.java +++ b/core/src/main/java/io/onedev/server/manager/DataManager.java @@ -1,11 +1,11 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.List; import javax.annotation.Nullable; -import com.turbodev.utils.init.ManualConfig; -import com.turbodev.server.model.support.setting.BackupSetting; +import io.onedev.server.model.support.setting.BackupSetting; +import io.onedev.utils.init.ManualConfig; public interface DataManager { diff --git a/core/src/main/java/com/turbodev/server/manager/GroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java similarity index 55% rename from core/src/main/java/com/turbodev/server/manager/GroupAuthorizationManager.java rename to core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java index d2b0a3bcfe..b31b0de6dd 100644 --- a/core/src/main/java/com/turbodev/server/manager/GroupAuthorizationManager.java +++ b/core/src/main/java/io/onedev/server/manager/GroupAuthorizationManager.java @@ -1,9 +1,9 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; -import com.turbodev.server.model.GroupAuthorization; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.GroupAuthorization; +import io.onedev.server.persistence.dao.EntityManager; public interface GroupAuthorizationManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/GroupManager.java b/core/src/main/java/io/onedev/server/manager/GroupManager.java similarity index 79% rename from core/src/main/java/com/turbodev/server/manager/GroupManager.java rename to core/src/main/java/io/onedev/server/manager/GroupManager.java index 62f2aae460..71c8169aee 100644 --- a/core/src/main/java/com/turbodev/server/manager/GroupManager.java +++ b/core/src/main/java/io/onedev/server/manager/GroupManager.java @@ -1,9 +1,9 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import javax.annotation.Nullable; -import com.turbodev.server.model.Group; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.Group; +import io.onedev.server.persistence.dao.EntityManager; public interface GroupManager extends EntityManager { /** diff --git a/core/src/main/java/com/turbodev/server/manager/MailManager.java b/core/src/main/java/io/onedev/server/manager/MailManager.java similarity index 76% rename from core/src/main/java/com/turbodev/server/manager/MailManager.java rename to core/src/main/java/io/onedev/server/manager/MailManager.java index ff6a2f2817..a037f1e577 100644 --- a/core/src/main/java/com/turbodev/server/manager/MailManager.java +++ b/core/src/main/java/io/onedev/server/manager/MailManager.java @@ -1,8 +1,8 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; -import com.turbodev.server.model.support.setting.MailSetting; +import io.onedev.server.model.support.setting.MailSetting; public interface MailManager { diff --git a/core/src/main/java/com/turbodev/server/manager/MarkdownManager.java b/core/src/main/java/io/onedev/server/manager/MarkdownManager.java similarity index 94% rename from core/src/main/java/com/turbodev/server/manager/MarkdownManager.java rename to core/src/main/java/io/onedev/server/manager/MarkdownManager.java index c6c890b506..3c4d45ffea 100644 --- a/core/src/main/java/com/turbodev/server/manager/MarkdownManager.java +++ b/core/src/main/java/io/onedev/server/manager/MarkdownManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import javax.annotation.Nullable; diff --git a/core/src/main/java/com/turbodev/server/manager/MembershipManager.java b/core/src/main/java/io/onedev/server/manager/MembershipManager.java similarity index 52% rename from core/src/main/java/com/turbodev/server/manager/MembershipManager.java rename to core/src/main/java/io/onedev/server/manager/MembershipManager.java index 3ce7960d4c..7ec1f1098f 100644 --- a/core/src/main/java/com/turbodev/server/manager/MembershipManager.java +++ b/core/src/main/java/io/onedev/server/manager/MembershipManager.java @@ -1,9 +1,9 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; -import com.turbodev.server.model.Membership; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.Membership; +import io.onedev.server.persistence.dao.EntityManager; public interface MembershipManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/ProjectManager.java b/core/src/main/java/io/onedev/server/manager/ProjectManager.java similarity index 89% rename from core/src/main/java/com/turbodev/server/manager/ProjectManager.java rename to core/src/main/java/io/onedev/server/manager/ProjectManager.java index 846fb62d0a..977130d2d5 100644 --- a/core/src/main/java/com/turbodev/server/manager/ProjectManager.java +++ b/core/src/main/java/io/onedev/server/manager/ProjectManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; import java.util.Map; @@ -8,10 +8,10 @@ import javax.annotation.Nullable; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityManager; -import com.turbodev.server.util.facade.ProjectFacade; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityManager; +import io.onedev.server.util.facade.ProjectFacade; public interface ProjectManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestCommentManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestCommentManager.java similarity index 51% rename from core/src/main/java/com/turbodev/server/manager/PullRequestCommentManager.java rename to core/src/main/java/io/onedev/server/manager/PullRequestCommentManager.java index 70f0eea3de..e7a326b1ac 100644 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestCommentManager.java +++ b/core/src/main/java/io/onedev/server/manager/PullRequestCommentManager.java @@ -1,7 +1,7 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.persistence.dao.EntityManager; public interface PullRequestCommentManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java similarity index 81% rename from core/src/main/java/com/turbodev/server/manager/PullRequestManager.java rename to core/src/main/java/io/onedev/server/manager/PullRequestManager.java index 67220bdb48..7284948349 100644 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestManager.java +++ b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java @@ -1,16 +1,16 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; import javax.annotation.Nullable; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.persistence.dao.EntityManager; -import com.turbodev.server.util.QualityCheckStatus; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.persistence.dao.EntityManager; +import io.onedev.server.util.QualityCheckStatus; public interface PullRequestManager extends EntityManager { diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestReferenceManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestReferenceManager.java new file mode 100644 index 0000000000..4f7e6ebc97 --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/PullRequestReferenceManager.java @@ -0,0 +1,8 @@ +package io.onedev.server.manager; + +import io.onedev.server.model.PullRequestReference; +import io.onedev.server.persistence.dao.EntityManager; + +public interface PullRequestReferenceManager extends EntityManager { + +} diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestStatusChangeManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestStatusChangeManager.java similarity index 58% rename from core/src/main/java/com/turbodev/server/manager/PullRequestStatusChangeManager.java rename to core/src/main/java/io/onedev/server/manager/PullRequestStatusChangeManager.java index a03b08c48a..c840d949c2 100644 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestStatusChangeManager.java +++ b/core/src/main/java/io/onedev/server/manager/PullRequestStatusChangeManager.java @@ -1,9 +1,9 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import javax.annotation.Nullable; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.persistence.dao.EntityManager; public interface PullRequestStatusChangeManager extends EntityManager { diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestTaskManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestTaskManager.java new file mode 100644 index 0000000000..1aeba6669a --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/PullRequestTaskManager.java @@ -0,0 +1,8 @@ +package io.onedev.server.manager; + +import io.onedev.server.model.PullRequestTask; +import io.onedev.server.persistence.dao.EntityManager; + +public interface PullRequestTaskManager extends EntityManager { + +} diff --git a/core/src/main/java/com/turbodev/server/manager/PullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java similarity index 75% rename from core/src/main/java/com/turbodev/server/manager/PullRequestUpdateManager.java rename to core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java index bffad888d3..f27a5b4397 100644 --- a/core/src/main/java/com/turbodev/server/manager/PullRequestUpdateManager.java +++ b/core/src/main/java/io/onedev/server/manager/PullRequestUpdateManager.java @@ -1,12 +1,12 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.List; import javax.annotation.Nullable; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.persistence.dao.EntityManager; public interface PullRequestUpdateManager extends EntityManager { diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestWatchManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestWatchManager.java new file mode 100644 index 0000000000..0e2e3df4cc --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/PullRequestWatchManager.java @@ -0,0 +1,8 @@ +package io.onedev.server.manager; + +import io.onedev.server.model.PullRequestWatch; +import io.onedev.server.persistence.dao.EntityManager; + +public interface PullRequestWatchManager extends EntityManager { + +} diff --git a/core/src/main/java/com/turbodev/server/manager/ReviewInvitationManager.java b/core/src/main/java/io/onedev/server/manager/ReviewInvitationManager.java similarity index 55% rename from core/src/main/java/com/turbodev/server/manager/ReviewInvitationManager.java rename to core/src/main/java/io/onedev/server/manager/ReviewInvitationManager.java index 0089941687..2b354bce32 100644 --- a/core/src/main/java/com/turbodev/server/manager/ReviewInvitationManager.java +++ b/core/src/main/java/io/onedev/server/manager/ReviewInvitationManager.java @@ -1,7 +1,7 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.persistence.dao.EntityManager; public interface ReviewInvitationManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/ReviewManager.java b/core/src/main/java/io/onedev/server/manager/ReviewManager.java similarity index 71% rename from core/src/main/java/com/turbodev/server/manager/ReviewManager.java rename to core/src/main/java/io/onedev/server/manager/ReviewManager.java index f54474575a..84d6fcc90c 100644 --- a/core/src/main/java/com/turbodev/server/manager/ReviewManager.java +++ b/core/src/main/java/io/onedev/server/manager/ReviewManager.java @@ -1,13 +1,13 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.List; import javax.annotation.Nullable; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.Review; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityManager; public interface ReviewManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/StorageManager.java b/core/src/main/java/io/onedev/server/manager/StorageManager.java similarity index 96% rename from core/src/main/java/com/turbodev/server/manager/StorageManager.java rename to core/src/main/java/io/onedev/server/manager/StorageManager.java index 329466988a..cdb8888ce6 100644 --- a/core/src/main/java/com/turbodev/server/manager/StorageManager.java +++ b/core/src/main/java/io/onedev/server/manager/StorageManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.io.File; diff --git a/core/src/main/java/com/turbodev/server/manager/UrlManager.java b/core/src/main/java/io/onedev/server/manager/UrlManager.java similarity index 53% rename from core/src/main/java/com/turbodev/server/manager/UrlManager.java rename to core/src/main/java/io/onedev/server/manager/UrlManager.java index f5369bad46..7f6117f184 100644 --- a/core/src/main/java/com/turbodev/server/manager/UrlManager.java +++ b/core/src/main/java/io/onedev/server/manager/UrlManager.java @@ -1,13 +1,13 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import javax.annotation.Nullable; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.PullRequestStatusChange; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.PullRequestStatusChange; public interface UrlManager { diff --git a/core/src/main/java/com/turbodev/server/manager/UserAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java similarity index 55% rename from core/src/main/java/com/turbodev/server/manager/UserAuthorizationManager.java rename to core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java index 7bc6c5e7c4..c1c4fa14a6 100644 --- a/core/src/main/java/com/turbodev/server/manager/UserAuthorizationManager.java +++ b/core/src/main/java/io/onedev/server/manager/UserAuthorizationManager.java @@ -1,9 +1,9 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.persistence.dao.EntityManager; public interface UserAuthorizationManager extends EntityManager { diff --git a/core/src/main/java/io/onedev/server/manager/UserInfoManager.java b/core/src/main/java/io/onedev/server/manager/UserInfoManager.java new file mode 100644 index 0000000000..01d38f30a8 --- /dev/null +++ b/core/src/main/java/io/onedev/server/manager/UserInfoManager.java @@ -0,0 +1,19 @@ +package io.onedev.server.manager; + +import java.util.Date; + +import javax.annotation.Nullable; + +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserFacade; + +public interface UserInfoManager { + + void visit(User user, Project project); + + @Nullable + Date getVisitDate(UserFacade user, ProjectFacade project); + +} diff --git a/core/src/main/java/com/turbodev/server/manager/UserManager.java b/core/src/main/java/io/onedev/server/manager/UserManager.java similarity index 92% rename from core/src/main/java/com/turbodev/server/manager/UserManager.java rename to core/src/main/java/io/onedev/server/manager/UserManager.java index 51ce29da25..4065b33282 100644 --- a/core/src/main/java/com/turbodev/server/manager/UserManager.java +++ b/core/src/main/java/io/onedev/server/manager/UserManager.java @@ -1,11 +1,11 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import javax.annotation.Nullable; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityManager; public interface UserManager extends EntityManager { diff --git a/core/src/main/java/com/turbodev/server/manager/VerificationManager.java b/core/src/main/java/io/onedev/server/manager/VerificationManager.java similarity index 72% rename from core/src/main/java/com/turbodev/server/manager/VerificationManager.java rename to core/src/main/java/io/onedev/server/manager/VerificationManager.java index a854fc3ed1..af9f4740bf 100644 --- a/core/src/main/java/com/turbodev/server/manager/VerificationManager.java +++ b/core/src/main/java/io/onedev/server/manager/VerificationManager.java @@ -1,10 +1,10 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Collection; import java.util.Map; -import com.turbodev.server.model.Project; -import com.turbodev.server.util.Verification; +import io.onedev.server.model.Project; +import io.onedev.server.util.Verification; public interface VerificationManager { diff --git a/core/src/main/java/com/turbodev/server/manager/VisitManager.java b/core/src/main/java/io/onedev/server/manager/VisitManager.java similarity index 75% rename from core/src/main/java/com/turbodev/server/manager/VisitManager.java rename to core/src/main/java/io/onedev/server/manager/VisitManager.java index 39f6bab0a7..4b49f30b95 100644 --- a/core/src/main/java/com/turbodev/server/manager/VisitManager.java +++ b/core/src/main/java/io/onedev/server/manager/VisitManager.java @@ -1,12 +1,12 @@ -package com.turbodev.server.manager; +package io.onedev.server.manager; import java.util.Date; import javax.annotation.Nullable; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; public interface VisitManager { diff --git a/core/src/main/java/com/turbodev/server/manager/WorkExecutor.java b/core/src/main/java/io/onedev/server/manager/WorkExecutor.java similarity index 88% rename from core/src/main/java/com/turbodev/server/manager/WorkExecutor.java rename to core/src/main/java/io/onedev/server/manager/WorkExecutor.java index 0f8f13127c..e0664964bf 100644 --- a/core/src/main/java/com/turbodev/server/manager/WorkExecutor.java +++ b/core/src/main/java/io/onedev/server/manager/WorkExecutor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager; +package io.onedev.server.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.turbodev.utils.concurrent.PrioritizedCallable; -import com.turbodev.utils.concurrent.PrioritizedRunnable; +import io.onedev.utils.concurrent.PrioritizedCallable; +import io.onedev.utils.concurrent.PrioritizedRunnable; /** * This executor is intended to run resource intensive long running tasks diff --git a/core/src/main/java/com/turbodev/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java similarity index 96% rename from core/src/main/java/com/turbodev/server/manager/impl/AbstractEnvironmentManager.java rename to core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java index d7ed7531d2..cd5b5f6a38 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/AbstractEnvironmentManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.IOException; @@ -9,10 +9,11 @@ import java.util.concurrent.ConcurrentHashMap; import javax.annotation.Nullable; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.utils.FileUtils; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.utils.FileUtils; + import com.google.common.base.Charsets; -import com.turbodev.server.event.lifecycle.SystemStopping; import jetbrains.exodus.ArrayByteIterable; import jetbrains.exodus.ByteIterable; diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultAttachmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java similarity index 84% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultAttachmentManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java index a437d1e35f..f3b754086a 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultAttachmentManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultAttachmentManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.IOException; @@ -11,23 +11,23 @@ import org.quartz.ScheduleBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.schedule.SchedulableTask; -import com.turbodev.utils.schedule.TaskScheduler; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.event.lifecycle.SystemStopping; -import com.turbodev.server.manager.AttachmentManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityPersisted; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.util.facade.ProjectFacade; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.server.manager.AttachmentManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityPersisted; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.utils.FileUtils; +import io.onedev.utils.schedule.SchedulableTask; +import io.onedev.utils.schedule.TaskScheduler; @Singleton public class DefaultAttachmentManager implements AttachmentManager, SchedulableTask { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultBatchWorkManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java similarity index 85% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultBatchWorkManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java index 52c07228f7..7816d23d63 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultBatchWorkManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBatchWorkManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.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.turbodev.launcher.loader.Listen; -import com.turbodev.utils.concurrent.Prioritized; -import com.turbodev.utils.concurrent.PrioritizedRunnable; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.event.lifecycle.SystemStopping; -import com.turbodev.server.manager.BatchWorkManager; -import com.turbodev.server.manager.WorkExecutor; -import com.turbodev.server.util.BatchWorker; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.server.manager.BatchWorkManager; +import io.onedev.server.manager.WorkExecutor; +import io.onedev.server.util.BatchWorker; +import io.onedev.utils.concurrent.Prioritized; +import io.onedev.utils.concurrent.PrioritizedRunnable; @Singleton public class DefaultBatchWorkManager implements BatchWorkManager, Runnable { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultBranchWatchManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultBranchWatchManager.java similarity index 67% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultBranchWatchManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultBranchWatchManager.java index c76fcc5c7a..e37e53fa27 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultBranchWatchManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultBranchWatchManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Collection; @@ -7,14 +7,14 @@ import javax.inject.Singleton; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.manager.BranchWatchManager; -import com.turbodev.server.model.BranchWatch; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; +import io.onedev.server.manager.BranchWatchManager; +import io.onedev.server.model.BranchWatch; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; @Singleton public class DefaultBranchWatchManager extends AbstractEntityManager implements BranchWatchManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCacheManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java similarity index 92% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultCacheManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java index b52c90e2a1..f26757df1b 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCacheManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCacheManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.HashMap; import java.util.Iterator; @@ -12,28 +12,29 @@ import javax.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.Listen; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.GroupAuthorization; -import com.turbodev.server.model.Membership; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityPersisted; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.util.facade.UserFacade; + +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.GroupAuthorization; +import io.onedev.server.model.Membership; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityPersisted; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.util.facade.UserFacade; @Singleton public class DefaultCacheManager implements CacheManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java similarity index 88% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java index 2eb196c574..df1b287599 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.IOException; import java.util.ArrayList; @@ -25,25 +25,26 @@ import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.launcher.loader.ListenerRegistry; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.turbodev.server.event.codecomment.CodeCommentCreated; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.RevListCommand; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.util.diff.DiffUtils; -import com.turbodev.server.util.diff.WhitespaceOption; + +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.codecomment.CodeCommentCreated; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.RevListCommand; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.util.diff.DiffUtils; +import io.onedev.server.util.diff.WhitespaceOption; @Singleton public class DefaultCodeCommentManager extends AbstractEntityManager implements CodeCommentManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java similarity index 88% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java index 6922b447a6..dc7fd8f98f 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.Serializable; @@ -18,32 +18,31 @@ import org.eclipse.jgit.lib.ObjectId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.concurrent.Prioritized; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.manager.BatchWorkManager; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CodeCommentRelationInfoManager; -import com.turbodev.server.manager.CodeCommentRelationManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestUpdateManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentRelation; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.CodeComment.ComparingInfo; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityPersisted; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.util.BatchWorker; - +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.manager.BatchWorkManager; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CodeCommentRelationInfoManager; +import io.onedev.server.manager.CodeCommentRelationManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestUpdateManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentRelation; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.CodeComment.ComparingInfo; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityPersisted; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.util.BatchWorker; +import io.onedev.utils.FileUtils; +import io.onedev.utils.concurrent.Prioritized; import jetbrains.exodus.ArrayByteIterable; import jetbrains.exodus.ByteIterable; import jetbrains.exodus.env.Environment; @@ -56,7 +55,7 @@ import jetbrains.exodus.env.TransactionalExecutable; public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentManager implements CodeCommentRelationInfoManager { - private static final int INFO_VERSION = 4; + private static final int INFO_VERSION = 5; private static final int BATCH_SIZE = 5000; diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java similarity index 71% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java index eeb002a14a..60b070969e 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentRelationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationManager.java @@ -1,25 +1,25 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; import org.hibernate.criterion.Restrictions; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.server.event.codecomment.CodeCommentCreated; -import com.turbodev.server.event.codecomment.CodeCommentReplied; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentCreated; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentReplied; -import com.turbodev.server.manager.CodeCommentRelationManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentRelation; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.codecomment.CodeCommentCreated; +import io.onedev.server.event.codecomment.CodeCommentReplied; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied; +import io.onedev.server.manager.CodeCommentRelationManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentRelation; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; @Singleton public class DefaultCodeCommentRelationManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentReplyManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java similarity index 62% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentReplyManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java index ded35c5648..db21f00ecf 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCodeCommentReplyManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentReplyManager.java @@ -1,18 +1,18 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.server.event.codecomment.CodeCommentReplied; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CodeCommentReplyManager; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.codecomment.CodeCommentReplied; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CodeCommentReplyManager; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultCodeCommentReplyManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java similarity index 97% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java index 34b4a44102..aeb91d58e8 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultCommitInfoManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCommitInfoManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.IOException; @@ -38,36 +38,36 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Charsets; import com.google.common.base.Splitter; import com.google.common.base.Throwables; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.git.Contribution; -import com.turbodev.server.git.Contributor; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.LineStats; -import com.turbodev.server.git.NameAndEmail; -import com.turbodev.server.git.command.FileChange; -import com.turbodev.server.git.command.GitCommit; -import com.turbodev.server.git.command.LogCommand; -import com.turbodev.server.git.command.RevListCommand; -import com.turbodev.server.git.command.RevListCommand.Order; -import com.turbodev.server.manager.BatchWorkManager; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.util.BatchWorker; -import com.turbodev.server.util.Day; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.PathUtils; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.concurrent.Prioritized; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.git.Contribution; +import io.onedev.server.git.Contributor; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.LineStats; +import io.onedev.server.git.NameAndEmail; +import io.onedev.server.git.command.FileChange; +import io.onedev.server.git.command.GitCommit; +import io.onedev.server.git.command.LogCommand; +import io.onedev.server.git.command.RevListCommand; +import io.onedev.server.git.command.RevListCommand.Order; +import io.onedev.server.manager.BatchWorkManager; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.util.BatchWorker; +import io.onedev.server.util.Day; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.utils.FileUtils; +import io.onedev.utils.PathUtils; +import io.onedev.utils.StringUtils; +import io.onedev.utils.concurrent.Prioritized; import jetbrains.exodus.ArrayByteIterable; import jetbrains.exodus.ByteIterable; import jetbrains.exodus.backup.BackupStrategy; @@ -83,7 +83,7 @@ public class DefaultCommitInfoManager extends AbstractEnvironmentManager impleme private static final Logger logger = LoggerFactory.getLogger(DefaultCommitInfoManager.class); - private static final int INFO_VERSION = 5; + private static final int INFO_VERSION = 6; private static final long LOG_FILE_SIZE = 256*1024; diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultConfigManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigManager.java similarity index 84% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultConfigManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultConfigManager.java index 86c1a00d2e..0f2018715e 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultConfigManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigManager.java @@ -1,27 +1,28 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; import org.hibernate.criterion.Restrictions; -import com.turbodev.utils.license.LicenseDetail; import com.google.common.base.Preconditions; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.DataManager; -import com.turbodev.server.migration.VersionedDocument; -import com.turbodev.server.model.Config; -import com.turbodev.server.model.Config.Key; -import com.turbodev.server.model.support.setting.BackupSetting; -import com.turbodev.server.model.support.setting.MailSetting; -import com.turbodev.server.model.support.setting.SecuritySetting; -import com.turbodev.server.model.support.setting.SystemSetting; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.authenticator.Authenticator; + +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.DataManager; +import io.onedev.server.migration.VersionedDocument; +import io.onedev.server.model.Config; +import io.onedev.server.model.Config.Key; +import io.onedev.server.model.support.setting.BackupSetting; +import io.onedev.server.model.support.setting.MailSetting; +import io.onedev.server.model.support.setting.SecuritySetting; +import io.onedev.server.model.support.setting.SystemSetting; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.authenticator.Authenticator; +import io.onedev.utils.license.LicenseDetail; @Singleton public class DefaultConfigManager extends AbstractEntityManager implements ConfigManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java similarity index 80% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultDataManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java index 60287aa3df..10e4ec4239 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultDataManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.ObjectStreamException; @@ -16,35 +16,36 @@ import org.joda.time.format.DateTimeFormat; import org.quartz.CronScheduleBuilder; import org.quartz.ScheduleBuilder; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ManagedSerializedForm; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.ZipUtils; -import com.turbodev.utils.init.ManualConfig; -import com.turbodev.utils.init.Skippable; -import com.turbodev.utils.schedule.SchedulableTask; -import com.turbodev.utils.schedule.TaskScheduler; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ManagedSerializedForm; +import io.onedev.server.OneDev; +import io.onedev.server.event.lifecycle.SystemStarting; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.DataManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Config; +import io.onedev.server.model.User; +import io.onedev.server.model.Config.Key; +import io.onedev.server.model.support.setting.BackupSetting; +import io.onedev.server.model.support.setting.MailSetting; +import io.onedev.server.model.support.setting.SecuritySetting; +import io.onedev.server.model.support.setting.SystemSetting; +import io.onedev.server.persistence.IdManager; +import io.onedev.server.persistence.PersistManager; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.utils.FileUtils; +import io.onedev.utils.ZipUtils; +import io.onedev.utils.init.ManualConfig; +import io.onedev.utils.init.Skippable; +import io.onedev.utils.schedule.SchedulableTask; +import io.onedev.utils.schedule.TaskScheduler; + import com.google.common.base.Throwables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.turbodev.server.TurboDev; -import com.turbodev.server.event.lifecycle.SystemStarting; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.DataManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Config; -import com.turbodev.server.model.User; -import com.turbodev.server.model.Config.Key; -import com.turbodev.server.model.support.setting.BackupSetting; -import com.turbodev.server.model.support.setting.MailSetting; -import com.turbodev.server.model.support.setting.SecuritySetting; -import com.turbodev.server.model.support.setting.SystemSetting; -import com.turbodev.server.persistence.IdManager; -import com.turbodev.server.persistence.PersistManager; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; @Singleton public class DefaultDataManager implements DataManager, Serializable { @@ -117,7 +118,7 @@ public class DefaultDataManager implements DataManager, Serializable { if (systemConfig == null || systemConfig.getSetting() == null) { systemSetting = new SystemSetting(); - systemSetting.setServerUrl(TurboDev.getInstance().guessServerUrl()); + systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl()); } else { if (!validator.validate(systemConfig.getSetting()).isEmpty()) systemSetting = (SystemSetting) systemConfig.getSetting(); @@ -242,14 +243,14 @@ public class DefaultDataManager implements DataManager, Serializable { User root = userManager.getRoot(); String url = configManager.getSystemSetting().getServerUrl(); String body = String.format("" - + "TurboDev url: %s" + + "OneDev url: %s" + "

" + "Error detail:" + "

%s
" + "

" - + "-- Sent by TurboDev", + + "-- Sent by OneDev", url, url, Throwables.getStackTraceAsString(e)); - mailManager.sendMail(Lists.newArrayList(root.getEmail()), "TurboDev database auto-backup failed", body); + mailManager.sendMail(Lists.newArrayList(root.getEmail()), "OneDev database auto-backup failed", body); } public Object writeReplace() throws ObjectStreamException { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java similarity index 60% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupAuthorizationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java index a189ac1502..f87c093254 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupAuthorizationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupAuthorizationManager.java @@ -1,15 +1,15 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Collection; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.GroupAuthorizationManager; -import com.turbodev.server.model.GroupAuthorization; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.server.manager.GroupAuthorizationManager; +import io.onedev.server.model.GroupAuthorization; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultGroupAuthorizationManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java similarity index 74% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java index 2e4bb1ec56..03be0c8dac 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultGroupManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java @@ -1,23 +1,23 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Iterator; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.authenticator.Authenticator; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.authenticator.Authenticator; @Singleton public class DefaultGroupManager extends AbstractEntityManager implements GroupManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultMailManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java similarity index 89% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultMailManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java index 644ee1c56d..be8a80baca 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultMailManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMailManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.net.InetAddress; import java.net.UnknownHostException; @@ -14,12 +14,12 @@ import org.apache.commons.mail.HtmlEmail; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.model.support.setting.MailSetting; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.model.support.setting.MailSetting; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultMailManager implements MailManager { @@ -96,7 +96,7 @@ public class DefaultMailManager implements MailManager { } catch (UnknownHostException e) { throw new RuntimeException(e); } - senderEmail = "turbodev@" + hostName; + senderEmail = "onedev@" + hostName; } try { email.setFrom(senderEmail); diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java similarity index 94% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultMarkdownManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java index b1d43e14e7..52dfc9145b 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultMarkdownManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.ArrayList; import java.util.List; @@ -12,9 +12,6 @@ import org.apache.commons.lang3.StringEscapeUtils; import org.apache.commons.lang3.StringUtils; import org.jsoup.nodes.Document; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.util.JsoupUtils; -import com.turbodev.server.util.markdown.MarkdownProcessor; import com.vladsch.flexmark.Extension; import com.vladsch.flexmark.ast.Node; import com.vladsch.flexmark.ext.anchorlink.AnchorLinkExtension; @@ -29,6 +26,10 @@ import com.vladsch.flexmark.parser.ParserEmulationProfile; import com.vladsch.flexmark.util.options.MutableDataHolder; import com.vladsch.flexmark.util.options.MutableDataSet; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.util.JsoupUtils; +import io.onedev.server.util.markdown.MarkdownProcessor; + @Singleton public class DefaultMarkdownManager implements MarkdownManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultMembershipManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java similarity index 58% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultMembershipManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java index 64e9a2cbc0..d11cf1a979 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultMembershipManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMembershipManager.java @@ -1,15 +1,15 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Collection; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.MembershipManager; -import com.turbodev.server.model.Membership; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.server.manager.MembershipManager; +import io.onedev.server.model.Membership; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultMembershipManager extends AbstractEntityManager implements MembershipManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java similarity index 85% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultNotificationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java index 529e49c6f9..769a291b06 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultNotificationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultNotificationManager.java @@ -1,8 +1,8 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; -import static com.turbodev.server.model.PullRequestTask.Type.RESOLVE_CONFLICT; -import static com.turbodev.server.model.PullRequestTask.Type.REVIEW; -import static com.turbodev.server.model.PullRequestTask.Type.UPDATE; +import static io.onedev.server.model.PullRequestTask.Type.RESOLVE_CONFLICT; +import static io.onedev.server.model.PullRequestTask.Type.REVIEW; +import static io.onedev.server.model.PullRequestTask.Type.UPDATE; import java.util.Collection; import java.util.Date; @@ -16,44 +16,45 @@ import javax.inject.Singleton; import org.eclipse.jgit.util.StringUtils; import org.hibernate.criterion.Restrictions; -import com.turbodev.launcher.loader.Listen; import com.google.common.collect.Sets; -import com.turbodev.server.event.MarkdownAware; -import com.turbodev.server.event.codecomment.CodeCommentCreated; -import com.turbodev.server.event.codecomment.CodeCommentEvent; -import com.turbodev.server.event.codecomment.CodeCommentReplied; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentCreated; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentEvent; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentReplied; -import com.turbodev.server.event.pullrequest.PullRequestCommentCreated; -import com.turbodev.server.event.pullrequest.PullRequestEvent; -import com.turbodev.server.event.pullrequest.PullRequestMergePreviewCalculated; -import com.turbodev.server.event.pullrequest.PullRequestOpened; -import com.turbodev.server.event.pullrequest.PullRequestStatusChangeEvent; -import com.turbodev.server.event.pullrequest.PullRequestUpdated; -import com.turbodev.server.event.pullrequest.PullRequestVerificationEvent; -import com.turbodev.server.event.pullrequest.PullRequestVerificationRunning; -import com.turbodev.server.event.pullrequest.PullRequestVerificationSucceeded; -import com.turbodev.server.manager.BranchWatchManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.manager.PullRequestTaskManager; -import com.turbodev.server.manager.PullRequestWatchManager; -import com.turbodev.server.manager.UrlManager; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.model.BranchWatch; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.PullRequestTask; -import com.turbodev.server.model.PullRequestWatch; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.model.User; -import com.turbodev.server.model.PullRequestStatusChange.Type; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.util.QualityCheckStatus; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.markdown.MentionParser; + +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.MarkdownAware; +import io.onedev.server.event.codecomment.CodeCommentCreated; +import io.onedev.server.event.codecomment.CodeCommentEvent; +import io.onedev.server.event.codecomment.CodeCommentReplied; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentCreated; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied; +import io.onedev.server.event.pullrequest.PullRequestCommentCreated; +import io.onedev.server.event.pullrequest.PullRequestEvent; +import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated; +import io.onedev.server.event.pullrequest.PullRequestOpened; +import io.onedev.server.event.pullrequest.PullRequestStatusChangeEvent; +import io.onedev.server.event.pullrequest.PullRequestUpdated; +import io.onedev.server.event.pullrequest.PullRequestVerificationEvent; +import io.onedev.server.event.pullrequest.PullRequestVerificationRunning; +import io.onedev.server.event.pullrequest.PullRequestVerificationSucceeded; +import io.onedev.server.manager.BranchWatchManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.manager.PullRequestTaskManager; +import io.onedev.server.manager.PullRequestWatchManager; +import io.onedev.server.manager.UrlManager; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.model.BranchWatch; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.PullRequestTask; +import io.onedev.server.model.PullRequestWatch; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.model.User; +import io.onedev.server.model.PullRequestStatusChange.Type; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.util.QualityCheckStatus; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.markdown.MentionParser; @Singleton public class DefaultNotificationManager implements NotificationManager { @@ -111,7 +112,7 @@ public class DefaultNotificationManager implements NotificationManager { + "

" + "Visit %s for details." + "

" - + "-- Sent by TurboDev", + + "-- Sent by OneDev", subject, markdownManager.escape(markdown), url, url); mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()), @@ -150,7 +151,7 @@ public class DefaultNotificationManager implements NotificationManager { + "

" + "Visit %s for details." + "

" - + "-- Sent by TurboDev", + + "-- Sent by OneDev", user.getDisplayName(), subject, url, url); mailManager.sendMailAsync(Sets.newHashSet(task.getUser().getEmail()), subject, body); notified = true; @@ -226,7 +227,7 @@ public class DefaultNotificationManager implements NotificationManager { + "

" + "Visit %s for details." + "

" - + "-- Sent by TurboDev", + + "-- Sent by OneDev", request.getSubmitter().getDisplayName(), request.getNumber(), request.getTitle(), url, url); @@ -267,7 +268,7 @@ public class DefaultNotificationManager implements NotificationManager { + "

" + "Visit %s for details." + "

" - + "-- Sent by TurboDev", + + "-- Sent by OneDev", request.getSubmitter().getDisplayName(), event.getUser().getDisplayName(), request.getNumber(), request.getTitle(), url, url); mailManager.sendMailAsync(Sets.newHashSet(request.getSubmitter().getEmail()), subject, body); @@ -324,7 +325,7 @@ public class DefaultNotificationManager implements NotificationManager { + "

" + "Visit %s for details." + "

" - + "-- Sent by TurboDev", + + "-- Sent by OneDev", subject, markdownManager.escape(markdown), url, url); mailManager.sendMailAsync(mentionUsers.stream().map(User::getEmail).collect(Collectors.toList()), @@ -409,7 +410,7 @@ public class DefaultNotificationManager implements NotificationManager { body = String.format("Dear Users," + "

%s opened pull request #%d - %s" + "

Visit %s for details." - + "

-- Sent by TurboDev" + + "

-- Sent by OneDev" + "

" + "You receive this email as you are watching target branch.", request.getSubmitter().getDisplayName(), request.getNumber(), request.getTitle(), url, url); @@ -421,14 +422,14 @@ public class DefaultNotificationManager implements NotificationManager { || event instanceof PullRequestVerificationEvent) { activity = StringUtils.capitalize(activity); } else { - activity = "TurboDev " + activity; + activity = "OneDev " + activity; } subject = String.format("%s pull request #%d - %s", activity, request.getNumber(), request.getTitle()); body = String.format("Dear Users," + "

%s pull request #%d - %s " + "

Visit %s for details." - + "

-- Sent by TurboDev" + + "

-- Sent by OneDev" + "

" + "You receive this email as you are watching the pull request.", activity, request.getNumber(), request.getTitle(), url, url); diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java similarity index 87% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java index b71723ed91..7616b1abe7 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultProjectManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultProjectManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.IOException; @@ -28,40 +28,41 @@ import org.hibernate.query.Query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.ProjectRenamed; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.CloneCommand; +import io.onedev.server.git.command.ListChangedFilesCommand; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserAuthorizationManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.FileProtection; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.Verification; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.utils.FileUtils; +import io.onedev.utils.StringUtils; + import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.turbodev.server.event.ProjectRenamed; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.event.lifecycle.SystemStopping; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.CloneCommand; -import com.turbodev.server.git.command.ListChangedFilesCommand; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserAuthorizationManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.FileProtection; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; @Singleton public class DefaultProjectManager extends AbstractEntityManager implements ProjectManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java similarity index 67% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestCommentManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java index c38db3df56..33c904d02d 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestCommentManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestCommentManager.java @@ -1,18 +1,18 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.server.event.pullrequest.PullRequestCommentCreated; -import com.turbodev.server.manager.PullRequestCommentManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.support.LastEvent; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.editable.EditableUtils; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.pullrequest.PullRequestCommentCreated; +import io.onedev.server.manager.PullRequestCommentManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.support.LastEvent; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.editable.EditableUtils; @Singleton public class DefaultPullRequestCommentManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java similarity index 87% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java index 6a3c6ab1ee..dc60a26963 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java @@ -1,15 +1,15 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofOpen; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofSource; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofSourceProject; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofSubmitter; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofTarget; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofTargetProject; -import static com.turbodev.server.model.support.MergeStrategy.ALWAYS_MERGE; -import static com.turbodev.server.model.support.MergeStrategy.MERGE_IF_NECESSARY; -import static com.turbodev.server.model.support.MergeStrategy.REBASE_MERGE; -import static com.turbodev.server.model.support.MergeStrategy.SQUASH_MERGE; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofOpen; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofSource; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofSourceProject; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofSubmitter; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject; +import static io.onedev.server.model.support.MergeStrategy.ALWAYS_MERGE; +import static io.onedev.server.model.support.MergeStrategy.MERGE_IF_NECESSARY; +import static io.onedev.server.model.support.MergeStrategy.REBASE_MERGE; +import static io.onedev.server.model.support.MergeStrategy.SQUASH_MERGE; import java.util.Collection; import java.util.Date; @@ -38,49 +38,50 @@ import org.hibernate.query.Query; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.concurrent.Prioritized; +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.OneDev; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated; +import io.onedev.server.event.pullrequest.PullRequestOpened; +import io.onedev.server.event.pullrequest.PullRequestStatusChangeEvent; +import io.onedev.server.event.pullrequest.PullRequestVerificationEvent; +import io.onedev.server.event.pullrequest.PullRequestVerificationRunning; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.BatchWorkManager; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.manager.PullRequestUpdateManager; +import io.onedev.server.manager.ReviewInvitationManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.Review; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.model.User; +import io.onedev.server.model.PullRequestStatusChange.Type; +import io.onedev.server.model.support.CloseInfo; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.model.support.MergeStrategy; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.BatchWorker; +import io.onedev.server.util.QualityCheckStatus; +import io.onedev.server.util.Verification; +import io.onedev.utils.concurrent.Prioritized; + import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.turbodev.server.TurboDev; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.event.pullrequest.PullRequestMergePreviewCalculated; -import com.turbodev.server.event.pullrequest.PullRequestOpened; -import com.turbodev.server.event.pullrequest.PullRequestStatusChangeEvent; -import com.turbodev.server.event.pullrequest.PullRequestVerificationEvent; -import com.turbodev.server.event.pullrequest.PullRequestVerificationRunning; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.BatchWorkManager; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.manager.PullRequestUpdateManager; -import com.turbodev.server.manager.ReviewInvitationManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.model.User; -import com.turbodev.server.model.PullRequestStatusChange.Type; -import com.turbodev.server.model.support.CloseInfo; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.model.support.MergeStrategy; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.BatchWorker; -import com.turbodev.server.util.QualityCheckStatus; -import com.turbodev.server.util.Verification; @Singleton public class DefaultPullRequestManager extends AbstractEntityManager implements PullRequestManager { @@ -237,7 +238,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestStatusChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestStatusChangeManager.java similarity index 64% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestStatusChangeManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestStatusChangeManager.java index 631b3fdc2a..33e2e49228 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestStatusChangeManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestStatusChangeManager.java @@ -1,14 +1,14 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.server.event.pullrequest.PullRequestStatusChangeEvent; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.pullrequest.PullRequestStatusChangeEvent; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultPullRequestStatusChangeManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestTaskManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestTaskManager.java similarity index 51% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestTaskManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestTaskManager.java index 6322ea51f8..f9d1706ba7 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestTaskManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestTaskManager.java @@ -1,12 +1,12 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.PullRequestTaskManager; -import com.turbodev.server.model.PullRequestTask; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.server.manager.PullRequestTaskManager; +import io.onedev.server.model.PullRequestTask; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultPullRequestTaskManager extends AbstractEntityManager implements PullRequestTaskManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestUpdateManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java similarity index 77% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestUpdateManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java index f0c953f474..6691ff4fbb 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestUpdateManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestUpdateManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.List; @@ -11,23 +11,24 @@ import org.eclipse.jgit.transport.RefSpec; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.launcher.loader.ListenerRegistry; import com.google.common.base.Throwables; -import com.turbodev.server.event.pullrequest.PullRequestUpdated; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.PullRequestCommentManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestUpdateManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.support.LastEvent; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.util.editable.EditableUtils; + +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.pullrequest.PullRequestUpdated; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.PullRequestCommentManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestUpdateManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.support.LastEvent; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.util.editable.EditableUtils; @Singleton public class DefaultPullRequestUpdateManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestWatchManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestWatchManager.java similarity index 51% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestWatchManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestWatchManager.java index 11478b102a..b4d6de23b2 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultPullRequestWatchManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestWatchManager.java @@ -1,12 +1,12 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.PullRequestWatchManager; -import com.turbodev.server.model.PullRequestWatch; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.server.manager.PullRequestWatchManager; +import io.onedev.server.model.PullRequestWatch; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultPullRequestWatchManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultReviewInvitationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java similarity index 78% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultReviewInvitationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java index 6cbc1bb89d..1b47f6a00d 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultReviewInvitationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewInvitationManager.java @@ -1,21 +1,21 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Date; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.manager.ReviewInvitationManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.manager.ReviewInvitationManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; @Singleton public class DefaultReviewInvitationManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultReviewManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java similarity index 77% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultReviewManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java index 67c1765a85..9af65bda03 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultReviewManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultReviewManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Date; import java.util.Iterator; @@ -10,20 +10,20 @@ import javax.inject.Singleton; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.manager.ReviewManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.User; -import com.turbodev.server.model.PullRequestStatusChange.Type; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.manager.ReviewManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.Review; +import io.onedev.server.model.User; +import io.onedev.server.model.PullRequestStatusChange.Type; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; @Singleton public class DefaultReviewManager extends AbstractEntityManager implements ReviewManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultStorageManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java similarity index 75% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultStorageManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java index ce7fa80b24..eaf5d7f8b3 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultStorageManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultStorageManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.IOException; @@ -9,25 +9,27 @@ import javax.inject.Singleton; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.utils.FileUtils; -import com.turbodev.server.event.lifecycle.SystemStarting; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityRemoved; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStarting; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.utils.FileUtils; @Singleton public class DefaultStorageManager implements StorageManager { private static final Logger logger = LoggerFactory.getLogger(DefaultStorageManager.class); - private static final String OLD_DELETE_MARK = "to_be_deleted_when_gitplex_is_restarted"; + private static final String OLD_DELETE_MARK1 = "to_be_deleted_when_gitplex_is_restarted"; - private static final String DELETE_MARK = "to_be_deleted_when_turbodev_is_restarted"; + private static final String OLD_DELETE_MARK2 = "to_be_deleted_when_turbodev_is_restarted"; + + private static final String DELETE_MARK = "to_be_deleted_when_onedev_is_restarted"; private final Dao dao; @@ -89,13 +91,17 @@ public class DefaultStorageManager implements StorageManager { @Listen public void on(SystemStarting event) { for (File projectDir: getProjectsDir().listFiles()) { - if (new File(projectDir, OLD_DELETE_MARK).exists() || new File(projectDir, DELETE_MARK).exists()) { + if (new File(projectDir, OLD_DELETE_MARK1).exists() + || new File(projectDir, OLD_DELETE_MARK2).exists() + || new File(projectDir, DELETE_MARK).exists()) { logger.info("Deleting directory marked for deletion: " + projectDir); FileUtils.deleteDir(projectDir); } } for (File userDir: getUsersDir().listFiles()) { - if (new File(userDir, OLD_DELETE_MARK).exists() || new File(userDir, DELETE_MARK).exists()) { + if (new File(userDir, OLD_DELETE_MARK1).exists() + || new File(userDir, OLD_DELETE_MARK2).exists() + || new File(userDir, DELETE_MARK).exists()) { logger.info("Deleting directory marked for deletion: " + userDir); FileUtils.deleteDir(userDir); } diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserAuthorizationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java similarity index 60% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultUserAuthorizationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java index 00c5144e95..f3d229f8f3 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserAuthorizationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserAuthorizationManager.java @@ -1,15 +1,15 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Collection; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.server.manager.UserAuthorizationManager; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.server.manager.UserAuthorizationManager; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultUserAuthorizationManager extends AbstractEntityManager diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java similarity index 79% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java index 0338bed594..79ca32e487 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserInfoManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.util.Date; @@ -6,16 +6,15 @@ import java.util.Date; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.manager.UserInfoManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserFacade; - +import io.onedev.launcher.loader.Listen; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.manager.UserInfoManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserFacade; import jetbrains.exodus.env.Environment; import jetbrains.exodus.env.Store; import jetbrains.exodus.env.Transaction; @@ -32,7 +31,7 @@ import jetbrains.exodus.env.TransactionalExecutable; @Singleton public class DefaultUserInfoManager extends AbstractEnvironmentManager implements UserInfoManager { - private static final int INFO_VERSION = 3; + private static final int INFO_VERSION = 4; private static final String VISIT_STORE = "visit"; diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java similarity index 87% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java index cbaf2951f8..fd30ad9364 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultUserManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.util.Iterator; @@ -10,21 +10,21 @@ import org.eclipse.jgit.lib.PersonIdent; import org.hibernate.ReplicationMode; import org.hibernate.query.Query; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.event.lifecycle.SystemStarted; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.AbstractEntityManager; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityPersisted; +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.lifecycle.SystemStarted; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.AbstractEntityManager; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityPersisted; +import io.onedev.utils.StringUtils; @Singleton public class DefaultUserManager extends AbstractEntityManager implements UserManager { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java similarity index 84% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java index 936b48199f..4fa444f9fb 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVerificationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultVerificationManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.io.Serializable; @@ -15,24 +15,23 @@ import javax.inject.Singleton; import org.apache.commons.lang.SerializationUtils; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.FileUtils; -import com.turbodev.server.event.pullrequest.PullRequestVerificationEvent; -import com.turbodev.server.event.pullrequest.PullRequestVerificationFailed; -import com.turbodev.server.event.pullrequest.PullRequestVerificationInError; -import com.turbodev.server.event.pullrequest.PullRequestVerificationRunning; -import com.turbodev.server.event.pullrequest.PullRequestVerificationSucceeded; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.Verification.Status; - +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.pullrequest.PullRequestVerificationEvent; +import io.onedev.server.event.pullrequest.PullRequestVerificationFailed; +import io.onedev.server.event.pullrequest.PullRequestVerificationInError; +import io.onedev.server.event.pullrequest.PullRequestVerificationRunning; +import io.onedev.server.event.pullrequest.PullRequestVerificationSucceeded; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.util.Verification; +import io.onedev.server.util.Verification.Status; +import io.onedev.utils.FileUtils; import jetbrains.exodus.ArrayByteIterable; import jetbrains.exodus.ByteIterable; import jetbrains.exodus.env.Environment; @@ -44,7 +43,7 @@ import jetbrains.exodus.env.TransactionalExecutable; @Singleton public class DefaultVerificationManager extends AbstractEnvironmentManager implements VerificationManager { - private static final int INFO_VERSION = 3; + private static final int INFO_VERSION = 4; private static final String INFO_DIR = "verification"; diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java similarity index 84% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java index d9b48fd93a..e2c3850f29 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultVisitManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; import java.io.File; import java.util.Date; @@ -6,22 +6,21 @@ import java.util.Date; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.event.codecomment.CodeCommentEvent; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentEvent; -import com.turbodev.server.event.pullrequest.PullRequestCommentCreated; -import com.turbodev.server.event.pullrequest.PullRequestOpened; -import com.turbodev.server.event.pullrequest.PullRequestStatusChangeEvent; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.utils.FileUtils; - +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.codecomment.CodeCommentEvent; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent; +import io.onedev.server.event.pullrequest.PullRequestCommentCreated; +import io.onedev.server.event.pullrequest.PullRequestOpened; +import io.onedev.server.event.pullrequest.PullRequestStatusChangeEvent; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.utils.FileUtils; import jetbrains.exodus.env.Environment; import jetbrains.exodus.env.Store; import jetbrains.exodus.env.Transaction; @@ -31,7 +30,7 @@ import jetbrains.exodus.env.TransactionalExecutable; @Singleton public class DefaultVisitManager extends AbstractEnvironmentManager implements VisitManager { - private static final int INFO_VERSION = 3; + private static final int INFO_VERSION = 4; private static final String INFO_DIR = "visit"; diff --git a/core/src/main/java/com/turbodev/server/manager/impl/DefaultWorkExecutor.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java similarity index 83% rename from core/src/main/java/com/turbodev/server/manager/impl/DefaultWorkExecutor.java rename to core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java index 41c98339b5..04e03fb3a1 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/DefaultWorkExecutor.java +++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultWorkExecutor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.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.turbodev.launcher.loader.Listen; -import com.turbodev.utils.concurrent.PrioritizedCallable; -import com.turbodev.utils.concurrent.PrioritizedExecutor; -import com.turbodev.utils.concurrent.PrioritizedRunnable; -import com.turbodev.server.event.lifecycle.SystemStopping; -import com.turbodev.server.manager.WorkExecutor; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.server.manager.WorkExecutor; +import io.onedev.utils.concurrent.PrioritizedCallable; +import io.onedev.utils.concurrent.PrioritizedExecutor; +import io.onedev.utils.concurrent.PrioritizedRunnable; @Singleton public class DefaultWorkExecutor implements WorkExecutor { diff --git a/core/src/main/java/com/turbodev/server/manager/impl/NotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/NotificationManager.java similarity index 51% rename from core/src/main/java/com/turbodev/server/manager/impl/NotificationManager.java rename to core/src/main/java/io/onedev/server/manager/impl/NotificationManager.java index 07772ea18f..079fca4e60 100644 --- a/core/src/main/java/com/turbodev/server/manager/impl/NotificationManager.java +++ b/core/src/main/java/io/onedev/server/manager/impl/NotificationManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.manager.impl; +package io.onedev.server.manager.impl; public interface NotificationManager { diff --git a/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java similarity index 96% rename from core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java rename to core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java index b1597279b0..be7eb31ff9 100644 --- a/core/src/main/java/com/turbodev/server/migration/DatabaseMigrator.java +++ b/core/src/main/java/io/onedev/server/migration/DatabaseMigrator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; import java.io.File; import java.io.IOException; @@ -12,10 +12,11 @@ import javax.inject.Singleton; import org.dom4j.Element; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.StringUtils; import com.google.common.base.Charsets; +import io.onedev.utils.FileUtils; +import io.onedev.utils.StringUtils; + @Singleton @SuppressWarnings("unused") public class DatabaseMigrator { @@ -454,4 +455,20 @@ public class DatabaseMigrator { } } + private void migrate15(File dataDir, Stack versions) { + for (File file: dataDir.listFiles()) { + try { + String content = FileUtils.readFileToString(file, Charsets.UTF_8); + content = StringUtils.replace(content, "com.turbodev", "io.onedev"); + content = StringUtils.replace(content, "com/turbodev", "io/onedev"); + content = StringUtils.replace(content, "turbodev.com", "onedev.io"); + content = StringUtils.replace(content, "turbodev", "onedev"); + content = StringUtils.replace(content, "TurboDev", "OneDev"); + FileUtils.writeFile(file, content, Charsets.UTF_8.name()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + } + } diff --git a/core/src/main/java/com/turbodev/server/migration/JpaConverter.java b/core/src/main/java/io/onedev/server/migration/JpaConverter.java similarity index 96% rename from core/src/main/java/com/turbodev/server/migration/JpaConverter.java rename to core/src/main/java/io/onedev/server/migration/JpaConverter.java index 7e808f3421..dca2d054d6 100644 --- a/core/src/main/java/com/turbodev/server/migration/JpaConverter.java +++ b/core/src/main/java/io/onedev/server/migration/JpaConverter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; import java.lang.reflect.Field; import java.util.Collection; @@ -14,10 +14,13 @@ import org.dom4j.Element; import org.hibernate.collection.internal.PersistentBag; import org.hibernate.proxy.HibernateProxy; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.ClassUtils; -import com.turbodev.utils.ReflectionUtils; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.utils.ClassUtils; +import io.onedev.utils.ReflectionUtils; +import io.onedev.utils.StringUtils; + import com.google.common.base.Throwables; import com.thoughtworks.xstream.converters.MarshallingContext; import com.thoughtworks.xstream.converters.UnmarshallingContext; @@ -27,8 +30,6 @@ import com.thoughtworks.xstream.core.util.HierarchicalStreams; import com.thoughtworks.xstream.io.HierarchicalStreamReader; import com.thoughtworks.xstream.io.HierarchicalStreamWriter; import com.thoughtworks.xstream.mapper.Mapper; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.dao.Dao; @SuppressWarnings({"rawtypes", "unchecked"}) public class JpaConverter extends ReflectionConverter { diff --git a/core/src/main/java/com/turbodev/server/migration/MigrationHelper.java b/core/src/main/java/io/onedev/server/migration/MigrationHelper.java similarity index 98% rename from core/src/main/java/com/turbodev/server/migration/MigrationHelper.java rename to core/src/main/java/io/onedev/server/migration/MigrationHelper.java index 7ff2c328e4..552a768ffd 100644 --- a/core/src/main/java/com/turbodev/server/migration/MigrationHelper.java +++ b/core/src/main/java/io/onedev/server/migration/MigrationHelper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -15,9 +15,10 @@ import java.util.regex.Pattern; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.StringUtils; import com.google.common.base.Throwables; +import io.onedev.utils.StringUtils; + public class MigrationHelper { private static final Logger logger = LoggerFactory.getLogger(MigrationHelper.class); diff --git a/core/src/main/java/com/turbodev/server/migration/MigrationListener.java b/core/src/main/java/io/onedev/server/migration/MigrationListener.java similarity index 66% rename from core/src/main/java/com/turbodev/server/migration/MigrationListener.java rename to core/src/main/java/io/onedev/server/migration/MigrationListener.java index 605d4acfab..d07f94315c 100644 --- a/core/src/main/java/com/turbodev/server/migration/MigrationListener.java +++ b/core/src/main/java/io/onedev/server/migration/MigrationListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; public interface MigrationListener { diff --git a/core/src/main/java/com/turbodev/server/migration/MigratorAnalyzeResult.java b/core/src/main/java/io/onedev/server/migration/MigratorAnalyzeResult.java similarity index 94% rename from core/src/main/java/com/turbodev/server/migration/MigratorAnalyzeResult.java rename to core/src/main/java/io/onedev/server/migration/MigratorAnalyzeResult.java index 8b87a15917..40e7d4fa9d 100644 --- a/core/src/main/java/com/turbodev/server/migration/MigratorAnalyzeResult.java +++ b/core/src/main/java/io/onedev/server/migration/MigratorAnalyzeResult.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/core/src/main/java/com/turbodev/server/migration/PersistentBagConverter.java b/core/src/main/java/io/onedev/server/migration/PersistentBagConverter.java similarity index 95% rename from core/src/main/java/com/turbodev/server/migration/PersistentBagConverter.java rename to core/src/main/java/io/onedev/server/migration/PersistentBagConverter.java index cfd24a1dcc..f7361efbc4 100644 --- a/core/src/main/java/com/turbodev/server/migration/PersistentBagConverter.java +++ b/core/src/main/java/io/onedev/server/migration/PersistentBagConverter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; import java.util.ArrayList; diff --git a/core/src/main/java/com/turbodev/server/migration/VersionedDocument.java b/core/src/main/java/io/onedev/server/migration/VersionedDocument.java similarity index 98% rename from core/src/main/java/com/turbodev/server/migration/VersionedDocument.java rename to core/src/main/java/io/onedev/server/migration/VersionedDocument.java index 42d9424bd9..2c7ba15cf5 100644 --- a/core/src/main/java/com/turbodev/server/migration/VersionedDocument.java +++ b/core/src/main/java/io/onedev/server/migration/VersionedDocument.java @@ -1,4 +1,4 @@ -package com.turbodev.server.migration; +package io.onedev.server.migration; import java.io.ByteArrayOutputStream; import java.io.Externalizable; @@ -36,9 +36,10 @@ import org.dom4j.io.SAXReader; import org.dom4j.io.XMLWriter; import org.xml.sax.EntityResolver; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.ClassUtils; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.utils.ClassUtils; +import io.onedev.utils.FileUtils; + import com.google.common.base.Charsets; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; diff --git a/core/src/main/java/com/turbodev/server/model/AbstractEntity.java b/core/src/main/java/io/onedev/server/model/AbstractEntity.java similarity index 94% rename from core/src/main/java/com/turbodev/server/model/AbstractEntity.java rename to core/src/main/java/io/onedev/server/model/AbstractEntity.java index 1dd6574f27..258ae2426c 100644 --- a/core/src/main/java/com/turbodev/server/model/AbstractEntity.java +++ b/core/src/main/java/io/onedev/server/model/AbstractEntity.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.io.Serializable; @@ -21,7 +21,7 @@ public abstract class AbstractEntity implements Serializable, Comparabledate.getTime(); } else { return true; diff --git a/core/src/main/java/com/turbodev/server/model/CodeCommentRelation.java b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java similarity index 96% rename from core/src/main/java/com/turbodev/server/model/CodeCommentRelation.java rename to core/src/main/java/io/onedev/server/model/CodeCommentRelation.java index 94257a2828..4b65e6a5a3 100644 --- a/core/src/main/java/com/turbodev/server/model/CodeCommentRelation.java +++ b/core/src/main/java/io/onedev/server/model/CodeCommentRelation.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import javax.persistence.Entity; import javax.persistence.FetchType; diff --git a/core/src/main/java/com/turbodev/server/model/CodeCommentReply.java b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java similarity index 98% rename from core/src/main/java/com/turbodev/server/model/CodeCommentReply.java rename to core/src/main/java/io/onedev/server/model/CodeCommentReply.java index 10447ff7a7..17a7911f70 100644 --- a/core/src/main/java/com/turbodev/server/model/CodeCommentReply.java +++ b/core/src/main/java/io/onedev/server/model/CodeCommentReply.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/model/Config.java b/core/src/main/java/io/onedev/server/model/Config.java similarity index 97% rename from core/src/main/java/com/turbodev/server/model/Config.java rename to core/src/main/java/io/onedev/server/model/Config.java index f168c4d222..00ed2fe625 100644 --- a/core/src/main/java/com/turbodev/server/model/Config.java +++ b/core/src/main/java/io/onedev/server/model/Config.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/model/Group.java b/core/src/main/java/io/onedev/server/model/Group.java similarity index 94% rename from core/src/main/java/com/turbodev/server/model/Group.java rename to core/src/main/java/io/onedev/server/model/Group.java index 26bf143d41..eb9ef45981 100644 --- a/core/src/main/java/com/turbodev/server/model/Group.java +++ b/core/src/main/java/io/onedev/server/model/Group.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.ArrayList; import java.util.Collection; @@ -13,8 +13,8 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.facade.GroupFacade; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.facade.GroupFacade; @Entity @Cache(usage=CacheConcurrencyStrategy.READ_WRITE) diff --git a/core/src/main/java/com/turbodev/server/model/GroupAuthorization.java b/core/src/main/java/io/onedev/server/model/GroupAuthorization.java similarity index 89% rename from core/src/main/java/com/turbodev/server/model/GroupAuthorization.java rename to core/src/main/java/io/onedev/server/model/GroupAuthorization.java index a11b92834e..053759e941 100644 --- a/core/src/main/java/com/turbodev/server/model/GroupAuthorization.java +++ b/core/src/main/java/io/onedev/server/model/GroupAuthorization.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; 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.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.util.facade.GroupAuthorizationFacade; @Entity @Table( diff --git a/core/src/main/java/com/turbodev/server/model/Membership.java b/core/src/main/java/io/onedev/server/model/Membership.java similarity index 91% rename from core/src/main/java/com/turbodev/server/model/Membership.java rename to core/src/main/java/io/onedev/server/model/Membership.java index b57bfd930a..ad08d4fb50 100644 --- a/core/src/main/java/com/turbodev/server/model/Membership.java +++ b/core/src/main/java/io/onedev/server/model/Membership.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; 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.turbodev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.MembershipFacade; @Entity @Table( diff --git a/core/src/main/java/io/onedev/server/model/ModelLocator.java b/core/src/main/java/io/onedev/server/model/ModelLocator.java new file mode 100644 index 0000000000..908dfaf4a6 --- /dev/null +++ b/core/src/main/java/io/onedev/server/model/ModelLocator.java @@ -0,0 +1,5 @@ +package io.onedev.server.model; + +public class ModelLocator { + +} diff --git a/core/src/main/java/com/turbodev/server/model/ModelVersion.java b/core/src/main/java/io/onedev/server/model/ModelVersion.java similarity index 86% rename from core/src/main/java/com/turbodev/server/model/ModelVersion.java rename to core/src/main/java/io/onedev/server/model/ModelVersion.java index 3e2b984cd7..145fe6d2f5 100644 --- a/core/src/main/java/com/turbodev/server/model/ModelVersion.java +++ b/core/src/main/java/io/onedev/server/model/ModelVersion.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import javax.persistence.Entity; import javax.persistence.Table; diff --git a/core/src/main/java/com/turbodev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java similarity index 91% rename from core/src/main/java/com/turbodev/server/model/Project.java rename to core/src/main/java/io/onedev/server/model/Project.java index da6326357e..cd298216a1 100644 --- a/core/src/main/java/com/turbodev/server/model/Project.java +++ b/core/src/main/java/io/onedev/server/model/Project.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.io.File; import java.io.IOException; @@ -58,40 +58,41 @@ import org.hibernate.annotations.CacheConcurrencyStrategy; import org.hibernate.annotations.DynamicUpdate; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.LockUtils; -import com.turbodev.utils.PathUtils; -import com.turbodev.utils.Range; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.OneDev; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.git.BlameBlock; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.BlobIdentFilter; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.git.Submodule; +import io.onedev.server.git.command.BlameCommand; +import io.onedev.server.git.exception.NotFileException; +import io.onedev.server.git.exception.ObjectNotFoundException; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.CommitMessageTransformSetting; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Markdown; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.validation.annotation.ProjectName; +import io.onedev.utils.FileUtils; +import io.onedev.utils.LockUtils; +import io.onedev.utils.PathUtils; +import io.onedev.utils.Range; +import io.onedev.utils.StringUtils; + import com.google.common.base.Optional; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.turbodev.server.TurboDev; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.git.BlameBlock; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.BlobIdentFilter; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.git.Submodule; -import com.turbodev.server.git.command.BlameCommand; -import com.turbodev.server.git.exception.NotFileException; -import com.turbodev.server.git.exception.ObjectNotFoundException; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.CommitMessageTransformSetting; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Markdown; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.validation.annotation.ProjectName; @Entity @Table(indexes={@Index(columnList="g_forkedFrom_id")}) @@ -311,7 +312,7 @@ public class Project extends AbstractEntity { } public File getGitDir() { - return TurboDev.getInstance(StorageManager.class).getProjectGitDir(getId()); + return OneDev.getInstance(StorageManager.class).getProjectGitDir(getId()); } /** @@ -346,13 +347,13 @@ public class Project extends AbstractEntity { public Repository getRepository() { if (repository == null) { - repository = TurboDev.getInstance(ProjectManager.class).getRepository(this); + repository = OneDev.getInstance(ProjectManager.class).getRepository(this); } return repository; } public String getUrl() { - return TurboDev.getInstance(ConfigManager.class).getSystemSetting().getServerUrl() + "/projects/" + getName(); + return OneDev.getInstance(ConfigManager.class).getSystemSetting().getServerUrl() + "/projects/" + getName(); } @Nullable @@ -500,8 +501,8 @@ public class Project extends AbstractEntity { path = ""; final File cacheDir = new File( - TurboDev.getInstance(StorageManager.class).getProjectInfoDir(getId()), - "last_commits/" + path + "/turbodev_last_commits"); + OneDev.getInstance(StorageManager.class).getProjectInfoDir(getId()), + "last_commits/" + path + "/onedev_last_commits"); final ReadWriteLock lock; try { @@ -688,14 +689,14 @@ public class Project extends AbstractEntity { } Subject subject = SecurityUtils.getSubject(); - TurboDev.getInstance(UnitOfWork.class).doAsync(new Runnable() { + OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() { @Override public void run() { ThreadContext.bind(subject); try { - Project project = TurboDev.getInstance(ProjectManager.class).load(getId()); - TurboDev.getInstance(ListenerRegistry.class).post( + Project project = OneDev.getInstance(ProjectManager.class).load(getId()); + OneDev.getInstance(ListenerRegistry.class).post( new RefUpdated(project, refName, commitId, ObjectId.zeroId())); } finally { ThreadContext.unbindSubject(); @@ -739,14 +740,14 @@ public class Project extends AbstractEntity { throw new RuntimeException(e); } Subject subject = SecurityUtils.getSubject(); - TurboDev.getInstance(UnitOfWork.class).doAsync(new Runnable() { + OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() { @Override public void run() { ThreadContext.bind(subject); try { - Project project = TurboDev.getInstance(ProjectManager.class).load(getId()); - TurboDev.getInstance(ListenerRegistry.class).post( + Project project = OneDev.getInstance(ProjectManager.class).load(getId()); + OneDev.getInstance(ListenerRegistry.class).post( new RefUpdated(project, refName, commitId, ObjectId.zeroId())); } finally { ThreadContext.unbindSubject(); @@ -897,7 +898,7 @@ public class Project extends AbstractEntity { cmd.range(range); List authors = new ArrayList<>(); - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); for (BlameBlock block: cmd.call()) { User author = userManager.find(block.getCommit().getAuthor()); if (author != null && !authors.contains(author)) diff --git a/core/src/main/java/com/turbodev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.java similarity index 94% rename from core/src/main/java/com/turbodev/server/model/PullRequest.java rename to core/src/main/java/io/onedev/server/model/PullRequest.java index bd916c0943..c6ef16a897 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequest.java +++ b/core/src/main/java/io/onedev/server/model/PullRequest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.io.IOException; import java.io.Serializable; @@ -39,23 +39,24 @@ import org.hibernate.criterion.Restrictions; import com.fasterxml.jackson.annotation.JsonView; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.event.pullrequest.PullRequestCodeCommentEvent; -import com.turbodev.server.event.pullrequest.PullRequestVerificationEvent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.model.support.CloseInfo; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.model.support.LastEvent; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.model.support.MergeStrategy; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.QualityCheckStatus; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.jackson.RestView; + +import io.onedev.server.OneDev; +import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent; +import io.onedev.server.event.pullrequest.PullRequestVerificationEvent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.model.support.CloseInfo; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.model.support.LastEvent; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.model.support.MergeStrategy; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.QualityCheckStatus; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.jackson.RestView; @Entity /* @@ -422,7 +423,7 @@ public class PullRequest extends AbstractEntity { public QualityCheckStatus getQualityCheckStatus() { if (qualityStatus == null) - qualityStatus = TurboDev.getInstance(PullRequestManager.class).checkQuality(this); + qualityStatus = OneDev.getInstance(PullRequestManager.class).checkQuality(this); return qualityStatus; } @@ -474,7 +475,7 @@ public class PullRequest extends AbstractEntity { @Nullable public MergePreview getMergePreview() { if (mergePreviewOpt == null) - mergePreviewOpt = Optional.ofNullable(TurboDev.getInstance(PullRequestManager.class).previewMerge(this)); + mergePreviewOpt = Optional.ofNullable(OneDev.getInstance(PullRequestManager.class).previewMerge(this)); return mergePreviewOpt.orElse(null); } @@ -705,7 +706,7 @@ public class PullRequest extends AbstractEntity { public boolean isVisitedAfter(Date date) { User user = SecurityUtils.getUser(); if (user != null) { - Date visitDate = TurboDev.getInstance(VisitManager.class).getPullRequestVisitDate(user, this); + Date visitDate = OneDev.getInstance(VisitManager.class).getPullRequestVisitDate(user, this); return visitDate != null && visitDate.getTime()>date.getTime(); } else { return true; @@ -715,7 +716,7 @@ public class PullRequest extends AbstractEntity { public boolean isCodeCommentsVisitedAfter(Date date) { User user = SecurityUtils.getUser(); if (user != null) { - Date visitDate = TurboDev.getInstance(VisitManager.class).getPullRequestCodeCommentsVisitDate(user, this); + Date visitDate = OneDev.getInstance(VisitManager.class).getPullRequestCodeCommentsVisitDate(user, this); return visitDate != null && visitDate.getTime()>date.getTime(); } else { return true; diff --git a/core/src/main/java/com/turbodev/server/model/PullRequestComment.java b/core/src/main/java/io/onedev/server/model/PullRequestComment.java similarity index 98% rename from core/src/main/java/com/turbodev/server/model/PullRequestComment.java rename to core/src/main/java/io/onedev/server/model/PullRequestComment.java index 31fb22d9b7..342fb0e1b8 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequestComment.java +++ b/core/src/main/java/io/onedev/server/model/PullRequestComment.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/model/PullRequestReference.java b/core/src/main/java/io/onedev/server/model/PullRequestReference.java similarity index 98% rename from core/src/main/java/com/turbodev/server/model/PullRequestReference.java rename to core/src/main/java/io/onedev/server/model/PullRequestReference.java index d5717f2f42..0d4abe8fe5 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequestReference.java +++ b/core/src/main/java/io/onedev/server/model/PullRequestReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/model/PullRequestStatusChange.java b/core/src/main/java/io/onedev/server/model/PullRequestStatusChange.java similarity index 98% rename from core/src/main/java/com/turbodev/server/model/PullRequestStatusChange.java rename to core/src/main/java/io/onedev/server/model/PullRequestStatusChange.java index 4db5e1f7a0..7d2e713c3f 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequestStatusChange.java +++ b/core/src/main/java/io/onedev/server/model/PullRequestStatusChange.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/model/PullRequestTask.java b/core/src/main/java/io/onedev/server/model/PullRequestTask.java similarity index 97% rename from core/src/main/java/com/turbodev/server/model/PullRequestTask.java rename to core/src/main/java/io/onedev/server/model/PullRequestTask.java index 7f8fbed6e3..8c547e5e00 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequestTask.java +++ b/core/src/main/java/io/onedev/server/model/PullRequestTask.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/model/PullRequestUpdate.java b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java similarity index 96% rename from core/src/main/java/com/turbodev/server/model/PullRequestUpdate.java rename to core/src/main/java/io/onedev/server/model/PullRequestUpdate.java index 75f2c2c5a2..00edfd28be 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequestUpdate.java +++ b/core/src/main/java/io/onedev/server/model/PullRequestUpdate.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.io.IOException; import java.util.ArrayList; @@ -29,10 +29,11 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.base.Preconditions; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.FileChange; -import com.turbodev.server.git.command.ListFileChangesCommand; -import com.turbodev.server.manager.impl.DefaultCodeCommentRelationManager; + +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.FileChange; +import io.onedev.server.git.command.ListFileChangesCommand; +import io.onedev.server.manager.impl.DefaultCodeCommentRelationManager; @Entity @Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="uuid"), @Index(columnList="date")}) diff --git a/core/src/main/java/com/turbodev/server/model/PullRequestWatch.java b/core/src/main/java/io/onedev/server/model/PullRequestWatch.java similarity index 97% rename from core/src/main/java/com/turbodev/server/model/PullRequestWatch.java rename to core/src/main/java/io/onedev/server/model/PullRequestWatch.java index 0985ca0be1..cae733ed21 100644 --- a/core/src/main/java/com/turbodev/server/model/PullRequestWatch.java +++ b/core/src/main/java/io/onedev/server/model/PullRequestWatch.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import javax.annotation.Nullable; import javax.persistence.Entity; diff --git a/core/src/main/java/com/turbodev/server/model/Review.java b/core/src/main/java/io/onedev/server/model/Review.java similarity index 96% rename from core/src/main/java/com/turbodev/server/model/Review.java rename to core/src/main/java/io/onedev/server/model/Review.java index 9c7617b7ba..01042f6001 100644 --- a/core/src/main/java/com/turbodev/server/model/Review.java +++ b/core/src/main/java/io/onedev/server/model/Review.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Optional; @@ -13,7 +13,7 @@ import javax.persistence.ManyToOne; import javax.persistence.Table; import javax.persistence.UniqueConstraint; -import com.turbodev.server.model.support.MergePreview; +import io.onedev.server.model.support.MergePreview; @Entity @Table( diff --git a/core/src/main/java/com/turbodev/server/model/ReviewInvitation.java b/core/src/main/java/io/onedev/server/model/ReviewInvitation.java similarity index 97% rename from core/src/main/java/com/turbodev/server/model/ReviewInvitation.java rename to core/src/main/java/io/onedev/server/model/ReviewInvitation.java index 02df83eba8..662a0647e5 100644 --- a/core/src/main/java/com/turbodev/server/model/ReviewInvitation.java +++ b/core/src/main/java/io/onedev/server/model/ReviewInvitation.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/model/User.java b/core/src/main/java/io/onedev/server/model/User.java similarity index 94% rename from core/src/main/java/com/turbodev/server/model/User.java rename to core/src/main/java/io/onedev/server/model/User.java index 86ba989fec..15f904536a 100644 --- a/core/src/main/java/com/turbodev/server/model/User.java +++ b/core/src/main/java/io/onedev/server/model/User.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; import java.util.ArrayList; import java.util.Collection; @@ -26,14 +26,15 @@ import org.hibernate.validator.constraints.Email; import org.hibernate.validator.constraints.NotEmpty; import com.fasterxml.jackson.annotation.JsonView; -import com.turbodev.launcher.loader.AppLoader; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Password; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.util.jackson.DefaultView; -import com.turbodev.server.util.validation.annotation.UserName; + +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Password; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.util.jackson.DefaultView; +import io.onedev.server.util.validation.annotation.UserName; @Entity @Table(indexes={@Index(columnList="email"), @Index(columnList="fullName")}) diff --git a/core/src/main/java/com/turbodev/server/model/UserAuthorization.java b/core/src/main/java/io/onedev/server/model/UserAuthorization.java similarity index 89% rename from core/src/main/java/com/turbodev/server/model/UserAuthorization.java rename to core/src/main/java/io/onedev/server/model/UserAuthorization.java index 47a5fa70b4..06788db11f 100644 --- a/core/src/main/java/com/turbodev/server/model/UserAuthorization.java +++ b/core/src/main/java/io/onedev/server/model/UserAuthorization.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model; +package io.onedev.server.model; 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.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.util.facade.UserAuthorizationFacade; @Entity @Table( diff --git a/core/src/main/java/com/turbodev/server/model/support/BranchProtection.java b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java similarity index 91% rename from core/src/main/java/com/turbodev/server/model/support/BranchProtection.java rename to core/src/main/java/io/onedev/server/model/support/BranchProtection.java index 6b729dbb43..c46b255427 100644 --- a/core/src/main/java/com/turbodev/server/model/support/BranchProtection.java +++ b/core/src/main/java/io/onedev/server/model/support/BranchProtection.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; import java.util.ArrayList; @@ -12,18 +12,18 @@ import javax.validation.constraints.NotNull; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.submitter.Anyone; -import com.turbodev.server.model.support.submitter.SpecifiedGroup; -import com.turbodev.server.model.support.submitter.SpecifiedUser; -import com.turbodev.server.model.support.submitter.Submitter; -import com.turbodev.server.util.editable.annotation.BranchPattern; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.ReviewRequirementSpec; -import com.turbodev.server.util.editable.annotation.VerificationChoice; -import com.turbodev.server.util.reviewrequirement.ReviewRequirement; -import com.turbodev.utils.PathUtils; +import io.onedev.server.model.Group; +import io.onedev.server.model.User; +import io.onedev.server.model.support.submitter.Anyone; +import io.onedev.server.model.support.submitter.SpecifiedGroup; +import io.onedev.server.model.support.submitter.SpecifiedUser; +import io.onedev.server.model.support.submitter.Submitter; +import io.onedev.server.util.editable.annotation.BranchPattern; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.ReviewRequirementSpec; +import io.onedev.server.util.editable.annotation.VerificationChoice; +import io.onedev.server.util.reviewrequirement.ReviewRequirement; +import io.onedev.utils.PathUtils; @Editable public class BranchProtection implements Serializable { @@ -111,7 +111,7 @@ public class BranchProtection implements Serializable { } @Editable(order=400, name="Required Reviewers", description="Optionally specify required reviewers for changes of " - + "specified branch. TurboDev assumes that the user submitting the change has completed the review already") + + "specified branch. OneDev assumes that the user submitting the change has completed the review already") @ReviewRequirementSpec public String getReviewRequirementSpec() { return reviewRequirementSpec; diff --git a/core/src/main/java/com/turbodev/server/model/support/CloseInfo.java b/core/src/main/java/io/onedev/server/model/support/CloseInfo.java similarity index 93% rename from core/src/main/java/com/turbodev/server/model/support/CloseInfo.java rename to core/src/main/java/io/onedev/server/model/support/CloseInfo.java index 5bf4021d04..019e90d535 100644 --- a/core/src/main/java/com/turbodev/server/model/support/CloseInfo.java +++ b/core/src/main/java/io/onedev/server/model/support/CloseInfo.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; import java.util.Date; @@ -9,7 +9,7 @@ import javax.persistence.ManyToOne; import org.hibernate.annotations.OptimisticLock; -import com.turbodev.server.model.User; +import io.onedev.server.model.User; @Embeddable public class CloseInfo implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/CommitMessageTransformSetting.java b/core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java similarity index 91% rename from core/src/main/java/com/turbodev/server/model/support/CommitMessageTransformSetting.java rename to core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java index e00a03ab3e..9ebc45256d 100644 --- a/core/src/main/java/com/turbodev/server/model/support/CommitMessageTransformSetting.java +++ b/core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java @@ -1,10 +1,10 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable public class CommitMessageTransformSetting implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/CompareContext.java b/core/src/main/java/io/onedev/server/model/support/CompareContext.java similarity index 95% rename from core/src/main/java/com/turbodev/server/model/support/CompareContext.java rename to core/src/main/java/io/onedev/server/model/support/CompareContext.java index 890392e87c..eed8387ad1 100644 --- a/core/src/main/java/com/turbodev/server/model/support/CompareContext.java +++ b/core/src/main/java/io/onedev/server/model/support/CompareContext.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.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.turbodev.server.util.diff.WhitespaceOption; +import io.onedev.server.util.diff.WhitespaceOption; @Embeddable public class CompareContext implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/FileProtection.java b/core/src/main/java/io/onedev/server/model/support/FileProtection.java similarity index 79% rename from core/src/main/java/com/turbodev/server/model/support/FileProtection.java rename to core/src/main/java/io/onedev/server/model/support/FileProtection.java index 6fca51db04..c0285f7060 100644 --- a/core/src/main/java/com/turbodev/server/model/support/FileProtection.java +++ b/core/src/main/java/io/onedev/server/model/support/FileProtection.java @@ -1,13 +1,13 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.PathPattern; -import com.turbodev.server.util.editable.annotation.ReviewRequirementSpec; -import com.turbodev.server.util.reviewrequirement.ReviewRequirement; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.PathPattern; +import io.onedev.server.util.editable.annotation.ReviewRequirementSpec; +import io.onedev.server.util.reviewrequirement.ReviewRequirement; @Editable public class FileProtection implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/LastEvent.java b/core/src/main/java/io/onedev/server/model/support/LastEvent.java similarity index 93% rename from core/src/main/java/com/turbodev/server/model/support/LastEvent.java rename to core/src/main/java/io/onedev/server/model/support/LastEvent.java index 8a8ce807a7..9b1e762d90 100644 --- a/core/src/main/java/com/turbodev/server/model/support/LastEvent.java +++ b/core/src/main/java/io/onedev/server/model/support/LastEvent.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; import java.util.Date; @@ -10,7 +10,7 @@ import javax.persistence.FetchType; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; -import com.turbodev.server.model.User; +import io.onedev.server.model.User; @Embeddable public class LastEvent implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/MarkPos.java b/core/src/main/java/io/onedev/server/model/support/MarkPos.java similarity index 98% rename from core/src/main/java/com/turbodev/server/model/support/MarkPos.java rename to core/src/main/java/io/onedev/server/model/support/MarkPos.java index 806b7c7da2..aa9604cf9c 100644 --- a/core/src/main/java/com/turbodev/server/model/support/MarkPos.java +++ b/core/src/main/java/io/onedev/server/model/support/MarkPos.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/model/support/MergePreview.java b/core/src/main/java/io/onedev/server/model/support/MergePreview.java similarity index 95% rename from core/src/main/java/com/turbodev/server/model/support/MergePreview.java rename to core/src/main/java/io/onedev/server/model/support/MergePreview.java index 795a7bb1dd..e9acb76f8d 100644 --- a/core/src/main/java/com/turbodev/server/model/support/MergePreview.java +++ b/core/src/main/java/io/onedev/server/model/support/MergePreview.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; @@ -8,7 +8,7 @@ import javax.persistence.Embeddable; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.model.PullRequest; +import io.onedev.server.model.PullRequest; @SuppressWarnings("serial") @Embeddable diff --git a/core/src/main/java/com/turbodev/server/model/support/MergeStrategy.java b/core/src/main/java/io/onedev/server/model/support/MergeStrategy.java similarity index 95% rename from core/src/main/java/com/turbodev/server/model/support/MergeStrategy.java rename to core/src/main/java/io/onedev/server/model/support/MergeStrategy.java index b473066195..693ca1af74 100644 --- a/core/src/main/java/com/turbodev/server/model/support/MergeStrategy.java +++ b/core/src/main/java/io/onedev/server/model/support/MergeStrategy.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; public enum MergeStrategy { ALWAYS_MERGE("Create Merge Commit", diff --git a/core/src/main/java/com/turbodev/server/model/support/ProjectAndBranch.java b/core/src/main/java/io/onedev/server/model/support/ProjectAndBranch.java similarity index 81% rename from core/src/main/java/com/turbodev/server/model/support/ProjectAndBranch.java rename to core/src/main/java/io/onedev/server/model/support/ProjectAndBranch.java index 2511550a71..bede1eac64 100644 --- a/core/src/main/java/com/turbodev/server/model/support/ProjectAndBranch.java +++ b/core/src/main/java/io/onedev/server/model/support/ProjectAndBranch.java @@ -1,7 +1,7 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.Project; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.Project; public class ProjectAndBranch extends ProjectAndRevision { diff --git a/core/src/main/java/com/turbodev/server/model/support/ProjectAndRevision.java b/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java similarity index 91% rename from core/src/main/java/com/turbodev/server/model/support/ProjectAndRevision.java rename to core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java index 27265522c5..25f39a2ac5 100644 --- a/core/src/main/java/com/turbodev/server/model/support/ProjectAndRevision.java +++ b/core/src/main/java/io/onedev/server/model/support/ProjectAndRevision.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.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.turbodev.server.TurboDev; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; +import io.onedev.server.OneDev; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; public class ProjectAndRevision implements Serializable { @@ -106,7 +106,7 @@ public class ProjectAndRevision implements Serializable { } public Project getProject() { - return TurboDev.getInstance(ProjectManager.class).load(projectId); + return OneDev.getInstance(ProjectManager.class).load(projectId); } protected String normalizeRevision() { diff --git a/core/src/main/java/com/turbodev/server/model/support/TagProtection.java b/core/src/main/java/io/onedev/server/model/support/TagProtection.java similarity index 87% rename from core/src/main/java/com/turbodev/server/model/support/TagProtection.java rename to core/src/main/java/io/onedev/server/model/support/TagProtection.java index 34fdf54b47..c13dcb2e37 100644 --- a/core/src/main/java/com/turbodev/server/model/support/TagProtection.java +++ b/core/src/main/java/io/onedev/server/model/support/TagProtection.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.support; import java.io.Serializable; @@ -6,12 +6,12 @@ import javax.validation.constraints.NotNull; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.model.support.submitter.Anyone; -import com.turbodev.server.model.support.submitter.SpecifiedGroup; -import com.turbodev.server.model.support.submitter.SpecifiedUser; -import com.turbodev.server.model.support.submitter.Submitter; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.TagPattern; +import io.onedev.server.model.support.submitter.Anyone; +import io.onedev.server.model.support.submitter.SpecifiedGroup; +import io.onedev.server.model.support.submitter.SpecifiedUser; +import io.onedev.server.model.support.submitter.Submitter; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.TagPattern; @Editable public class TagProtection implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/TextRange.java b/core/src/main/java/io/onedev/server/model/support/TextRange.java similarity index 96% rename from core/src/main/java/com/turbodev/server/model/support/TextRange.java rename to core/src/main/java/io/onedev/server/model/support/TextRange.java index 785c04b75e..3267674528 100644 --- a/core/src/main/java/com/turbodev/server/model/support/TextRange.java +++ b/core/src/main/java/io/onedev/server/model/support/TextRange.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support; +package io.onedev.server.model.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.turbodev.jsymbol.TokenPosition; +import io.onedev.jsymbol.TokenPosition; public class TextRange implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/setting/BackupSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java similarity index 85% rename from core/src/main/java/com/turbodev/server/model/support/setting/BackupSetting.java rename to core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java index ee99f6f7e6..3b7b71454b 100644 --- a/core/src/main/java/com/turbodev/server/model/support/setting/BackupSetting.java +++ b/core/src/main/java/io/onedev/server/model/support/setting/BackupSetting.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support.setting; +package io.onedev.server.model.support.setting; import java.io.Serializable; import java.text.ParseException; @@ -8,10 +8,10 @@ import javax.validation.ConstraintValidatorContext; import org.hibernate.validator.constraints.NotEmpty; import org.quartz.CronExpression; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.validation.Validatable; -import com.turbodev.server.util.validation.annotation.ClassValidating; -import com.turbodev.server.util.validation.annotation.Directory; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.validation.Validatable; +import io.onedev.server.util.validation.annotation.ClassValidating; +import io.onedev.server.util.validation.annotation.Directory; @Editable @ClassValidating @@ -28,7 +28,7 @@ public class BackupSetting implements Serializable, Validatable { "<seconds> <minutes> <hours> <day-of-month> <month> <day-of-week>." + "For example, 0 0 1 * * ? means 1:00am every day. For details of the format, refer " + "to Quartz tutorial." + - "The backup files will be placed into backup folder under TurboDev " + + "The backup files will be placed into backup folder under OneDev " + "installation directory. Leave this property empty if you do not want to enable database " + "auto backup.") @NotEmpty @@ -42,7 +42,7 @@ public class BackupSetting implements Serializable, Validatable { @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 TurboDev.") + "will be considered to be relative to installation directory of OneDev.") @Directory(absolute=true, outsideOfInstallDir=true, writeable=true) @NotEmpty public String getFolder() { diff --git a/core/src/main/java/com/turbodev/server/model/support/setting/MailSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java similarity index 83% rename from core/src/main/java/com/turbodev/server/model/support/setting/MailSetting.java rename to core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java index 0ba03ceab2..5b093aace8 100644 --- a/core/src/main/java/com/turbodev/server/model/support/setting/MailSetting.java +++ b/core/src/main/java/io/onedev/server/model/support/setting/MailSetting.java @@ -1,11 +1,11 @@ -package com.turbodev.server.model.support.setting; +package io.onedev.server.model.support.setting; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Password; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Password; @Editable public class MailSetting implements Serializable { @@ -27,7 +27,7 @@ public class MailSetting implements Serializable { private int timeout = 60; @Editable(order=100, name="SMTP Host", description= - "Specify the SMTP mail host used by TurboDev to send email." + "Specify the SMTP mail host used by OneDev to send email." ) @NotEmpty public String getSmtpHost() { @@ -83,10 +83,10 @@ public class MailSetting implements Serializable { } @Editable(order=500, description= - "This property is optional. If specified, TurboDev will use this email " + + "This property is optional. If specified, OneDev will use this email " + "as the sender address when sending out emails. Otherwise, the sender " + - "address will be turbodev@<hostname>, where <hostname> " + - "is the host name of TurboDev server." + "address will be onedev@<hostname>, where <hostname> " + + "is the host name of OneDev server." ) public String getSenderAddress() { return senderAddress; diff --git a/core/src/main/java/com/turbodev/server/model/support/setting/SecuritySetting.java b/core/src/main/java/io/onedev/server/model/support/setting/SecuritySetting.java similarity index 88% rename from core/src/main/java/com/turbodev/server/model/support/setting/SecuritySetting.java rename to core/src/main/java/io/onedev/server/model/support/setting/SecuritySetting.java index 7353a2c77b..3c43754f31 100644 --- a/core/src/main/java/com/turbodev/server/model/support/setting/SecuritySetting.java +++ b/core/src/main/java/io/onedev/server/model/support/setting/SecuritySetting.java @@ -1,8 +1,8 @@ -package com.turbodev.server.model.support.setting; +package io.onedev.server.model.support.setting; import java.io.Serializable; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable public class SecuritySetting implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/model/support/setting/SystemSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java similarity index 70% rename from core/src/main/java/com/turbodev/server/model/support/setting/SystemSetting.java rename to core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java index 1affd5dc06..de1895578f 100644 --- a/core/src/main/java/com/turbodev/server/model/support/setting/SystemSetting.java +++ b/core/src/main/java/io/onedev/server/model/support/setting/SystemSetting.java @@ -1,4 +1,4 @@ -package com.turbodev.server.model.support.setting; +package io.onedev.server.model.support.setting; import java.io.Serializable; @@ -9,14 +9,14 @@ import javax.validation.constraints.NotNull; import org.apache.commons.lang3.StringUtils; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.git.config.CurlConfig; -import com.turbodev.server.git.config.GitConfig; -import com.turbodev.server.git.config.SystemCurl; -import com.turbodev.server.git.config.SystemGit; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.validation.Validatable; -import com.turbodev.server.util.validation.annotation.ClassValidating; -import com.turbodev.server.util.validation.annotation.Directory; +import io.onedev.server.git.config.CurlConfig; +import io.onedev.server.git.config.GitConfig; +import io.onedev.server.git.config.SystemCurl; +import io.onedev.server.git.config.SystemGit; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.validation.Validatable; +import io.onedev.server.util.validation.annotation.ClassValidating; +import io.onedev.server.util.validation.annotation.Directory; @Editable @ClassValidating @@ -34,7 +34,7 @@ public class SystemSetting implements Serializable, Validatable { private boolean gravatarEnabled = true; - @Editable(name="Server URL", order=90, description="Specify root URL to access this server. TurboDev uses this url " + @Editable(name="Server URL", order=90, description="Specify root URL to access this server. OneDev uses this url " + "to construct various links in notification email.") @NotEmpty public String getServerUrl() { @@ -45,7 +45,7 @@ public class SystemSetting implements Serializable, Validatable { this.serverUrl = serverUrl; } - @Editable(name="Storage Directory", order=100, description="Specify directory to store TurboDev data such as Git projects.") + @Editable(name="Storage Directory", order=100, description="Specify directory to store OneDev data such as Git projects.") @Directory(absolute=true, outsideOfInstallDir=true, writeable=true) @NotEmpty public String getStoragePath() { @@ -56,7 +56,7 @@ public class SystemSetting implements Serializable, Validatable { this.storagePath = storagePath; } - @Editable(order=200, description="TurboDev requires git command line to manage repositories. The minimum " + @Editable(order=200, description="OneDev requires git command line to manage repositories. The minimum " + "required version is 1.8.0.") @Valid @NotNull @@ -68,7 +68,7 @@ public class SystemSetting implements Serializable, Validatable { this.gitConfig = gitConfig; } - @Editable(order=250, description="TurboDev configures git hooks to communicate with itself via curl") + @Editable(order=250, description="OneDev configures git hooks to communicate with itself via curl") @Valid @NotNull public CurlConfig getCurlConfig() { diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/Anyone.java b/core/src/main/java/io/onedev/server/model/support/submitter/Anyone.java similarity index 52% rename from core/src/main/java/com/turbodev/server/model/support/submitter/Anyone.java rename to core/src/main/java/io/onedev/server/model/support/submitter/Anyone.java index c81a95ad08..891d82b66d 100644 --- a/core/src/main/java/com/turbodev/server/model/support/submitter/Anyone.java +++ b/core/src/main/java/io/onedev/server/model/support/submitter/Anyone.java @@ -1,8 +1,8 @@ -package com.turbodev.server.model.support.submitter; +package io.onedev.server.model.support.submitter; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; @Editable(order=100, name="Anyone") public class Anyone implements Submitter { diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/model/support/submitter/ProjectAdministrators.java similarity index 51% rename from core/src/main/java/com/turbodev/server/model/support/submitter/ProjectAdministrators.java rename to core/src/main/java/io/onedev/server/model/support/submitter/ProjectAdministrators.java index 9c61ac1ad6..19dffcb9ed 100644 --- a/core/src/main/java/com/turbodev/server/model/support/submitter/ProjectAdministrators.java +++ b/core/src/main/java/io/onedev/server/model/support/submitter/ProjectAdministrators.java @@ -1,10 +1,10 @@ -package com.turbodev.server.model.support.submitter; +package io.onedev.server.model.support.submitter; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.permission.ProjectPermission; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.permission.ProjectPermission; +import io.onedev.server.util.editable.annotation.Editable; @Editable(order=400, name="Project administrators") public class ProjectAdministrators implements Submitter { diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/submitter/SpecifiedGroup.java similarity index 58% rename from core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedGroup.java rename to core/src/main/java/io/onedev/server/model/support/submitter/SpecifiedGroup.java index fea3ecba5f..6640a2890a 100644 --- a/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedGroup.java +++ b/core/src/main/java/io/onedev/server/model/support/submitter/SpecifiedGroup.java @@ -1,15 +1,16 @@ -package com.turbodev.server.model.support.submitter; +package io.onedev.server.model.support.submitter; import org.hibernate.validator.constraints.NotEmpty; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.GroupChoice; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.GroupChoice; @Editable(order=300, name="Specified group") public class SpecifiedGroup implements Submitter { @@ -31,7 +32,7 @@ public class SpecifiedGroup implements Submitter { @Override public boolean matches(Project project, User user) { - GroupManager groupManager = TurboDev.getInstance(GroupManager.class); + GroupManager groupManager = OneDev.getInstance(GroupManager.class); Group group = Preconditions.checkNotNull(groupManager.find(groupName)); return group.getMembers().contains(user); } diff --git a/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedUser.java b/core/src/main/java/io/onedev/server/model/support/submitter/SpecifiedUser.java similarity index 60% rename from core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedUser.java rename to core/src/main/java/io/onedev/server/model/support/submitter/SpecifiedUser.java index 33f5f548e8..3718cdad7e 100644 --- a/core/src/main/java/com/turbodev/server/model/support/submitter/SpecifiedUser.java +++ b/core/src/main/java/io/onedev/server/model/support/submitter/SpecifiedUser.java @@ -1,14 +1,15 @@ -package com.turbodev.server.model.support.submitter; +package io.onedev.server.model.support.submitter; import org.hibernate.validator.constraints.NotEmpty; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.UserChoice; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.UserChoice; @Editable(order=200, name="Specified user") public class SpecifiedUser implements Submitter { @@ -30,7 +31,7 @@ public class SpecifiedUser implements Submitter { @Override public boolean matches(Project project, User user) { - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); User specifiedUser = Preconditions.checkNotNull(userManager.findByName(userName)); return specifiedUser.equals(user); } diff --git a/core/src/main/java/io/onedev/server/model/support/submitter/Submitter.java b/core/src/main/java/io/onedev/server/model/support/submitter/Submitter.java new file mode 100644 index 0000000000..d2839f1cd5 --- /dev/null +++ b/core/src/main/java/io/onedev/server/model/support/submitter/Submitter.java @@ -0,0 +1,16 @@ +package io.onedev.server.model.support.submitter; + +import java.io.Serializable; + +import javax.annotation.Nullable; + +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; + +@Editable +public interface Submitter extends Serializable { + + boolean matches(Project project, @Nullable User user); + +} diff --git a/core/src/main/java/com/turbodev/server/persistence/DefaultIdManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java similarity index 91% rename from core/src/main/java/com/turbodev/server/persistence/DefaultIdManager.java rename to core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java index 9320754f11..a2c262f0c1 100644 --- a/core/src/main/java/com/turbodev/server/persistence/DefaultIdManager.java +++ b/core/src/main/java/io/onedev/server/persistence/DefaultIdManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.util.HashMap; import java.util.Map; @@ -12,8 +12,8 @@ import javax.persistence.criteria.CriteriaQuery; import javax.persistence.criteria.Root; import javax.persistence.metamodel.EntityType; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.Dao; @Singleton public class DefaultIdManager implements IdManager { diff --git a/core/src/main/java/com/turbodev/server/persistence/DefaultPersistManager.java b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java similarity index 97% rename from core/src/main/java/com/turbodev/server/persistence/DefaultPersistManager.java rename to core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java index b4ec95e62a..888bc56712 100644 --- a/core/src/main/java/com/turbodev/server/persistence/DefaultPersistManager.java +++ b/core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.io.File; import java.io.FilenameFilter; @@ -41,21 +41,22 @@ import org.hibernate.tool.schema.TargetType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.BeanUtils; -import com.turbodev.utils.ClassUtils; -import com.turbodev.utils.FileUtils; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.turbodev.server.migration.DatabaseMigrator; -import com.turbodev.server.migration.MigrationHelper; -import com.turbodev.server.migration.VersionedDocument; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.model.ModelVersion; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.validation.EntityValidator; + +import io.onedev.server.migration.DatabaseMigrator; +import io.onedev.server.migration.MigrationHelper; +import io.onedev.server.migration.VersionedDocument; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.model.ModelVersion; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.validation.EntityValidator; +import io.onedev.utils.BeanUtils; +import io.onedev.utils.ClassUtils; +import io.onedev.utils.FileUtils; @Singleton public class DefaultPersistManager implements PersistManager { diff --git a/core/src/main/java/com/turbodev/server/persistence/DefaultUnitOfWork.java b/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java similarity index 97% rename from core/src/main/java/com/turbodev/server/persistence/DefaultUnitOfWork.java rename to core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java index c613fa3ba1..158c621d6d 100644 --- a/core/src/main/java/com/turbodev/server/persistence/DefaultUnitOfWork.java +++ b/core/src/main/java/io/onedev/server/persistence/DefaultUnitOfWork.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -8,11 +8,12 @@ import org.hibernate.Session; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.ObjectReference; import com.google.common.base.Throwables; import com.google.inject.Inject; import com.google.inject.Singleton; +import io.onedev.utils.ObjectReference; + @Singleton public class DefaultUnitOfWork implements UnitOfWork { diff --git a/core/src/main/java/com/turbodev/server/persistence/HibernateInterceptor.java b/core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.java similarity index 97% rename from core/src/main/java/com/turbodev/server/persistence/HibernateInterceptor.java rename to core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.java index 8b2b2150d9..fb7de6200d 100644 --- a/core/src/main/java/com/turbodev/server/persistence/HibernateInterceptor.java +++ b/core/src/main/java/io/onedev/server/persistence/HibernateInterceptor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.io.Serializable; import java.util.Set; diff --git a/core/src/main/java/com/turbodev/server/persistence/HibernateProperties.java b/core/src/main/java/io/onedev/server/persistence/HibernateProperties.java similarity index 94% rename from core/src/main/java/com/turbodev/server/persistence/HibernateProperties.java rename to core/src/main/java/io/onedev/server/persistence/HibernateProperties.java index a8615b50c9..d1885e8494 100644 --- a/core/src/main/java/com/turbodev/server/persistence/HibernateProperties.java +++ b/core/src/main/java/io/onedev/server/persistence/HibernateProperties.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.util.Map; import java.util.Properties; diff --git a/core/src/main/java/com/turbodev/server/persistence/IdGenerator.java b/core/src/main/java/io/onedev/server/persistence/IdGenerator.java similarity index 89% rename from core/src/main/java/com/turbodev/server/persistence/IdGenerator.java rename to core/src/main/java/io/onedev/server/persistence/IdGenerator.java index a4604abebb..1525f1531a 100644 --- a/core/src/main/java/com/turbodev/server/persistence/IdGenerator.java +++ b/core/src/main/java/io/onedev/server/persistence/IdGenerator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.io.Serializable; import java.util.Properties; @@ -11,7 +11,7 @@ import org.hibernate.id.IdentifierGenerator; import org.hibernate.service.ServiceRegistry; import org.hibernate.type.Type; -import com.turbodev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoader; public class IdGenerator implements IdentifierGenerator, Configurable { diff --git a/core/src/main/java/com/turbodev/server/persistence/IdManager.java b/core/src/main/java/io/onedev/server/persistence/IdManager.java similarity index 75% rename from core/src/main/java/com/turbodev/server/persistence/IdManager.java rename to core/src/main/java/io/onedev/server/persistence/IdManager.java index 2b56ad41cb..c3ffb1839b 100644 --- a/core/src/main/java/com/turbodev/server/persistence/IdManager.java +++ b/core/src/main/java/io/onedev/server/persistence/IdManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; public interface IdManager { diff --git a/core/src/main/java/com/turbodev/server/persistence/PersistListener.java b/core/src/main/java/io/onedev/server/persistence/PersistListener.java similarity index 94% rename from core/src/main/java/com/turbodev/server/persistence/PersistListener.java rename to core/src/main/java/io/onedev/server/persistence/PersistListener.java index 40cb3f05f8..16edf19827 100644 --- a/core/src/main/java/com/turbodev/server/persistence/PersistListener.java +++ b/core/src/main/java/io/onedev/server/persistence/PersistListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/persistence/PersistManager.java b/core/src/main/java/io/onedev/server/persistence/PersistManager.java similarity index 92% rename from core/src/main/java/com/turbodev/server/persistence/PersistManager.java rename to core/src/main/java/io/onedev/server/persistence/PersistManager.java index 2f12b7f8b2..eb30f5d1bf 100644 --- a/core/src/main/java/com/turbodev/server/persistence/PersistManager.java +++ b/core/src/main/java/io/onedev/server/persistence/PersistManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.io.File; diff --git a/core/src/main/java/com/turbodev/server/persistence/PrefixedNamingStrategy.java b/core/src/main/java/io/onedev/server/persistence/PrefixedNamingStrategy.java similarity index 95% rename from core/src/main/java/com/turbodev/server/persistence/PrefixedNamingStrategy.java rename to core/src/main/java/io/onedev/server/persistence/PrefixedNamingStrategy.java index 83d7bbff53..cfe8248831 100644 --- a/core/src/main/java/com/turbodev/server/persistence/PrefixedNamingStrategy.java +++ b/core/src/main/java/io/onedev/server/persistence/PrefixedNamingStrategy.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import org.hibernate.boot.model.naming.Identifier; import org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl; diff --git a/core/src/main/java/com/turbodev/server/persistence/SessionFactoryProvider.java b/core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.java similarity index 92% rename from core/src/main/java/com/turbodev/server/persistence/SessionFactoryProvider.java rename to core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.java index 27cd6a3f7a..e538aa17ec 100644 --- a/core/src/main/java/com/turbodev/server/persistence/SessionFactoryProvider.java +++ b/core/src/main/java/io/onedev/server/persistence/SessionFactoryProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import javax.inject.Inject; import javax.inject.Provider; diff --git a/core/src/main/java/com/turbodev/server/persistence/SessionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java similarity index 93% rename from core/src/main/java/com/turbodev/server/persistence/SessionInterceptor.java rename to core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java index c38c67230b..be7068cba4 100644 --- a/core/src/main/java/com/turbodev/server/persistence/SessionInterceptor.java +++ b/core/src/main/java/io/onedev/server/persistence/SessionInterceptor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/main/java/com/turbodev/server/persistence/SessionProvider.java b/core/src/main/java/io/onedev/server/persistence/SessionProvider.java similarity index 90% rename from core/src/main/java/com/turbodev/server/persistence/SessionProvider.java rename to core/src/main/java/io/onedev/server/persistence/SessionProvider.java index 991b57ac57..b288627928 100644 --- a/core/src/main/java/com/turbodev/server/persistence/SessionProvider.java +++ b/core/src/main/java/io/onedev/server/persistence/SessionProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import javax.inject.Inject; import javax.inject.Provider; diff --git a/core/src/main/java/com/turbodev/server/persistence/TransactionInterceptor.java b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java similarity index 96% rename from core/src/main/java/com/turbodev/server/persistence/TransactionInterceptor.java rename to core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java index c27931ef48..7965975b69 100644 --- a/core/src/main/java/com/turbodev/server/persistence/TransactionInterceptor.java +++ b/core/src/main/java/io/onedev/server/persistence/TransactionInterceptor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/core/src/main/java/com/turbodev/server/persistence/UnitOfWork.java b/core/src/main/java/io/onedev/server/persistence/UnitOfWork.java similarity index 95% rename from core/src/main/java/com/turbodev/server/persistence/UnitOfWork.java rename to core/src/main/java/io/onedev/server/persistence/UnitOfWork.java index 06cf1ed685..c0c80726f9 100644 --- a/core/src/main/java/com/turbodev/server/persistence/UnitOfWork.java +++ b/core/src/main/java/io/onedev/server/persistence/UnitOfWork.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.turbodev.server.persistence; +package io.onedev.server.persistence; import java.util.concurrent.Callable; diff --git a/core/src/main/java/com/turbodev/server/persistence/annotation/Sessional.java b/core/src/main/java/io/onedev/server/persistence/annotation/Sessional.java similarity index 83% rename from core/src/main/java/com/turbodev/server/persistence/annotation/Sessional.java rename to core/src/main/java/io/onedev/server/persistence/annotation/Sessional.java index b63fa88b57..abb28f42b5 100644 --- a/core/src/main/java/com/turbodev/server/persistence/annotation/Sessional.java +++ b/core/src/main/java/io/onedev/server/persistence/annotation/Sessional.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence.annotation; +package io.onedev.server.persistence.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; diff --git a/core/src/main/java/com/turbodev/server/persistence/annotation/Transactional.java b/core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java similarity index 94% rename from core/src/main/java/com/turbodev/server/persistence/annotation/Transactional.java rename to core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java index 34d869d18c..34a091723b 100644 --- a/core/src/main/java/com/turbodev/server/persistence/annotation/Transactional.java +++ b/core/src/main/java/io/onedev/server/persistence/annotation/Transactional.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.turbodev.server.persistence.annotation; +package io.onedev.server.persistence.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/AbstractEntityManager.java b/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java similarity index 92% rename from core/src/main/java/com/turbodev/server/persistence/dao/AbstractEntityManager.java rename to core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java index 54c5a0353b..819db5e6fd 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/AbstractEntityManager.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/AbstractEntityManager.java @@ -1,11 +1,11 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; import java.util.List; import org.hibernate.Session; -import com.turbodev.utils.ReflectionUtils; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; +import io.onedev.utils.ReflectionUtils; public abstract class AbstractEntityManager implements EntityManager { diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/Dao.java b/core/src/main/java/io/onedev/server/persistence/dao/Dao.java similarity index 97% rename from core/src/main/java/com/turbodev/server/persistence/dao/Dao.java rename to core/src/main/java/io/onedev/server/persistence/dao/Dao.java index 20857d3e4e..c6517e30f6 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/Dao.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/Dao.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; import java.util.List; @@ -6,7 +6,7 @@ import org.hibernate.HibernateException; import org.hibernate.Session; import org.hibernate.criterion.DetachedCriteria; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; public interface Dao { diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/DefaultDao.java b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java similarity index 89% rename from core/src/main/java/com/turbodev/server/persistence/dao/DefaultDao.java rename to core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java index f3cfb91bf7..cdb759a54b 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/DefaultDao.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/DefaultDao.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; import java.io.ObjectStreamException; import java.io.Serializable; @@ -13,13 +13,13 @@ import org.hibernate.Criteria; import org.hibernate.Session; import org.hibernate.criterion.Projections; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.launcher.loader.ManagedSerializedForm; -import com.turbodev.utils.ClassUtils; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.launcher.loader.ManagedSerializedForm; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.utils.ClassUtils; @Singleton @SuppressWarnings("unchecked") diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/EntityCriteria.java b/core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java similarity index 98% rename from core/src/main/java/com/turbodev/server/persistence/dao/EntityCriteria.java rename to core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java index 124722e8e4..07d78c755c 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/EntityCriteria.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/EntityCriteria.java @@ -1,4 +1,4 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; import java.io.Serializable; @@ -17,7 +17,7 @@ import org.hibernate.internal.CriteriaImpl; import org.hibernate.sql.JoinType; import org.hibernate.transform.ResultTransformer; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; @SuppressWarnings("serial") public class EntityCriteria implements CriteriaSpecification, Serializable { diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/EntityManager.java b/core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java similarity index 96% rename from core/src/main/java/com/turbodev/server/persistence/dao/EntityManager.java rename to core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java index cc5e0e9144..cde46b5971 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/EntityManager.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/EntityManager.java @@ -1,11 +1,11 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; import java.util.List; import org.hibernate.HibernateException; import org.hibernate.criterion.DetachedCriteria; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; public interface EntityManager { diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/EntityPersisted.java b/core/src/main/java/io/onedev/server/persistence/dao/EntityPersisted.java similarity index 77% rename from core/src/main/java/com/turbodev/server/persistence/dao/EntityPersisted.java rename to core/src/main/java/io/onedev/server/persistence/dao/EntityPersisted.java index 79180fef21..80b585a881 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/EntityPersisted.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/EntityPersisted.java @@ -1,6 +1,6 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; public class EntityPersisted { diff --git a/core/src/main/java/com/turbodev/server/persistence/dao/EntityRemoved.java b/core/src/main/java/io/onedev/server/persistence/dao/EntityRemoved.java similarity index 68% rename from core/src/main/java/com/turbodev/server/persistence/dao/EntityRemoved.java rename to core/src/main/java/io/onedev/server/persistence/dao/EntityRemoved.java index dbb526fb8b..203940721f 100644 --- a/core/src/main/java/com/turbodev/server/persistence/dao/EntityRemoved.java +++ b/core/src/main/java/io/onedev/server/persistence/dao/EntityRemoved.java @@ -1,6 +1,6 @@ -package com.turbodev.server.persistence.dao; +package io.onedev.server.persistence.dao; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; public class EntityRemoved { diff --git a/core/src/main/java/com/turbodev/server/security/BasicAuthenticationFilter.java b/core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java similarity index 96% rename from core/src/main/java/com/turbodev/server/security/BasicAuthenticationFilter.java rename to core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java index 64252e0136..c533b5441c 100644 --- a/core/src/main/java/com/turbodev/server/security/BasicAuthenticationFilter.java +++ b/core/src/main/java/io/onedev/server/security/BasicAuthenticationFilter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import java.io.IOException; import java.util.Locale; @@ -22,9 +22,9 @@ import org.apache.shiro.subject.Subject; import org.apache.shiro.web.filter.PathMatchingFilter; import org.apache.shiro.web.util.WebUtils; -import com.turbodev.launcher.loader.PluginManager; -import com.turbodev.utils.ExceptionUtils; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.loader.PluginManager; +import io.onedev.utils.ExceptionUtils; +import io.onedev.utils.StringUtils; @Singleton public class BasicAuthenticationFilter extends PathMatchingFilter { diff --git a/core/src/main/java/com/turbodev/server/security/FilterChainConfigurator.java b/core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java similarity index 66% rename from core/src/main/java/com/turbodev/server/security/FilterChainConfigurator.java rename to core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java index 6e785321ae..d7cd47cca8 100644 --- a/core/src/main/java/com/turbodev/server/security/FilterChainConfigurator.java +++ b/core/src/main/java/io/onedev/server/security/FilterChainConfigurator.java @@ -1,8 +1,8 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import org.apache.shiro.web.filter.mgt.FilterChainManager; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface FilterChainConfigurator { diff --git a/core/src/main/java/com/turbodev/server/security/TurboDevAuthorizingRealm.java b/core/src/main/java/io/onedev/server/security/OneDevAuthorizingRealm.java similarity index 82% rename from core/src/main/java/com/turbodev/server/security/TurboDevAuthorizingRealm.java rename to core/src/main/java/io/onedev/server/security/OneDevAuthorizingRealm.java index db4a0107b1..20c07eb538 100644 --- a/core/src/main/java/com/turbodev/server/security/TurboDevAuthorizingRealm.java +++ b/core/src/main/java/io/onedev/server/security/OneDevAuthorizingRealm.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import java.util.ArrayList; import java.util.Collection; @@ -21,36 +21,37 @@ import org.apache.shiro.subject.PrincipalCollection; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.manager.MembershipManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.Membership; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.security.authenticator.Authenticated; +import io.onedev.server.security.authenticator.Authenticator; +import io.onedev.server.security.permission.CreateProjects; +import io.onedev.server.security.permission.ProjectPermission; +import io.onedev.server.security.permission.PublicPermission; +import io.onedev.server.security.permission.SystemAdministration; +import io.onedev.server.security.permission.UserAdministration; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.utils.StringUtils; + import com.google.common.base.Throwables; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.manager.MembershipManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.Membership; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.security.authenticator.Authenticated; -import com.turbodev.server.security.authenticator.Authenticator; -import com.turbodev.server.security.permission.CreateProjects; -import com.turbodev.server.security.permission.ProjectPermission; -import com.turbodev.server.security.permission.PublicPermission; -import com.turbodev.server.security.permission.SystemAdministration; -import com.turbodev.server.security.permission.UserAdministration; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.util.facade.UserFacade; @Singleton -public class TurboDevAuthorizingRealm extends AuthorizingRealm { +public class OneDevAuthorizingRealm extends AuthorizingRealm { - private static final Logger logger = LoggerFactory.getLogger(TurboDevAuthorizingRealm.class); + private static final Logger logger = LoggerFactory.getLogger(OneDevAuthorizingRealm.class); private final UserManager userManager; @@ -63,7 +64,7 @@ public class TurboDevAuthorizingRealm extends AuthorizingRealm { private final GroupManager groupManager; @Inject - public TurboDevAuthorizingRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager, + public OneDevAuthorizingRealm(UserManager userManager, CacheManager cacheManager, ConfigManager configManager, MembershipManager membershipManager, GroupManager groupManager) { PasswordMatcher passwordMatcher = new PasswordMatcher(); passwordMatcher.setPasswordService(AppLoader.getInstance(PasswordService.class)); diff --git a/core/src/main/java/com/turbodev/server/security/TurboDevFilterChainResolver.java b/core/src/main/java/io/onedev/server/security/OneDevFilterChainResolver.java similarity index 81% rename from core/src/main/java/com/turbodev/server/security/TurboDevFilterChainResolver.java rename to core/src/main/java/io/onedev/server/security/OneDevFilterChainResolver.java index 127f26ba2e..1aec3f2f62 100644 --- a/core/src/main/java/com/turbodev/server/security/TurboDevFilterChainResolver.java +++ b/core/src/main/java/io/onedev/server/security/OneDevFilterChainResolver.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import java.util.Set; @@ -9,10 +9,10 @@ import org.apache.shiro.web.filter.mgt.FilterChainManager; import org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver; @Singleton -public class TurboDevFilterChainResolver extends PathMatchingFilterChainResolver { +public class OneDevFilterChainResolver extends PathMatchingFilterChainResolver { @Inject - public TurboDevFilterChainResolver( + public OneDevFilterChainResolver( Set filterChainConfigurators, BasicAuthenticationFilter basicAuthenticationFilter) { diff --git a/core/src/main/java/com/turbodev/server/security/TurboDevPasswordService.java b/core/src/main/java/io/onedev/server/security/OneDevPasswordService.java similarity index 82% rename from core/src/main/java/com/turbodev/server/security/TurboDevPasswordService.java rename to core/src/main/java/io/onedev/server/security/OneDevPasswordService.java index e46909d52c..81265c0194 100644 --- a/core/src/main/java/com/turbodev/server/security/TurboDevPasswordService.java +++ b/core/src/main/java/io/onedev/server/security/OneDevPasswordService.java @@ -1,14 +1,15 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import javax.inject.Singleton; import org.apache.shiro.authc.credential.PasswordService; -import com.turbodev.utils.StringUtils; import com.pmease.security.shiro.bcrypt.BCryptPasswordService; +import io.onedev.utils.StringUtils; + @Singleton -public class TurboDevPasswordService implements PasswordService { +public class OneDevPasswordService implements PasswordService { private final PasswordService bcryptPasswordService = new BCryptPasswordService(); diff --git a/core/src/main/java/com/turbodev/server/security/TurboDevRememberMeManager.java b/core/src/main/java/io/onedev/server/security/OneDevRememberMeManager.java similarity index 74% rename from core/src/main/java/com/turbodev/server/security/TurboDevRememberMeManager.java rename to core/src/main/java/io/onedev/server/security/OneDevRememberMeManager.java index 08045464a9..22910c13d2 100644 --- a/core/src/main/java/com/turbodev/server/security/TurboDevRememberMeManager.java +++ b/core/src/main/java/io/onedev/server/security/OneDevRememberMeManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import javax.inject.Inject; import javax.inject.Singleton; @@ -6,15 +6,15 @@ import javax.inject.Singleton; import org.apache.shiro.subject.PrincipalCollection; import org.apache.shiro.web.mgt.CookieRememberMeManager; -import com.turbodev.server.manager.UserManager; +import io.onedev.server.manager.UserManager; @Singleton -public class TurboDevRememberMeManager extends CookieRememberMeManager { +public class OneDevRememberMeManager extends CookieRememberMeManager { private final UserManager userManager; @Inject - public TurboDevRememberMeManager(UserManager userManager) { + public OneDevRememberMeManager(UserManager userManager) { this.userManager = userManager; } diff --git a/core/src/main/java/com/turbodev/server/security/TurboDevWebEnvironment.java b/core/src/main/java/io/onedev/server/security/OneDevWebEnvironment.java similarity index 53% rename from core/src/main/java/com/turbodev/server/security/TurboDevWebEnvironment.java rename to core/src/main/java/io/onedev/server/security/OneDevWebEnvironment.java index ab160c7070..9ae86cb5c0 100644 --- a/core/src/main/java/com/turbodev/server/security/TurboDevWebEnvironment.java +++ b/core/src/main/java/io/onedev/server/security/OneDevWebEnvironment.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import org.apache.shiro.ShiroException; import org.apache.shiro.util.Destroyable; @@ -7,14 +7,14 @@ import org.apache.shiro.web.env.DefaultWebEnvironment; import org.apache.shiro.web.filter.mgt.FilterChainResolver; import org.apache.shiro.web.mgt.WebSecurityManager; -import com.turbodev.server.TurboDev; +import io.onedev.server.OneDev; -public class TurboDevWebEnvironment extends DefaultWebEnvironment implements Initializable, Destroyable { +public class OneDevWebEnvironment extends DefaultWebEnvironment implements Initializable, Destroyable { @Override public void init() throws ShiroException { - setWebSecurityManager(TurboDev.getInstance(WebSecurityManager.class)); - setFilterChainResolver(TurboDev.getInstance(FilterChainResolver.class)); + setWebSecurityManager(OneDev.getInstance(WebSecurityManager.class)); + setFilterChainResolver(OneDev.getInstance(FilterChainResolver.class)); } } diff --git a/core/src/main/java/com/turbodev/server/security/TurboDevWebSecurityManager.java b/core/src/main/java/io/onedev/server/security/OneDevWebSecurityManager.java similarity index 92% rename from core/src/main/java/com/turbodev/server/security/TurboDevWebSecurityManager.java rename to core/src/main/java/io/onedev/server/security/OneDevWebSecurityManager.java index 5067d90f4a..fd42eb1b21 100644 --- a/core/src/main/java/com/turbodev/server/security/TurboDevWebSecurityManager.java +++ b/core/src/main/java/io/onedev/server/security/OneDevWebSecurityManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import javax.inject.Inject; import javax.inject.Singleton; @@ -18,10 +18,10 @@ import org.apache.shiro.web.subject.WebSubjectContext; import org.apache.shiro.web.subject.support.WebDelegatingSubject; @Singleton -public class TurboDevWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager { +public class OneDevWebSecurityManager extends org.apache.shiro.web.mgt.DefaultWebSecurityManager { @Inject - public TurboDevWebSecurityManager(Realm realm, RememberMeManager rememberMeManager) { + public OneDevWebSecurityManager(Realm realm, RememberMeManager rememberMeManager) { setSubjectFactory(new DefaultWebSubjectFactory() { diff --git a/core/src/main/java/com/turbodev/server/security/ProjectPrivilege.java b/core/src/main/java/io/onedev/server/security/ProjectPrivilege.java similarity index 94% rename from core/src/main/java/com/turbodev/server/security/ProjectPrivilege.java rename to core/src/main/java/io/onedev/server/security/ProjectPrivilege.java index 50fce64179..63680d6cc6 100644 --- a/core/src/main/java/com/turbodev/server/security/ProjectPrivilege.java +++ b/core/src/main/java/io/onedev/server/security/ProjectPrivilege.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; public enum ProjectPrivilege { diff --git a/core/src/main/java/com/turbodev/server/security/SecurityUtils.java b/core/src/main/java/io/onedev/server/security/SecurityUtils.java similarity index 76% rename from core/src/main/java/com/turbodev/server/security/SecurityUtils.java rename to core/src/main/java/io/onedev/server/security/SecurityUtils.java index 5c275a9e52..e583ae9e43 100644 --- a/core/src/main/java/com/turbodev/server/security/SecurityUtils.java +++ b/core/src/main/java/io/onedev/server/security/SecurityUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security; +package io.onedev.server.security; import java.util.Collection; import java.util.HashSet; @@ -8,42 +8,42 @@ import javax.annotation.Nullable; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.security.permission.CreateProjects; -import com.turbodev.server.security.permission.ProjectPermission; -import com.turbodev.server.security.permission.PublicPermission; -import com.turbodev.server.security.permission.SystemAdministration; -import com.turbodev.server.security.permission.UserAdministration; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.util.facade.UserFacade; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.Review; +import io.onedev.server.model.User; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.security.permission.CreateProjects; +import io.onedev.server.security.permission.ProjectPermission; +import io.onedev.server.security.permission.PublicPermission; +import io.onedev.server.security.permission.SystemAdministration; +import io.onedev.server.security.permission.UserAdministration; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.util.facade.UserFacade; public class SecurityUtils extends org.apache.shiro.SecurityUtils { public static Collection getAuthorizedUsers(ProjectFacade project, ProjectPrivilege privilege) { - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); Collection authorizedUsers = new HashSet<>(); if (project.isPublicRead() && privilege == ProjectPrivilege.READ) { for (UserFacade user: cacheManager.getUsers().values()) authorizedUsers.add(user); } else { - authorizedUsers.add(TurboDev.getInstance(UserManager.class).getRoot().getFacade()); + authorizedUsers.add(OneDev.getInstance(UserManager.class).getRoot().getFacade()); Set authorizedGroupIds = new HashSet<>(); for (GroupFacade group: cacheManager.getGroups().values()) { @@ -81,7 +81,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils { } public static User getUser() { - return TurboDev.getInstance(UserManager.class).getCurrent(); + return OneDev.getInstance(UserManager.class).getCurrent(); } public static boolean canModify(Review review) { @@ -159,12 +159,12 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils { } public static boolean canModify(Project project, String branch, String file) { - return canWrite(project) && !TurboDev.getInstance(ProjectManager.class) + return canWrite(project) && !OneDev.getInstance(ProjectManager.class) .isModificationNeedsQualityCheck(getUser(), project, branch, file); } public static boolean canPush(Project project, String branchName, ObjectId oldObjectId, ObjectId newObjectId) { - return canWrite(project) && !TurboDev.getInstance(ProjectManager.class) + return canWrite(project) && !OneDev.getInstance(ProjectManager.class) .isPushNeedsQualityCheck(getUser(), project, branchName, oldObjectId, newObjectId, null); } diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/Authenticated.java b/core/src/main/java/io/onedev/server/security/authenticator/Authenticated.java similarity index 92% rename from core/src/main/java/com/turbodev/server/security/authenticator/Authenticated.java rename to core/src/main/java/io/onedev/server/security/authenticator/Authenticated.java index d1fa0cc390..c519a46112 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/Authenticated.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/Authenticated.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security.authenticator; +package io.onedev.server.security.authenticator; import java.util.Collection; diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/Authenticator.java b/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java similarity index 89% rename from core/src/main/java/com/turbodev/server/security/authenticator/Authenticator.java rename to core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java index 3391ff45b2..3bd8b0ccd6 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/Authenticator.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/Authenticator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security.authenticator; +package io.onedev.server.security.authenticator; import java.io.Serializable; import java.util.Iterator; @@ -7,8 +7,8 @@ import java.util.List; import org.apache.shiro.authc.AuthenticationException; import org.apache.shiro.authc.UsernamePasswordToken; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.GroupChoice; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.GroupChoice; @Editable public abstract class Authenticator implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java b/core/src/main/java/io/onedev/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java similarity index 90% rename from core/src/main/java/com/turbodev/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java rename to core/src/main/java/io/onedev/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java index e06410321f..02673e4b2f 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/ldap/ActiveDirectoryAuthenticator.java @@ -1,8 +1,8 @@ -package com.turbodev.server.security.authenticator.ldap; +package io.onedev.server.security.authenticator.ldap; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(name="Active Directory", order=100) public class ActiveDirectoryAuthenticator extends LdapAuthenticator { @@ -20,10 +20,10 @@ public class ActiveDirectoryAuthenticator extends LdapAuthenticator { } @Editable(order=300, description="" - + "To authenticate user against Active Directory and retrieve associated attributes and groups, TurboDev " - + "would have to first authenticate itself against the Active Directory server and TurboDev does that by " + + "To authenticate user against Active Directory and retrieve associated attributes and groups, OneDev " + + "would have to first authenticate itself against the Active Directory server and OneDev does that by " + "sending 'manager' DN and password. The manager DN should be specified in form of " - + "<account name>@<domain>, for instance: turbodev@example.com") + + "<account name>@<domain>, for instance: onedev@example.com") @NotEmpty @Override public String getManagerDN() { diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/DoNotRetrieveGroups.java b/core/src/main/java/io/onedev/server/security/authenticator/ldap/DoNotRetrieveGroups.java similarity index 53% rename from core/src/main/java/com/turbodev/server/security/authenticator/ldap/DoNotRetrieveGroups.java rename to core/src/main/java/io/onedev/server/security/authenticator/ldap/DoNotRetrieveGroups.java index 14eadfda07..c875225583 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/DoNotRetrieveGroups.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/ldap/DoNotRetrieveGroups.java @@ -1,6 +1,6 @@ -package com.turbodev.server.security.authenticator.ldap; +package io.onedev.server.security.authenticator.ldap; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(order=100) public class DoNotRetrieveGroups implements GroupRetrieval { diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/GetGroupsUsingAttribute.java b/core/src/main/java/io/onedev/server/security/authenticator/ldap/GetGroupsUsingAttribute.java similarity index 84% rename from core/src/main/java/com/turbodev/server/security/authenticator/ldap/GetGroupsUsingAttribute.java rename to core/src/main/java/io/onedev/server/security/authenticator/ldap/GetGroupsUsingAttribute.java index 6a08a777a9..4a735746ff 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/GetGroupsUsingAttribute.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/ldap/GetGroupsUsingAttribute.java @@ -1,8 +1,8 @@ -package com.turbodev.server.security.authenticator.ldap; +package io.onedev.server.security.authenticator.ldap; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(order=200) public class GetGroupsUsingAttribute implements GroupRetrieval { @@ -27,7 +27,7 @@ public class GetGroupsUsingAttribute implements GroupRetrieval { @Editable(order=200, description="" + "Specifies the attribute containing group name inside the found group LDAP entry. Value of this attribute " - + "will be mapped to a TurboDev group. This attribute is normally set to cn") + + "will be mapped to a OneDev group. This attribute is normally set to cn") @NotEmpty public String getGroupNameAttribute() { return groupNameAttribute; diff --git a/core/src/main/java/io/onedev/server/security/authenticator/ldap/GroupRetrieval.java b/core/src/main/java/io/onedev/server/security/authenticator/ldap/GroupRetrieval.java new file mode 100644 index 0000000000..246f881696 --- /dev/null +++ b/core/src/main/java/io/onedev/server/security/authenticator/ldap/GroupRetrieval.java @@ -0,0 +1,10 @@ +package io.onedev.server.security.authenticator.ldap; + +import java.io.Serializable; + +import io.onedev.server.util.editable.annotation.Editable; + +@Editable +public interface GroupRetrieval extends Serializable { + +} diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/LdapAuthenticator.java b/core/src/main/java/io/onedev/server/security/authenticator/ldap/LdapAuthenticator.java similarity index 96% rename from core/src/main/java/com/turbodev/server/security/authenticator/ldap/LdapAuthenticator.java rename to core/src/main/java/io/onedev/server/security/authenticator/ldap/LdapAuthenticator.java index 3303198863..a2a801f52b 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/LdapAuthenticator.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/ldap/LdapAuthenticator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security.authenticator.ldap; +package io.onedev.server.security.authenticator.ldap; import java.util.ArrayList; import java.util.Collection; @@ -28,11 +28,11 @@ import org.hibernate.validator.constraints.NotEmpty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.security.authenticator.Authenticated; -import com.turbodev.server.security.authenticator.Authenticator; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Password; +import io.onedev.server.security.authenticator.Authenticated; +import io.onedev.server.security.authenticator.Authenticator; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Password; +import io.onedev.utils.StringUtils; @Editable(name="Generic LDAP", order=200) public class LdapAuthenticator extends Authenticator { @@ -69,8 +69,8 @@ public class LdapAuthenticator extends Authenticator { } @Editable(order=300, description="" - + "To authenticate user against LDAP and retrieve associated attributes and groups, TurboDev would have to " - + "first authenticate itself against the LDAP server and TurboDev does that by sending 'manager' DN and " + + "To authenticate user against LDAP and retrieve associated attributes and groups, OneDev would have to " + + "first authenticate itself against the LDAP server and OneDev does that by sending 'manager' DN and " + "password") @NotEmpty public String getManagerDN() { diff --git a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/SearchGroupsUsingFilter.java b/core/src/main/java/io/onedev/server/security/authenticator/ldap/SearchGroupsUsingFilter.java similarity index 88% rename from core/src/main/java/com/turbodev/server/security/authenticator/ldap/SearchGroupsUsingFilter.java rename to core/src/main/java/io/onedev/server/security/authenticator/ldap/SearchGroupsUsingFilter.java index 89a4ad0c2a..0a0853fb5e 100644 --- a/core/src/main/java/com/turbodev/server/security/authenticator/ldap/SearchGroupsUsingFilter.java +++ b/core/src/main/java/io/onedev/server/security/authenticator/ldap/SearchGroupsUsingFilter.java @@ -1,8 +1,8 @@ -package com.turbodev.server.security.authenticator.ldap; +package io.onedev.server.security.authenticator.ldap; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Editable; @Editable(order=300) public class SearchGroupsUsingFilter implements GroupRetrieval { @@ -42,7 +42,7 @@ public class SearchGroupsUsingFilter implements GroupRetrieval { @Editable(order=300, description="" + "Specifies the attribute containing group name inside the found group LDAP entry. Value of this attribute " - + "will be mapped to a TurboDev group. This attribute is normally set to cn") + + "will be mapped to a OneDev group. This attribute is normally set to cn") @NotEmpty public String getGroupNameAttribute() { return groupNameAttribute; diff --git a/core/src/main/java/com/turbodev/server/security/permission/CreateProjects.java b/core/src/main/java/io/onedev/server/security/permission/CreateProjects.java similarity index 82% rename from core/src/main/java/com/turbodev/server/security/permission/CreateProjects.java rename to core/src/main/java/io/onedev/server/security/permission/CreateProjects.java index 7f408a516c..5a3c891d51 100644 --- a/core/src/main/java/com/turbodev/server/security/permission/CreateProjects.java +++ b/core/src/main/java/io/onedev/server/security/permission/CreateProjects.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security.permission; +package io.onedev.server.security.permission; import org.apache.shiro.authz.Permission; diff --git a/core/src/main/java/com/turbodev/server/security/permission/ProjectPermission.java b/core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java similarity index 83% rename from core/src/main/java/com/turbodev/server/security/permission/ProjectPermission.java rename to core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java index 8605d95257..8233bd39fb 100644 --- a/core/src/main/java/com/turbodev/server/security/permission/ProjectPermission.java +++ b/core/src/main/java/io/onedev/server/security/permission/ProjectPermission.java @@ -1,9 +1,9 @@ -package com.turbodev.server.security.permission; +package io.onedev.server.security.permission; import org.apache.shiro.authz.Permission; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.util.facade.ProjectFacade; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.util.facade.ProjectFacade; public class ProjectPermission implements Permission { diff --git a/core/src/main/java/com/turbodev/server/security/permission/PublicPermission.java b/core/src/main/java/io/onedev/server/security/permission/PublicPermission.java similarity index 81% rename from core/src/main/java/com/turbodev/server/security/permission/PublicPermission.java rename to core/src/main/java/io/onedev/server/security/permission/PublicPermission.java index ee71481d59..28d6280bf0 100644 --- a/core/src/main/java/com/turbodev/server/security/permission/PublicPermission.java +++ b/core/src/main/java/io/onedev/server/security/permission/PublicPermission.java @@ -1,8 +1,8 @@ -package com.turbodev.server.security.permission; +package io.onedev.server.security.permission; import org.apache.shiro.authz.Permission; -import com.turbodev.server.security.ProjectPrivilege; +import io.onedev.server.security.ProjectPrivilege; public class PublicPermission implements Permission { diff --git a/core/src/main/java/com/turbodev/server/security/permission/SystemAdministration.java b/core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java similarity index 78% rename from core/src/main/java/com/turbodev/server/security/permission/SystemAdministration.java rename to core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java index 609510b033..4a3f51ce42 100644 --- a/core/src/main/java/com/turbodev/server/security/permission/SystemAdministration.java +++ b/core/src/main/java/io/onedev/server/security/permission/SystemAdministration.java @@ -1,4 +1,4 @@ -package com.turbodev.server.security.permission; +package io.onedev.server.security.permission; import org.apache.shiro.authz.Permission; diff --git a/core/src/main/java/com/turbodev/server/security/permission/UserAdministration.java b/core/src/main/java/io/onedev/server/security/permission/UserAdministration.java similarity index 83% rename from core/src/main/java/com/turbodev/server/security/permission/UserAdministration.java rename to core/src/main/java/io/onedev/server/security/permission/UserAdministration.java index d175a38c36..9124aef117 100644 --- a/core/src/main/java/com/turbodev/server/security/permission/UserAdministration.java +++ b/core/src/main/java/io/onedev/server/security/permission/UserAdministration.java @@ -1,8 +1,8 @@ -package com.turbodev.server.security.permission; +package io.onedev.server.security.permission; import org.apache.shiro.authz.Permission; -import com.turbodev.server.util.facade.UserFacade; +import io.onedev.server.util.facade.UserFacade; public class UserAdministration implements Permission { diff --git a/core/src/main/java/com/turbodev/server/util/BatchWorker.java b/core/src/main/java/io/onedev/server/util/BatchWorker.java similarity index 93% rename from core/src/main/java/com/turbodev/server/util/BatchWorker.java rename to core/src/main/java/io/onedev/server/util/BatchWorker.java index 5b4b3e9be8..e636b7c019 100644 --- a/core/src/main/java/com/turbodev/server/util/BatchWorker.java +++ b/core/src/main/java/io/onedev/server/util/BatchWorker.java @@ -1,13 +1,14 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.util.Collection; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import com.turbodev.utils.concurrent.Prioritized; import com.google.common.base.Preconditions; +import io.onedev.utils.concurrent.Prioritized; + public abstract class BatchWorker { private final String id; diff --git a/core/src/main/java/com/turbodev/server/util/ContentDetector.java b/core/src/main/java/io/onedev/server/util/ContentDetector.java similarity index 98% rename from core/src/main/java/com/turbodev/server/util/ContentDetector.java rename to core/src/main/java/io/onedev/server/util/ContentDetector.java index c6cb82cc8e..5f5c6fd7b8 100644 --- a/core/src/main/java/com/turbodev/server/util/ContentDetector.java +++ b/core/src/main/java/io/onedev/server/util/ContentDetector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.io.IOException; import java.io.InputStream; diff --git a/core/src/main/java/com/turbodev/server/util/Day.java b/core/src/main/java/io/onedev/server/util/Day.java similarity index 97% rename from core/src/main/java/com/turbodev/server/util/Day.java rename to core/src/main/java/io/onedev/server/util/Day.java index 39eeb7b056..ca19925fbf 100644 --- a/core/src/main/java/com/turbodev/server/util/Day.java +++ b/core/src/main/java/io/onedev/server/util/Day.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.io.Serializable; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/util/IndexResult.java b/core/src/main/java/io/onedev/server/util/IndexResult.java similarity index 92% rename from core/src/main/java/com/turbodev/server/util/IndexResult.java rename to core/src/main/java/io/onedev/server/util/IndexResult.java index d1622f4b6a..676a146c6a 100644 --- a/core/src/main/java/com/turbodev/server/util/IndexResult.java +++ b/core/src/main/java/io/onedev/server/util/IndexResult.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; public class IndexResult { diff --git a/core/src/main/java/com/turbodev/server/util/JsoupUtils.java b/core/src/main/java/io/onedev/server/util/JsoupUtils.java similarity index 99% rename from core/src/main/java/com/turbodev/server/util/JsoupUtils.java rename to core/src/main/java/io/onedev/server/util/JsoupUtils.java index 9483f373b3..23bf17b020 100644 --- a/core/src/main/java/com/turbodev/server/util/JsoupUtils.java +++ b/core/src/main/java/io/onedev/server/util/JsoupUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.util.Collection; import java.util.regex.Matcher; diff --git a/core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java b/core/src/main/java/io/onedev/server/util/QualityCheckStatus.java similarity index 87% rename from core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java rename to core/src/main/java/io/onedev/server/util/QualityCheckStatus.java index 2923ec1f75..dedc7eab77 100644 --- a/core/src/main/java/com/turbodev/server/util/QualityCheckStatus.java +++ b/core/src/main/java/io/onedev/server/util/QualityCheckStatus.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.util.ArrayList; import java.util.Collection; @@ -15,27 +15,27 @@ import javax.annotation.Nullable; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.authz.Permission; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.command.FileChange; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.FileProtection; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.security.permission.ProjectPermission; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.util.reviewrequirement.InvalidReviewRuleException; -import com.turbodev.server.util.reviewrequirement.ReviewRequirement; +import io.onedev.server.OneDev; +import io.onedev.server.git.command.FileChange; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.Review; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.model.User; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.FileProtection; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.security.permission.ProjectPermission; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException; +import io.onedev.server.util.reviewrequirement.ReviewRequirement; public class QualityCheckStatus { @@ -150,7 +150,7 @@ public class QualityCheckStatus { Map verifications; if (commit != null) { - verifications = TurboDev.getInstance(VerificationManager.class) + verifications = OneDev.getInstance(VerificationManager.class) .getVerifications(request.getTargetProject(), commit); } else { verifications = new HashMap<>(); @@ -205,7 +205,7 @@ public class QualityCheckStatus { } else { Review effectiveReview = getReviewAfter(user.getId(), update); if (effectiveReview != null) { - effectiveReviews.put(TurboDev.getInstance(UserManager.class).load(user.getId()), effectiveReview); + effectiveReviews.put(OneDev.getInstance(UserManager.class).load(user.getId()), effectiveReview); effectiveCount++; } else { potentialReviewers.add(user); @@ -268,7 +268,7 @@ public class QualityCheckStatus { throw new InvalidReviewRuleException(errorMessage); } - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); for (UserFacade user: reviewers) { awaitingReviewers.add(userManager.load(user.getId())); inviteReviewer(user.getId()); @@ -279,7 +279,7 @@ public class QualityCheckStatus { if (users.size() <= 1) return; - CommitInfoManager commitInfoManager = TurboDev.getInstance(CommitInfoManager.class); + CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class); Map contributions = new HashMap<>(); for (UserFacade user: users) contributions.put(user, 0L); @@ -339,7 +339,7 @@ public class QualityCheckStatus { } else { invitation = new ReviewInvitation(); invitation.setRequest(request); - invitation.setUser(TurboDev.getInstance(UserManager.class).load(userId)); + invitation.setUser(OneDev.getInstance(UserManager.class).load(userId)); invitation.setType(ReviewInvitation.Type.RULE); request.getReviewInvitations().add(invitation); } diff --git a/core/src/main/java/com/turbodev/server/util/TextNodeVisitor.java b/core/src/main/java/io/onedev/server/util/TextNodeVisitor.java similarity index 95% rename from core/src/main/java/com/turbodev/server/util/TextNodeVisitor.java rename to core/src/main/java/io/onedev/server/util/TextNodeVisitor.java index b38a8ea983..7f5cd1700c 100644 --- a/core/src/main/java/com/turbodev/server/util/TextNodeVisitor.java +++ b/core/src/main/java/io/onedev/server/util/TextNodeVisitor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.util.List; diff --git a/core/src/main/java/com/turbodev/server/util/UniversalEncodingDetector.java b/core/src/main/java/io/onedev/server/util/UniversalEncodingDetector.java similarity index 98% rename from core/src/main/java/com/turbodev/server/util/UniversalEncodingDetector.java rename to core/src/main/java/io/onedev/server/util/UniversalEncodingDetector.java index 445f7ec6b3..baf0e3e3c5 100644 --- a/core/src/main/java/com/turbodev/server/util/UniversalEncodingDetector.java +++ b/core/src/main/java/io/onedev/server/util/UniversalEncodingDetector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/core/src/main/java/com/turbodev/server/util/UniversalEncodingListener.java b/core/src/main/java/io/onedev/server/util/UniversalEncodingListener.java similarity index 98% rename from core/src/main/java/com/turbodev/server/util/UniversalEncodingListener.java rename to core/src/main/java/io/onedev/server/util/UniversalEncodingListener.java index 52ccb8aca2..18178a3721 100644 --- a/core/src/main/java/com/turbodev/server/util/UniversalEncodingListener.java +++ b/core/src/main/java/io/onedev/server/util/UniversalEncodingListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.nio.charset.Charset; diff --git a/core/src/main/java/com/turbodev/server/util/Verification.java b/core/src/main/java/io/onedev/server/util/Verification.java similarity index 95% rename from core/src/main/java/com/turbodev/server/util/Verification.java rename to core/src/main/java/io/onedev/server/util/Verification.java index 82d1bd4ec6..f8908d6a18 100644 --- a/core/src/main/java/com/turbodev/server/util/Verification.java +++ b/core/src/main/java/io/onedev/server/util/Verification.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util; +package io.onedev.server.util; import java.io.Serializable; import java.util.Date; diff --git a/core/src/main/java/com/turbodev/server/util/diff/DiffBlock.java b/core/src/main/java/io/onedev/server/util/diff/DiffBlock.java similarity index 90% rename from core/src/main/java/com/turbodev/server/util/diff/DiffBlock.java rename to core/src/main/java/io/onedev/server/util/diff/DiffBlock.java index a8f8dd0ab8..6383e0692e 100644 --- a/core/src/main/java/com/turbodev/server/util/diff/DiffBlock.java +++ b/core/src/main/java/io/onedev/server/util/diff/DiffBlock.java @@ -1,9 +1,9 @@ -package com.turbodev.server.util.diff; +package io.onedev.server.util.diff; import java.io.Serializable; import java.util.List; -import com.turbodev.server.util.diff.DiffMatchPatch.Operation; +import io.onedev.server.util.diff.DiffMatchPatch.Operation; public class DiffBlock implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/util/diff/DiffMatchPatch.java b/core/src/main/java/io/onedev/server/util/diff/DiffMatchPatch.java similarity index 99% rename from core/src/main/java/com/turbodev/server/util/diff/DiffMatchPatch.java rename to core/src/main/java/io/onedev/server/util/diff/DiffMatchPatch.java index 0a317208ae..0470094833 100644 --- a/core/src/main/java/com/turbodev/server/util/diff/DiffMatchPatch.java +++ b/core/src/main/java/io/onedev/server/util/diff/DiffMatchPatch.java @@ -16,7 +16,7 @@ * the License. */ -package com.turbodev.server.util.diff; +package io.onedev.server.util.diff; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; diff --git a/core/src/main/java/com/turbodev/server/util/diff/DiffUtils.java b/core/src/main/java/io/onedev/server/util/diff/DiffUtils.java similarity index 95% rename from core/src/main/java/com/turbodev/server/util/diff/DiffUtils.java rename to core/src/main/java/io/onedev/server/util/diff/DiffUtils.java index 1723192342..9c074f3fbd 100644 --- a/core/src/main/java/com/turbodev/server/util/diff/DiffUtils.java +++ b/core/src/main/java/io/onedev/server/util/diff/DiffUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.diff; +package io.onedev.server.util.diff; import java.util.ArrayList; import java.util.HashMap; @@ -10,17 +10,18 @@ import java.util.regex.Pattern; import javax.annotation.Nullable; -import com.turbodev.jsyntax.TextToken; -import com.turbodev.jsyntax.TokenTypes; -import com.turbodev.jsyntax.Tokenized; -import com.turbodev.jsyntax.Tokenizer; -import com.turbodev.jsyntax.TokenizerRegistry; -import com.turbodev.utils.StringUtils; -import com.turbodev.jsyntax.TokenUtils; +import io.onedev.jsyntax.TextToken; +import io.onedev.jsyntax.TokenTypes; +import io.onedev.jsyntax.TokenUtils; +import io.onedev.jsyntax.Tokenized; +import io.onedev.jsyntax.Tokenizer; +import io.onedev.jsyntax.TokenizerRegistry; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.util.diff.DiffMatchPatch.Diff; +import io.onedev.server.util.diff.DiffMatchPatch.Operation; +import io.onedev.utils.StringUtils; + import com.google.common.base.Preconditions; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.util.diff.DiffMatchPatch.Diff; -import com.turbodev.server.util.diff.DiffMatchPatch.Operation; public class DiffUtils { diff --git a/core/src/main/java/com/turbodev/server/util/diff/LineDiff.java b/core/src/main/java/io/onedev/server/util/diff/LineDiff.java similarity index 87% rename from core/src/main/java/com/turbodev/server/util/diff/LineDiff.java rename to core/src/main/java/io/onedev/server/util/diff/LineDiff.java index 39834e9c9c..2ed9cb9a81 100644 --- a/core/src/main/java/com/turbodev/server/util/diff/LineDiff.java +++ b/core/src/main/java/io/onedev/server/util/diff/LineDiff.java @@ -1,9 +1,9 @@ -package com.turbodev.server.util.diff; +package io.onedev.server.util.diff; import java.io.Serializable; import java.util.List; -import com.turbodev.jsyntax.TextToken; +import io.onedev.jsyntax.TextToken; public class LineDiff implements Serializable { diff --git a/core/src/main/java/com/turbodev/server/util/diff/WhitespaceOption.java b/core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java similarity index 97% rename from core/src/main/java/com/turbodev/server/util/diff/WhitespaceOption.java rename to core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java index c1922b5699..2f6693fffe 100644 --- a/core/src/main/java/com/turbodev/server/util/diff/WhitespaceOption.java +++ b/core/src/main/java/io/onedev/server/util/diff/WhitespaceOption.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.diff; +package io.onedev.server.util.diff; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/turbodev/server/util/editable/EditableUtils.java b/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java similarity index 94% rename from core/src/main/java/com/turbodev/server/util/editable/EditableUtils.java rename to core/src/main/java/io/onedev/server/util/editable/EditableUtils.java index 57d3950a43..6c23cad63f 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/EditableUtils.java +++ b/core/src/main/java/io/onedev/server/util/editable/EditableUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable; +package io.onedev.server.util.editable; import java.io.Serializable; import java.lang.reflect.AnnotatedElement; @@ -11,13 +11,13 @@ import java.util.List; import javax.annotation.Nullable; import javax.validation.Validator; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.BeanUtils; -import com.turbodev.utils.ClassUtils; -import com.turbodev.utils.ReflectionUtils; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.WordUtils; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.utils.BeanUtils; +import io.onedev.utils.ClassUtils; +import io.onedev.utils.ReflectionUtils; +import io.onedev.utils.StringUtils; +import io.onedev.utils.WordUtils; public class EditableUtils { diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/BranchChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/BranchChoice.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/BranchChoice.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/BranchChoice.java index 8b38314e0f..40a137e3a0 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/BranchChoice.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/BranchChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/BranchPattern.java b/core/src/main/java/io/onedev/server/util/editable/annotation/BranchPattern.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/BranchPattern.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/BranchPattern.java index dd63895bf7..a659995d47 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/BranchPattern.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/BranchPattern.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/ChoiceProvider.java b/core/src/main/java/io/onedev/server/util/editable/annotation/ChoiceProvider.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/ChoiceProvider.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/ChoiceProvider.java index eecc0af3c6..d71233e66c 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/ChoiceProvider.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/ChoiceProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Editable.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Editable.java similarity index 90% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Editable.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Editable.java index c462a5448b..4beccfeb82 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Editable.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Editable.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/ExcludeValues.java b/core/src/main/java/io/onedev/server/util/editable/annotation/ExcludeValues.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/ExcludeValues.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/ExcludeValues.java index a844b86766..f1c414a53a 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/ExcludeValues.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/ExcludeValues.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/FileChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/FileChoice.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/FileChoice.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/FileChoice.java index 64e6665352..1e030071ad 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/FileChoice.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/FileChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/GroupChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/GroupChoice.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.java index 657cc8db85..b764a4c65f 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/GroupChoice.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/GroupChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Horizontal.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Horizontal.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Horizontal.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Horizontal.java index 5a4d541d96..f93e005775 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Horizontal.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Horizontal.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Markdown.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Markdown.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Markdown.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Markdown.java index 4076aa7501..54a5817828 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Markdown.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Markdown.java @@ -1,12 +1,12 @@ /* - * Copyright TurboDev (c) 2005-2008, + * Copyright OneDev (c) 2005-2008, * Date: Feb 24, 2008 * Time: 4:29:05 PM * All rights reserved. * * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $ */ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Multiline.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Multiline.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Multiline.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Multiline.java index fb40ed2708..4f89997614 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Multiline.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Multiline.java @@ -1,12 +1,12 @@ /* - * Copyright TurboDev (c) 2005-2008, + * Copyright OneDev (c) 2005-2008, * Date: Feb 24, 2008 * Time: 4:29:05 PM * All rights reserved. * * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $ */ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/NullChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/NullChoice.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/NullChoice.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/NullChoice.java index 8a3d153460..a95ca86985 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/NullChoice.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/NullChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Numeric.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Numeric.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Numeric.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Numeric.java index 0775c92cc5..5645cdbe5c 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Numeric.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Numeric.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/OmitName.java b/core/src/main/java/io/onedev/server/util/editable/annotation/OmitName.java similarity index 86% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/OmitName.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/OmitName.java index 19fad21bea..6d8621910f 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/OmitName.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/OmitName.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Password.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Password.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Password.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Password.java index 1a323fb4b8..89e08099ad 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Password.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Password.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/PathPattern.java b/core/src/main/java/io/onedev/server/util/editable/annotation/PathPattern.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/PathPattern.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/PathPattern.java index f1ba15340f..de2c895db4 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/PathPattern.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/PathPattern.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/ReviewRequirementSpec.java b/core/src/main/java/io/onedev/server/util/editable/annotation/ReviewRequirementSpec.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/ReviewRequirementSpec.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/ReviewRequirementSpec.java index 2066a5c500..b0d93819ed 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/ReviewRequirementSpec.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/ReviewRequirementSpec.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.ReviewRequirementSpecValidator; +import io.onedev.server.util.validation.ReviewRequirementSpecValidator; @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/TagPattern.java b/core/src/main/java/io/onedev/server/util/editable/annotation/TagPattern.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/TagPattern.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/TagPattern.java index 0206455005..8ab6ae7fc8 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/TagPattern.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/TagPattern.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/UserChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.java similarity index 87% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/UserChoice.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.java index bebc700afb..de5bd97dc8 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/UserChoice.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/UserChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/VerificationChoice.java b/core/src/main/java/io/onedev/server/util/editable/annotation/VerificationChoice.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/VerificationChoice.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/VerificationChoice.java index ef1387ce6d..64b6f4b335 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/VerificationChoice.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/VerificationChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/editable/annotation/Vertical.java b/core/src/main/java/io/onedev/server/util/editable/annotation/Vertical.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/editable/annotation/Vertical.java rename to core/src/main/java/io/onedev/server/util/editable/annotation/Vertical.java index 9b2e4634c7..c0311e44d4 100644 --- a/core/src/main/java/com/turbodev/server/util/editable/annotation/Vertical.java +++ b/core/src/main/java/io/onedev/server/util/editable/annotation/Vertical.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.editable.annotation; +package io.onedev.server.util.editable.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/core/src/main/java/com/turbodev/server/util/facade/EntityFacade.java b/core/src/main/java/io/onedev/server/util/facade/EntityFacade.java similarity index 95% rename from core/src/main/java/com/turbodev/server/util/facade/EntityFacade.java rename to core/src/main/java/io/onedev/server/util/facade/EntityFacade.java index 1044d0bcd9..6534061965 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/EntityFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/EntityFacade.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; import java.io.Serializable; diff --git a/core/src/main/java/com/turbodev/server/util/facade/GroupAuthorizationFacade.java b/core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java similarity index 81% rename from core/src/main/java/com/turbodev/server/util/facade/GroupAuthorizationFacade.java rename to core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java index dd9bf97704..170cbef652 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/GroupAuthorizationFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/GroupAuthorizationFacade.java @@ -1,7 +1,7 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; -import com.turbodev.server.model.GroupAuthorization; -import com.turbodev.server.security.ProjectPrivilege; +import io.onedev.server.model.GroupAuthorization; +import io.onedev.server.security.ProjectPrivilege; public class GroupAuthorizationFacade extends EntityFacade { diff --git a/core/src/main/java/com/turbodev/server/util/facade/GroupFacade.java b/core/src/main/java/io/onedev/server/util/facade/GroupFacade.java similarity index 87% rename from core/src/main/java/com/turbodev/server/util/facade/GroupFacade.java rename to core/src/main/java/io/onedev/server/util/facade/GroupFacade.java index c8b48ca577..aa424c92a4 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/GroupFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/GroupFacade.java @@ -1,6 +1,6 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; -import com.turbodev.server.model.Group; +import io.onedev.server.model.Group; public class GroupFacade extends EntityFacade { diff --git a/core/src/main/java/com/turbodev/server/util/facade/MembershipFacade.java b/core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/facade/MembershipFacade.java rename to core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java index 1796726daa..ec3fd953f4 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/MembershipFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/MembershipFacade.java @@ -1,6 +1,6 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; -import com.turbodev.server.model.Membership; +import io.onedev.server.model.Membership; public class MembershipFacade extends EntityFacade { diff --git a/core/src/main/java/com/turbodev/server/util/facade/ProjectFacade.java b/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java similarity index 76% rename from core/src/main/java/com/turbodev/server/util/facade/ProjectFacade.java rename to core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java index 932f41c6b8..6ad34b0cda 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/ProjectFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/ProjectFacade.java @@ -1,12 +1,12 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; import java.util.Date; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserInfoManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserInfoManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; public class ProjectFacade extends EntityFacade { @@ -40,7 +40,7 @@ public class ProjectFacade extends EntityFacade { public static int compareLastVisit(ProjectFacade project1, ProjectFacade project2) { User user = SecurityUtils.getUser(); if (user != null) { - UserInfoManager userInfoManager = TurboDev.getInstance(UserInfoManager.class); + UserInfoManager userInfoManager = OneDev.getInstance(UserInfoManager.class); UserFacade userFacade = user.getFacade(); Date date1 = userInfoManager.getVisitDate(userFacade, project1); Date date2 = userInfoManager.getVisitDate(userFacade, project2); diff --git a/core/src/main/java/com/turbodev/server/util/facade/UserAuthorizationFacade.java b/core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java similarity index 81% rename from core/src/main/java/com/turbodev/server/util/facade/UserAuthorizationFacade.java rename to core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java index 1e1e910bd7..f03d6aae88 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/UserAuthorizationFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/UserAuthorizationFacade.java @@ -1,7 +1,7 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.security.ProjectPrivilege; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.security.ProjectPrivilege; public class UserAuthorizationFacade extends EntityFacade { diff --git a/core/src/main/java/com/turbodev/server/util/facade/UserFacade.java b/core/src/main/java/io/onedev/server/util/facade/UserFacade.java similarity index 89% rename from core/src/main/java/com/turbodev/server/util/facade/UserFacade.java rename to core/src/main/java/io/onedev/server/util/facade/UserFacade.java index 7445782d98..dc134de83e 100644 --- a/core/src/main/java/com/turbodev/server/util/facade/UserFacade.java +++ b/core/src/main/java/io/onedev/server/util/facade/UserFacade.java @@ -1,9 +1,9 @@ -package com.turbodev.server.util.facade; +package io.onedev.server.util.facade; import javax.annotation.Nullable; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.model.User; +import io.onedev.server.model.User; +import io.onedev.utils.matchscore.MatchScoreUtils; public class UserFacade extends EntityFacade { diff --git a/core/src/main/java/io/onedev/server/util/jackson/DefaultView.java b/core/src/main/java/io/onedev/server/util/jackson/DefaultView.java new file mode 100644 index 0000000000..ae1bd2d277 --- /dev/null +++ b/core/src/main/java/io/onedev/server/util/jackson/DefaultView.java @@ -0,0 +1,5 @@ +package io.onedev.server.util.jackson; + +public class DefaultView { + +} diff --git a/core/src/main/java/com/turbodev/server/util/jackson/JsonOptions.java b/core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/jackson/JsonOptions.java rename to core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java index a19a349909..0deb0c44e9 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/JsonOptions.java +++ b/core/src/main/java/io/onedev/server/util/jackson/JsonOptions.java @@ -1,10 +1,11 @@ -package com.turbodev.server.util.jackson; +package io.onedev.server.util.jackson; import java.util.LinkedHashMap; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.launcher.loader.AppLoader; + +import io.onedev.launcher.loader.AppLoader; @SuppressWarnings("serial") public class JsonOptions extends LinkedHashMap { diff --git a/core/src/main/java/com/turbodev/server/util/jackson/ObjectMapperConfigurator.java b/core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java similarity index 77% rename from core/src/main/java/com/turbodev/server/util/jackson/ObjectMapperConfigurator.java rename to core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java index a0c99d3890..3ba6a82dd9 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/ObjectMapperConfigurator.java +++ b/core/src/main/java/io/onedev/server/util/jackson/ObjectMapperConfigurator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson; +package io.onedev.server.util.jackson; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/core/src/main/java/com/turbodev/server/util/jackson/ObjectMapperProvider.java b/core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java similarity index 98% rename from core/src/main/java/com/turbodev/server/util/jackson/ObjectMapperProvider.java rename to core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java index c8ef14de0c..9c721bdaec 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/ObjectMapperProvider.java +++ b/core/src/main/java/io/onedev/server/util/jackson/ObjectMapperProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson; +package io.onedev.server.util.jackson; import java.util.Collection; import java.util.Map; diff --git a/core/src/main/java/io/onedev/server/util/jackson/RestView.java b/core/src/main/java/io/onedev/server/util/jackson/RestView.java new file mode 100644 index 0000000000..6db5465299 --- /dev/null +++ b/core/src/main/java/io/onedev/server/util/jackson/RestView.java @@ -0,0 +1,5 @@ +package io.onedev.server.util.jackson; + +public class RestView { + +} diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/EntityDeserializer.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java similarity index 96% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/EntityDeserializer.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java index ea34d28fc9..a36ed2af5b 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/EntityDeserializer.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/EntityDeserializer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import java.io.IOException; @@ -13,8 +13,9 @@ import com.fasterxml.jackson.databind.deser.SettableAnyProperty; import com.fasterxml.jackson.databind.deser.SettableBeanProperty; import com.fasterxml.jackson.databind.deser.impl.PropertyValue; import com.google.common.base.Preconditions; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.dao.Dao; + +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.dao.Dao; @SuppressWarnings("serial") public class EntityDeserializer extends BeanDeserializer { diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java similarity index 92% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java index 17b3147daa..b5d08c471e 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import javax.persistence.ManyToOne; import javax.persistence.OneToMany; @@ -8,7 +8,8 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.AnnotationIntrospector; import com.fasterxml.jackson.databind.introspect.Annotated; import com.fasterxml.jackson.databind.introspect.AnnotatedMember; -import com.turbodev.server.model.AbstractEntity; + +import io.onedev.server.model.AbstractEntity; @SuppressWarnings("serial") public class HibernateAnnotationIntrospector extends AnnotationIntrospector { diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java similarity index 80% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java index c8b053fa5d..193fd6a875 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperConfigurator.java @@ -1,10 +1,11 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import javax.inject.Inject; import javax.inject.Singleton; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.server.util.jackson.ObjectMapperConfigurator; + +import io.onedev.server.util.jackson.ObjectMapperConfigurator; @Singleton public class HibernateObjectMapperConfigurator implements ObjectMapperConfigurator { diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateObjectMapperModule.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java similarity index 96% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateObjectMapperModule.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java index 8945b05aa7..823a7c20db 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateObjectMapperModule.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateObjectMapperModule.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import javax.inject.Inject; import javax.inject.Singleton; @@ -22,8 +22,9 @@ import com.fasterxml.jackson.databind.ser.std.CollectionSerializer; import com.fasterxml.jackson.databind.ser.std.MapSerializer; import com.fasterxml.jackson.databind.type.CollectionType; import com.fasterxml.jackson.databind.type.MapType; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.dao.Dao; + +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.dao.Dao; @Singleton public class HibernateObjectMapperModule extends Module { diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateProxySerializer.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateProxySerializer.java similarity index 98% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateProxySerializer.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateProxySerializer.java index e3fa18ef4f..73854fac5a 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/HibernateProxySerializer.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateProxySerializer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import java.io.IOException; diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/ManyToOneDeserializer.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/ManyToOneDeserializer.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java index 1873add191..459639bdf7 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/ManyToOneDeserializer.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import java.io.IOException; @@ -6,9 +6,10 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.dao.Dao; + +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.dao.Dao; @SuppressWarnings("serial") public final class ManyToOneDeserializer extends StdDeserializer { diff --git a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/ManyToOneSerializer.java b/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java similarity index 87% rename from core/src/main/java/com/turbodev/server/util/jackson/hibernate/ManyToOneSerializer.java rename to core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java index de62839153..6cbe8e7cc0 100644 --- a/core/src/main/java/com/turbodev/server/util/jackson/hibernate/ManyToOneSerializer.java +++ b/core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jackson.hibernate; +package io.onedev.server.util.jackson.hibernate; import java.io.IOException; @@ -6,7 +6,8 @@ import com.fasterxml.jackson.core.JsonGenerationException; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; -import com.turbodev.server.model.AbstractEntity; + +import io.onedev.server.model.AbstractEntity; public final class ManyToOneSerializer extends StdSerializer { diff --git a/core/src/main/java/com/turbodev/server/util/jetty/AssetServlet.java b/core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java similarity index 98% rename from core/src/main/java/com/turbodev/server/util/jetty/AssetServlet.java rename to core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java index 17b5a435b6..4403dc3c35 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/AssetServlet.java +++ b/core/src/main/java/io/onedev/server/util/jetty/AssetServlet.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import java.io.IOException; import java.net.URL; @@ -19,7 +19,7 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletMapping; import org.eclipse.jetty.util.resource.Resource; -import com.turbodev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.bootstrap.Bootstrap; /** * Asset servlet to serve static web assets with some default parameters. diff --git a/core/src/main/java/com/turbodev/server/util/jetty/ClasspathAssetServlet.java b/core/src/main/java/io/onedev/server/util/jetty/ClasspathAssetServlet.java similarity index 96% rename from core/src/main/java/com/turbodev/server/util/jetty/ClasspathAssetServlet.java rename to core/src/main/java/io/onedev/server/util/jetty/ClasspathAssetServlet.java index 2663af0d96..f70254764e 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/ClasspathAssetServlet.java +++ b/core/src/main/java/io/onedev/server/util/jetty/ClasspathAssetServlet.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import java.net.URL; diff --git a/core/src/main/java/com/turbodev/server/util/jetty/DefaultJettyRunner.java b/core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java similarity index 97% rename from core/src/main/java/com/turbodev/server/util/jetty/DefaultJettyRunner.java rename to core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java index 1ab99ba07c..55e383bebf 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/DefaultJettyRunner.java +++ b/core/src/main/java/io/onedev/server/util/jetty/DefaultJettyRunner.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import java.util.ArrayList; import java.util.Collections; @@ -16,10 +16,11 @@ import org.eclipse.jetty.server.handler.gzip.GzipHandler; import org.eclipse.jetty.servlet.ErrorPageErrorHandler; import org.eclipse.jetty.servlet.ServletContextHandler; -import com.turbodev.launcher.bootstrap.Bootstrap; import com.google.common.base.Throwables; import com.google.inject.servlet.GuiceFilter; +import io.onedev.launcher.bootstrap.Bootstrap; + @Singleton public class DefaultJettyRunner implements JettyRunner, Provider { diff --git a/core/src/main/java/com/turbodev/server/util/jetty/DisableTraceFilter.java b/core/src/main/java/io/onedev/server/util/jetty/DisableTraceFilter.java similarity index 96% rename from core/src/main/java/com/turbodev/server/util/jetty/DisableTraceFilter.java rename to core/src/main/java/io/onedev/server/util/jetty/DisableTraceFilter.java index d505966290..bf7dafa08d 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/DisableTraceFilter.java +++ b/core/src/main/java/io/onedev/server/util/jetty/DisableTraceFilter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import java.io.IOException; diff --git a/core/src/main/java/com/turbodev/server/util/jetty/FileAssetServlet.java b/core/src/main/java/io/onedev/server/util/jetty/FileAssetServlet.java similarity index 96% rename from core/src/main/java/com/turbodev/server/util/jetty/FileAssetServlet.java rename to core/src/main/java/io/onedev/server/util/jetty/FileAssetServlet.java index 65e5020bb9..1c82e88d77 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/FileAssetServlet.java +++ b/core/src/main/java/io/onedev/server/util/jetty/FileAssetServlet.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import java.io.File; import java.net.MalformedURLException; diff --git a/core/src/main/java/com/turbodev/server/util/jetty/JettyRunner.java b/core/src/main/java/io/onedev/server/util/jetty/JettyRunner.java similarity index 63% rename from core/src/main/java/com/turbodev/server/util/jetty/JettyRunner.java rename to core/src/main/java/io/onedev/server/util/jetty/JettyRunner.java index 9591dd121a..8d4ff297b4 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/JettyRunner.java +++ b/core/src/main/java/io/onedev/server/util/jetty/JettyRunner.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; public interface JettyRunner { diff --git a/core/src/main/java/com/turbodev/server/util/jetty/ServerConfigurator.java b/core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java similarity index 58% rename from core/src/main/java/com/turbodev/server/util/jetty/ServerConfigurator.java rename to core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java index 430b5424ca..151f400290 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/ServerConfigurator.java +++ b/core/src/main/java/io/onedev/server/util/jetty/ServerConfigurator.java @@ -1,8 +1,8 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import org.eclipse.jetty.server.Server; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface ServerConfigurator { diff --git a/core/src/main/java/com/turbodev/server/util/jetty/ServletConfigurator.java b/core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java similarity index 64% rename from core/src/main/java/com/turbodev/server/util/jetty/ServletConfigurator.java rename to core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java index 6f22246236..119ec4544b 100644 --- a/core/src/main/java/com/turbodev/server/util/jetty/ServletConfigurator.java +++ b/core/src/main/java/io/onedev/server/util/jetty/ServletConfigurator.java @@ -1,8 +1,8 @@ -package com.turbodev.server.util.jetty; +package io.onedev.server.util.jetty; import org.eclipse.jetty.servlet.ServletContextHandler; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface ServletConfigurator { diff --git a/core/src/main/java/com/turbodev/server/util/markdown/MarkdownProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java similarity index 66% rename from core/src/main/java/com/turbodev/server/util/markdown/MarkdownProcessor.java rename to core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java index fd5d6c4f22..4314e0c579 100644 --- a/core/src/main/java/com/turbodev/server/util/markdown/MarkdownProcessor.java +++ b/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java @@ -1,10 +1,10 @@ -package com.turbodev.server.util.markdown; +package io.onedev.server.util.markdown; import javax.annotation.Nullable; import org.jsoup.nodes.Document; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface MarkdownProcessor { diff --git a/core/src/main/java/com/turbodev/server/util/markdown/MentionParser.java b/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/markdown/MentionParser.java rename to core/src/main/java/io/onedev/server/util/markdown/MentionParser.java index f4820614e5..82147c514d 100644 --- a/core/src/main/java/com/turbodev/server/util/markdown/MentionParser.java +++ b/core/src/main/java/io/onedev/server/util/markdown/MentionParser.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.markdown; +package io.onedev.server.util.markdown; import java.util.Collection; import java.util.HashSet; @@ -11,11 +11,12 @@ import org.jsoup.nodes.TextNode; import org.jsoup.select.NodeTraversor; import com.google.common.collect.ImmutableSet; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.util.JsoupUtils; -import com.turbodev.server.util.TextNodeVisitor; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.util.JsoupUtils; +import io.onedev.server.util.TextNodeVisitor; public class MentionParser { @@ -44,7 +45,7 @@ public class MentionParser { NodeTraversor tranversor = new NodeTraversor(visitor); tranversor.traverse(document); - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); for (TextNode node : visitor.getMatchedNodes()) { Matcher matcher = PATTERN.matcher(node.getWholeText()); diff --git a/core/src/main/java/com/turbodev/server/util/markdown/PullRequestParser.java b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java similarity index 85% rename from core/src/main/java/com/turbodev/server/util/markdown/PullRequestParser.java rename to core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java index 3a8f98ff30..024c6730cd 100644 --- a/core/src/main/java/com/turbodev/server/util/markdown/PullRequestParser.java +++ b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.markdown; +package io.onedev.server.util.markdown; import java.util.Collection; import java.util.HashSet; @@ -11,11 +11,12 @@ import org.jsoup.nodes.TextNode; import org.jsoup.select.NodeTraversor; import com.google.common.collect.ImmutableSet; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.util.JsoupUtils; -import com.turbodev.server.util.TextNodeVisitor; + +import io.onedev.server.OneDev; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.util.JsoupUtils; +import io.onedev.server.util.TextNodeVisitor; public class PullRequestParser { @@ -44,7 +45,7 @@ public class PullRequestParser { NodeTraversor tranversor = new NodeTraversor(visitor); tranversor.traverse(document); - Dao dao = TurboDev.getInstance(Dao.class); + Dao dao = OneDev.getInstance(Dao.class); for (TextNode node : visitor.getMatchedNodes()) { Matcher matcher = PATTERN.matcher(node.getWholeText()); diff --git a/core/src/main/java/com/turbodev/server/util/reviewrequirement/InvalidReviewRuleException.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java similarity index 80% rename from core/src/main/java/com/turbodev/server/util/reviewrequirement/InvalidReviewRuleException.java rename to core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java index 0e5da37c9a..165d442b4c 100644 --- a/core/src/main/java/com/turbodev/server/util/reviewrequirement/InvalidReviewRuleException.java +++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/InvalidReviewRuleException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.reviewrequirement; +package io.onedev.server.util.reviewrequirement; public class InvalidReviewRuleException extends RuntimeException { diff --git a/core/src/main/java/com/turbodev/server/util/reviewrequirement/ReviewRequirement.java b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java similarity index 81% rename from core/src/main/java/com/turbodev/server/util/reviewrequirement/ReviewRequirement.java rename to core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java index 0717ebbbf3..bf14b271e7 100644 --- a/core/src/main/java/com/turbodev/server/util/reviewrequirement/ReviewRequirement.java +++ b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirement.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.reviewrequirement; +package io.onedev.server.util.reviewrequirement; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -12,16 +12,17 @@ import org.antlr.v4.runtime.BailErrorStrategy; import org.antlr.v4.runtime.CommonTokenStream; import org.antlr.v4.runtime.tree.TerminalNode; -import com.turbodev.server.util.reviewrequirement.ReviewRequirementSpecLexer; -import com.turbodev.server.util.reviewrequirement.ReviewRequirementSpecParser; -import com.turbodev.server.util.reviewrequirement.ReviewRequirementSpecParser.CountContext; -import com.turbodev.server.util.reviewrequirement.ReviewRequirementSpecParser.CriteriaContext; -import com.turbodev.server.util.reviewrequirement.ReviewRequirementSpecParser.SpecContext; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.User; +import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecLexer; +import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser; +import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser.CountContext; +import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser.CriteriaContext; +import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser.SpecContext; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.User; public class ReviewRequirement { @@ -35,7 +36,7 @@ public class ReviewRequirement { for (CriteriaContext criteriaContext: specContext.criteria()) { if (criteriaContext.userCriteria() != null) { String userName = getBracedValue(criteriaContext.userCriteria().Value()); - User user = TurboDev.getInstance(UserManager.class).findByName(userName); + User user = OneDev.getInstance(UserManager.class).findByName(userName); if (user != null) { if (!users.contains(user)) { users.add(user); @@ -47,7 +48,7 @@ public class ReviewRequirement { } } else if (criteriaContext.groupCriteria() != null) { String groupName = getBracedValue(criteriaContext.groupCriteria().Value()); - Group group = TurboDev.getInstance(GroupManager.class).find(groupName); + Group group = OneDev.getInstance(GroupManager.class).find(groupName); if (group != null) { if (!groups.containsKey(group)) { CountContext countContext = criteriaContext.groupCriteria().count(); diff --git a/core/src/main/java/com/turbodev/server/util/reviewrequirement/ReviewRequirementSpec.g4 b/core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirementSpec.g4 similarity index 100% rename from core/src/main/java/com/turbodev/server/util/reviewrequirement/ReviewRequirementSpec.g4 rename to core/src/main/java/io/onedev/server/util/reviewrequirement/ReviewRequirementSpec.g4 diff --git a/core/src/main/java/com/turbodev/server/util/serverconfig/ServerConfig.java b/core/src/main/java/io/onedev/server/util/serverconfig/ServerConfig.java similarity index 93% rename from core/src/main/java/com/turbodev/server/util/serverconfig/ServerConfig.java rename to core/src/main/java/io/onedev/server/util/serverconfig/ServerConfig.java index 1c8e2a5421..16f09d7f01 100644 --- a/core/src/main/java/com/turbodev/server/util/serverconfig/ServerConfig.java +++ b/core/src/main/java/io/onedev/server/util/serverconfig/ServerConfig.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.serverconfig; +package io.onedev.server.util.serverconfig; public interface ServerConfig { diff --git a/core/src/main/java/com/turbodev/server/util/serverconfig/SslConfig.java b/core/src/main/java/io/onedev/server/util/serverconfig/SslConfig.java similarity index 75% rename from core/src/main/java/com/turbodev/server/util/serverconfig/SslConfig.java rename to core/src/main/java/io/onedev/server/util/serverconfig/SslConfig.java index 4956c29069..c67dcfa492 100644 --- a/core/src/main/java/com/turbodev/server/util/serverconfig/SslConfig.java +++ b/core/src/main/java/io/onedev/server/util/serverconfig/SslConfig.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.serverconfig; +package io.onedev.server.util.serverconfig; public interface SslConfig { int getPort(); diff --git a/core/src/main/java/com/turbodev/server/util/validation/ClassValidatingValidator.java b/core/src/main/java/io/onedev/server/util/validation/ClassValidatingValidator.java similarity index 78% rename from core/src/main/java/com/turbodev/server/util/validation/ClassValidatingValidator.java rename to core/src/main/java/io/onedev/server/util/validation/ClassValidatingValidator.java index db451af9f2..e81af6ee44 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/ClassValidatingValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/ClassValidatingValidator.java @@ -1,9 +1,9 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.server.util.validation.annotation.ClassValidating; +import io.onedev.server.util.validation.annotation.ClassValidating; public class ClassValidatingValidator implements ConstraintValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/DefaultEntityValidator.java b/core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.java similarity index 90% rename from core/src/main/java/com/turbodev/server/util/validation/DefaultEntityValidator.java rename to core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.java index a70562ccf6..9401eb8b01 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/DefaultEntityValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/DefaultEntityValidator.java @@ -1,11 +1,11 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import javax.inject.Inject; import javax.inject.Singleton; import javax.validation.ConstraintViolation; import javax.validation.Validator; -import com.turbodev.server.model.AbstractEntity; +import io.onedev.server.model.AbstractEntity; @Singleton public class DefaultEntityValidator implements EntityValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/DirectoryValidator.java b/core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java similarity index 89% rename from core/src/main/java/com/turbodev/server/util/validation/DirectoryValidator.java rename to core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java index 7dd8533fdc..7af4b7f566 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/DirectoryValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/DirectoryValidator.java @@ -1,13 +1,13 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import java.io.File; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.utils.FileUtils; -import com.turbodev.server.util.validation.annotation.Directory; -import com.turbodev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.util.validation.annotation.Directory; +import io.onedev.utils.FileUtils; public class DirectoryValidator implements ConstraintValidator { diff --git a/core/src/main/java/io/onedev/server/util/validation/EntityValidator.java b/core/src/main/java/io/onedev/server/util/validation/EntityValidator.java new file mode 100644 index 0000000000..ade54ebfdb --- /dev/null +++ b/core/src/main/java/io/onedev/server/util/validation/EntityValidator.java @@ -0,0 +1,7 @@ +package io.onedev.server.util.validation; + +import io.onedev.server.model.AbstractEntity; + +public interface EntityValidator { + void validate(AbstractEntity entity); +} diff --git a/core/src/main/java/com/turbodev/server/util/validation/GroupNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java similarity index 90% rename from core/src/main/java/com/turbodev/server/util/validation/GroupNameValidator.java rename to core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java index eb7fe8bb4a..a0149bb4d9 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/GroupNameValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/GroupNameValidator.java @@ -1,11 +1,11 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import java.util.regex.Pattern; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.server.util.validation.annotation.GroupName; +import io.onedev.server.util.validation.annotation.GroupName; public class GroupNameValidator implements ConstraintValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/NameValidator.java b/core/src/main/java/io/onedev/server/util/validation/NameValidator.java similarity index 82% rename from core/src/main/java/com/turbodev/server/util/validation/NameValidator.java rename to core/src/main/java/io/onedev/server/util/validation/NameValidator.java index 961a6bbfd5..12bf7467fe 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/NameValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/NameValidator.java @@ -1,10 +1,10 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.util.validation.annotation.Name; +import io.onedev.server.util.validation.annotation.Name; +import io.onedev.utils.StringUtils; public class NameValidator implements ConstraintValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/ProjectNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java similarity index 90% rename from core/src/main/java/com/turbodev/server/util/validation/ProjectNameValidator.java rename to core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java index 3530968c33..54fbea5061 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/ProjectNameValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/ProjectNameValidator.java @@ -1,11 +1,11 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import java.util.regex.Pattern; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.server.util.validation.annotation.ProjectName; +import io.onedev.server.util.validation.annotation.ProjectName; public class ProjectNameValidator implements ConstraintValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/ReviewRequirementSpecValidator.java b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementSpecValidator.java similarity index 72% rename from core/src/main/java/com/turbodev/server/util/validation/ReviewRequirementSpecValidator.java rename to core/src/main/java/io/onedev/server/util/validation/ReviewRequirementSpecValidator.java index aefdb80c36..8e22bb4f78 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/ReviewRequirementSpecValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/ReviewRequirementSpecValidator.java @@ -1,11 +1,11 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.server.util.editable.annotation.ReviewRequirementSpec; -import com.turbodev.server.util.reviewrequirement.InvalidReviewRuleException; -import com.turbodev.server.util.reviewrequirement.ReviewRequirement; +import io.onedev.server.util.editable.annotation.ReviewRequirementSpec; +import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException; +import io.onedev.server.util.reviewrequirement.ReviewRequirement; public class ReviewRequirementSpecValidator implements ConstraintValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/UserNameValidator.java b/core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java similarity index 90% rename from core/src/main/java/com/turbodev/server/util/validation/UserNameValidator.java rename to core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java index 62c5dd153b..4313e3183a 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/UserNameValidator.java +++ b/core/src/main/java/io/onedev/server/util/validation/UserNameValidator.java @@ -1,11 +1,11 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import java.util.regex.Pattern; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; -import com.turbodev.server.util.validation.annotation.UserName; +import io.onedev.server.util.validation.annotation.UserName; public class UserNameValidator implements ConstraintValidator { diff --git a/core/src/main/java/com/turbodev/server/util/validation/Validatable.java b/core/src/main/java/io/onedev/server/util/validation/Validatable.java similarity index 76% rename from core/src/main/java/com/turbodev/server/util/validation/Validatable.java rename to core/src/main/java/io/onedev/server/util/validation/Validatable.java index 97253d81ff..81ddcc5940 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/Validatable.java +++ b/core/src/main/java/io/onedev/server/util/validation/Validatable.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import javax.validation.ConstraintValidatorContext; diff --git a/core/src/main/java/com/turbodev/server/util/validation/ValidatorProvider.java b/core/src/main/java/io/onedev/server/util/validation/ValidatorProvider.java similarity index 91% rename from core/src/main/java/com/turbodev/server/util/validation/ValidatorProvider.java rename to core/src/main/java/io/onedev/server/util/validation/ValidatorProvider.java index b7cfe09624..a753bf61b9 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/ValidatorProvider.java +++ b/core/src/main/java/io/onedev/server/util/validation/ValidatorProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation; +package io.onedev.server.util.validation; import javax.inject.Inject; import javax.inject.Provider; diff --git a/core/src/main/java/com/turbodev/server/util/validation/annotation/ClassValidating.java b/core/src/main/java/io/onedev/server/util/validation/annotation/ClassValidating.java similarity index 83% rename from core/src/main/java/com/turbodev/server/util/validation/annotation/ClassValidating.java rename to core/src/main/java/io/onedev/server/util/validation/annotation/ClassValidating.java index 60ec0cb0d7..86026fd419 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/annotation/ClassValidating.java +++ b/core/src/main/java/io/onedev/server/util/validation/annotation/ClassValidating.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation.annotation; +package io.onedev.server.util.validation.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -9,7 +9,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.ClassValidatingValidator; +import io.onedev.server.util.validation.ClassValidatingValidator; @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) diff --git a/core/src/main/java/com/turbodev/server/util/validation/annotation/Directory.java b/core/src/main/java/io/onedev/server/util/validation/annotation/Directory.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/validation/annotation/Directory.java rename to core/src/main/java/io/onedev/server/util/validation/annotation/Directory.java index f68654de4c..eec1fd0f03 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/annotation/Directory.java +++ b/core/src/main/java/io/onedev/server/util/validation/annotation/Directory.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation.annotation; +package io.onedev.server.util.validation.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.DirectoryValidator; +import io.onedev.server.util.validation.DirectoryValidator; /** * @author robin diff --git a/core/src/main/java/com/turbodev/server/util/validation/annotation/GroupName.java b/core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.java similarity index 81% rename from core/src/main/java/com/turbodev/server/util/validation/annotation/GroupName.java rename to core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.java index 6754dc5894..748ecd83a1 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/annotation/GroupName.java +++ b/core/src/main/java/io/onedev/server/util/validation/annotation/GroupName.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation.annotation; +package io.onedev.server.util.validation.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.GroupNameValidator; +import io.onedev.server.util.validation.GroupNameValidator; @Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/core/src/main/java/com/turbodev/server/util/validation/annotation/Name.java b/core/src/main/java/io/onedev/server/util/validation/annotation/Name.java similarity index 84% rename from core/src/main/java/com/turbodev/server/util/validation/annotation/Name.java rename to core/src/main/java/io/onedev/server/util/validation/annotation/Name.java index b85c2bb7d5..fbaefe55ee 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/annotation/Name.java +++ b/core/src/main/java/io/onedev/server/util/validation/annotation/Name.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation.annotation; +package io.onedev.server.util.validation.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.NameValidator; +import io.onedev.server.util.validation.NameValidator; /** * @author robin diff --git a/core/src/main/java/com/turbodev/server/util/validation/annotation/ProjectName.java b/core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.java similarity index 81% rename from core/src/main/java/com/turbodev/server/util/validation/annotation/ProjectName.java rename to core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.java index b8e4007bba..1b7a4dd85f 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/annotation/ProjectName.java +++ b/core/src/main/java/io/onedev/server/util/validation/annotation/ProjectName.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation.annotation; +package io.onedev.server.util.validation.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.ProjectNameValidator; +import io.onedev.server.util.validation.ProjectNameValidator; @Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/core/src/main/java/com/turbodev/server/util/validation/annotation/UserName.java b/core/src/main/java/io/onedev/server/util/validation/annotation/UserName.java similarity index 81% rename from core/src/main/java/com/turbodev/server/util/validation/annotation/UserName.java rename to core/src/main/java/io/onedev/server/util/validation/annotation/UserName.java index 6f2bb9bde9..b66cfc552e 100644 --- a/core/src/main/java/com/turbodev/server/util/validation/annotation/UserName.java +++ b/core/src/main/java/io/onedev/server/util/validation/annotation/UserName.java @@ -1,4 +1,4 @@ -package com.turbodev.server.util.validation.annotation; +package io.onedev.server.util.validation.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -8,7 +8,7 @@ import java.lang.annotation.Target; import javax.validation.Constraint; import javax.validation.Payload; -import com.turbodev.server.util.validation.UserNameValidator; +import io.onedev.server.util.validation.UserNameValidator; @Target({ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java b/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java index ab489b50f3..6bb57b0283 100644 --- a/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java +++ b/core/src/main/java/org/eclipse/jgit/revwalk/LastCommitsOfChildren.java @@ -26,9 +26,10 @@ import org.eclipse.jgit.treewalk.TreeWalk; import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.eclipse.jgit.util.RawParseUtils; -import com.turbodev.utils.StringUtils; import com.google.common.base.Throwables; -import com.turbodev.server.git.GitUtils; + +import io.onedev.server.git.GitUtils; +import io.onedev.utils.StringUtils; /** * This class calculates last commits of children of a git tree. diff --git a/core/src/main/resources/git-receive-hook b/core/src/main/resources/git-receive-hook index 58bf5f315e..583fc515d9 100644 --- a/core/src/main/resources/git-receive-hook +++ b/core/src/main/resources/git-receive-hook @@ -1,6 +1,6 @@ #!/bin/bash IFS=$'\r\n'; -lines=($(${TURBODEV_CURL} -k -s -S -f -X POST --data-urlencode "ENV_GIT_ALTERNATE_OBJECT_DIRECTORIES=${GIT_ALTERNATE_OBJECT_DIRECTORIES}" --data-urlencode "ENV_GIT_OBJECT_DIRECTORY=${GIT_OBJECT_DIRECTORY}" --data-urlencode "ENV_GIT_QUARANTINE_PATH=${GIT_QUARANTINE_PATH}" -d @- ${TURBODEV_URL}/%s/${TURBODEV_REPOSITORY_ID}/${TURBODEV_USER_ID} 2>&1)) +lines=($(${ONEDEV_CURL} -k -s -S -f -X POST --data-urlencode "ENV_GIT_ALTERNATE_OBJECT_DIRECTORIES=${GIT_ALTERNATE_OBJECT_DIRECTORIES}" --data-urlencode "ENV_GIT_OBJECT_DIRECTORY=${GIT_OBJECT_DIRECTORY}" --data-urlencode "ENV_GIT_QUARANTINE_PATH=${GIT_QUARANTINE_PATH}" -d @- ${ONEDEV_URL}/%s/${ONEDEV_REPOSITORY_ID}/${ONEDEV_USER_ID} 2>&1)) returnCode=0; diff --git a/core/src/test/java/com/turbodev/server/git/AbstractGitTest.java b/core/src/test/java/io/onedev/server/git/AbstractGitTest.java similarity index 91% rename from core/src/test/java/com/turbodev/server/git/AbstractGitTest.java rename to core/src/test/java/io/onedev/server/git/AbstractGitTest.java index cd76b0b469..d45cbf3e62 100644 --- a/core/src/test/java/com/turbodev/server/git/AbstractGitTest.java +++ b/core/src/test/java/io/onedev/server/git/AbstractGitTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import java.io.File; import java.io.IOException; @@ -16,12 +16,12 @@ import org.eclipse.jgit.lib.RefUpdate; import org.junit.Assert; import org.mockito.Mockito; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.launcher.loader.AppLoaderMocker; -import com.turbodev.utils.FileUtils; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.GitCommand; -import com.turbodev.server.git.config.GitConfig; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoaderMocker; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.GitCommand; +import io.onedev.server.git.config.GitConfig; +import io.onedev.utils.FileUtils; public abstract class AbstractGitTest extends AppLoaderMocker { diff --git a/core/src/test/java/com/turbodev/server/git/BlobEditsTest.java b/core/src/test/java/io/onedev/server/git/BlobEditsTest.java similarity index 97% rename from core/src/test/java/com/turbodev/server/git/BlobEditsTest.java rename to core/src/test/java/io/onedev/server/git/BlobEditsTest.java index fb599bc556..a049f2e135 100644 --- a/core/src/test/java/com/turbodev/server/git/BlobEditsTest.java +++ b/core/src/test/java/io/onedev/server/git/BlobEditsTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -21,12 +21,13 @@ import org.junit.Test; import com.google.common.collect.Maps; import com.google.common.collect.Sets; -import com.turbodev.server.git.BlobContent; -import com.turbodev.server.git.BlobEdits; -import com.turbodev.server.git.exception.NotTreeException; -import com.turbodev.server.git.exception.ObjectAlreadyExistsException; -import com.turbodev.server.git.exception.ObjectNotFoundException; -import com.turbodev.server.git.exception.ObsoleteCommitException; + +import io.onedev.server.git.BlobContent; +import io.onedev.server.git.BlobEdits; +import io.onedev.server.git.exception.NotTreeException; +import io.onedev.server.git.exception.ObjectAlreadyExistsException; +import io.onedev.server.git.exception.ObjectNotFoundException; +import io.onedev.server.git.exception.ObsoleteCommitException; public class BlobEditsTest extends AbstractGitTest { diff --git a/core/src/test/java/com/turbodev/server/git/GitUtilsTest.java b/core/src/test/java/io/onedev/server/git/GitUtilsTest.java similarity index 98% rename from core/src/test/java/com/turbodev/server/git/GitUtilsTest.java rename to core/src/test/java/io/onedev/server/git/GitUtilsTest.java index 92a892cfa1..0505e0b34e 100644 --- a/core/src/test/java/com/turbodev/server/git/GitUtilsTest.java +++ b/core/src/test/java/io/onedev/server/git/GitUtilsTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; @@ -13,7 +13,8 @@ import org.eclipse.jgit.treewalk.TreeWalk; import org.junit.Test; import com.google.common.collect.Sets; -import com.turbodev.server.git.GitUtils; + +import io.onedev.server.git.GitUtils; public class GitUtilsTest extends AbstractGitTest { diff --git a/core/src/test/java/com/turbodev/server/git/GitVersionTest.java b/core/src/test/java/io/onedev/server/git/GitVersionTest.java similarity index 93% rename from core/src/test/java/com/turbodev/server/git/GitVersionTest.java rename to core/src/test/java/io/onedev/server/git/GitVersionTest.java index 0b2263bf34..c608d81b8e 100644 --- a/core/src/test/java/com/turbodev/server/git/GitVersionTest.java +++ b/core/src/test/java/io/onedev/server/git/GitVersionTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git; +package io.onedev.server.git; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -6,7 +6,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import com.turbodev.server.git.GitVersion; +import io.onedev.server.git.GitVersion; public class GitVersionTest { diff --git a/core/src/test/java/com/turbodev/server/git/command/BlameCommandTest.java b/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java similarity index 90% rename from core/src/test/java/com/turbodev/server/git/command/BlameCommandTest.java rename to core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java index 754416ddd2..b264d79b5c 100644 --- a/core/src/test/java/com/turbodev/server/git/command/BlameCommandTest.java +++ b/core/src/test/java/io/onedev/server/git/command/BlameCommandTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import static org.junit.Assert.assertEquals; @@ -6,10 +6,10 @@ import java.util.Collection; import org.junit.Test; -import com.turbodev.utils.Range; -import com.turbodev.server.git.BlameBlock; -import com.turbodev.server.git.command.BlameCommand; -import com.turbodev.server.git.AbstractGitTest; +import io.onedev.server.git.AbstractGitTest; +import io.onedev.server.git.BlameBlock; +import io.onedev.server.git.command.BlameCommand; +import io.onedev.utils.Range; public class BlameCommandTest extends AbstractGitTest { diff --git a/core/src/test/java/com/turbodev/server/git/command/LogCommandTest.java b/core/src/test/java/io/onedev/server/git/command/LogCommandTest.java similarity index 92% rename from core/src/test/java/com/turbodev/server/git/command/LogCommandTest.java rename to core/src/test/java/io/onedev/server/git/command/LogCommandTest.java index 2853fcc250..022de7a836 100644 --- a/core/src/test/java/com/turbodev/server/git/command/LogCommandTest.java +++ b/core/src/test/java/io/onedev/server/git/command/LogCommandTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.git.command; +package io.onedev.server.git.command; import static org.junit.Assert.assertEquals; @@ -8,7 +8,10 @@ import java.util.List; import org.junit.Test; import com.google.common.collect.Lists; -import com.turbodev.server.git.AbstractGitTest; + +import io.onedev.server.git.AbstractGitTest; +import io.onedev.server.git.command.GitCommit; +import io.onedev.server.git.command.LogCommand; public class LogCommandTest extends AbstractGitTest { diff --git a/core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java b/core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java index 57604e0b0c..df6ef90653 100644 --- a/core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java +++ b/core/src/test/java/org/eclipse/jgit/revwalk/LastCommitsOfChildrenTest.java @@ -9,7 +9,7 @@ import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Cache; import org.eclipse.jgit.revwalk.LastCommitsOfChildren.Value; import org.junit.Test; -import com.turbodev.server.git.AbstractGitTest; +import io.onedev.server.git.AbstractGitTest; public class LastCommitsOfChildrenTest extends AbstractGitTest { diff --git a/license.txt b/license.txt index cc9d4a61a0..49dd0a815f 100644 --- a/license.txt +++ b/license.txt @@ -1,17 +1,17 @@ -License Agreement for TurboDev Source Code +License Agreement for OneDev Source Code -This is a legal agreement between you and TurboDev Pty covering your -use of TurboDev source code (the "Source"). Be sure to read the +This is a legal agreement between you and OneDev Pty covering your +use of OneDev source code (the "Source"). Be sure to read the following agreement before using the Source. BY USING THE SOURCE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT.IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT USE THE SOURCE AND DESTROY ALL COPIES IN YOUR POSSESSION. -The Source is owned by TurboDev Pty and is protected by international +The Source is owned by OneDev Pty and is protected by international treaty provisions. Therefore, you must treat the Source like any other copyrighted material (e. g., a book or musical recording). You may not redistribute the Source, or make any software competing -with TurboDev based on the Source. +with OneDev based on the Source. -Copyright (C) 2016-2018 by TurboDev Pty All rights reserved. \ No newline at end of file +Copyright (C) 2016-2018 by OneDev Pty All rights reserved. \ No newline at end of file diff --git a/pom.xml b/pom.xml index c3cebeab1d..400ab6e113 100644 --- a/pom.xml +++ b/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - com.turbodev + io.onedev launcher 1.0.0 ../launcher server-parent - 1.0.1-build110 + 1.0.2-build111 pom @@ -198,12 +198,12 @@ - com.turbodev + io.onedev launcher-loader ${launcher.version} - com.turbodev + io.onedev launcher-loader ${launcher.version} test-jar diff --git a/product/.project b/product/.project index 27b0e7ea11..82b9f121a2 100644 --- a/product/.project +++ b/product/.project @@ -1,6 +1,6 @@ - TurboDev + OneDev diff --git a/product/build/jsw/wrapper.conf b/product/build/jsw/wrapper.conf index 7a209adc0e..13945b0a0c 100644 --- a/product/build/jsw/wrapper.conf +++ b/product/build/jsw/wrapper.conf @@ -35,7 +35,7 @@ wrapper.lang.folder=../lang wrapper.restart.reload_configuration=TRUE -wrapper.pidfile=../status/turbodev.pid +wrapper.pidfile=../status/onedev.pid wrapper.single_invocation=TRUE #******************************************************************** diff --git a/product/build/package.gant b/product/build/package.gant index 6fea61e084..ef0579f659 100644 --- a/product/build/package.gant +++ b/product/build/package.gant @@ -5,9 +5,9 @@ target(default:"package the product") { // do not change this line of code chmod(dir: sandboxDir, perm: "755", includes: "${executables}") - File destFile = new File(buildDir, "turbodev-${productVersion}.zip"); + File destFile = new File(buildDir, "onedev-${productVersion}.zip"); zip(destfile: destFile) { - zipfileset(dir: sandboxDir, prefix: "turbodev-${productVersion}", excludes: "${executables}, boot/system.classpath") - zipfileset(dir: sandboxDir, prefix: "turbodev-${productVersion}", includes: "${executables}", filemode: "755") + zipfileset(dir: sandboxDir, prefix: "onedev-${productVersion}", excludes: "${executables}, boot/system.classpath") + zipfileset(dir: sandboxDir, prefix: "onedev-${productVersion}", includes: "${executables}", filemode: "755") } } diff --git a/product/build/prepare_package.gant b/product/build/prepare_package.gant index 3ee41244e0..3e3a36dde2 100644 --- a/product/build/prepare_package.gant +++ b/product/build/prepare_package.gant @@ -17,9 +17,9 @@ target(default:"prepare to package the product") { } filterset(id: "appFilterSet") { - filter(token: "app.name", value: "turbodev") - filter(token: "app.long.name", value: "TurboDev") - filter(token: "app.description", value: "TurboDev") + filter(token: "app.name", value: "onedev") + filter(token: "app.long.name", value: "OneDev") + filter(token: "app.description", value: "OneDev") filter(token: "app.class", value: "${bootstrapClass}") } filterset(id: "batchCommandCommonFilterSet") { @@ -33,37 +33,37 @@ target(default:"prepare to package the product") { copy(tofile: binDir.absolutePath + "/server.bat", file: "${jswPath}/AppCommand.bat.in") { filterset() { filter(token: "set_fixed_command", value: "") - filter(token: "properties_and_parameters", value: "wrapper.pidfile=../status/turbodev.pid") + filter(token: "properties_and_parameters", value: "wrapper.pidfile=../status/onedev.pid") } } copy(tofile: binDir.absolutePath + "/restore.bat", file: "${jswPath}/AppCommand.bat.in") { filterset(refid: "batchCommandCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"TurboDev Restore\" wrapper.pidfile=turbodev_restore.pid wrapper.name=turbodev_restore wrapper.displayname=\"TurboDev Restore\" wrapper.description=\"TurboDev Restore\" -- restore") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"OneDev Restore\" wrapper.pidfile=onedev_restore.pid wrapper.name=onedev_restore wrapper.displayname=\"OneDev Restore\" wrapper.description=\"OneDev Restore\" -- restore") } } copy(tofile: binDir.absolutePath + "/backup.bat", file: "${jswPath}/AppCommand.bat.in") { filterset(refid: "batchCommandCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"TurboDev Backup\" wrapper.pidfile=turbodev_backup.pid wrapper.name=turbodev_backup wrapper.displayname=\"TurboDev Backup\" wrapper.description=\"TurboDev Backup\" -- backup") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"OneDev Backup\" wrapper.pidfile=onedev_backup.pid wrapper.name=onedev_backup wrapper.displayname=\"OneDev Backup\" wrapper.description=\"OneDev Backup\" -- backup") } } copy(tofile: binDir.absolutePath + "/upgrade.bat", file: "${jswPath}/AppCommand.bat.in") { filterset(refid: "batchCommandCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"TurboDev Upgrade\" wrapper.pidfile=turbodev_upgrade.pid wrapper.name=turbodev_upgrade wrapper.displayname=\"TurboDev Upgrade\" wrapper.description=\"TurboDev Upgrade\" -- upgrade") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"OneDev Upgrade\" wrapper.pidfile=onedev_upgrade.pid wrapper.name=onedev_upgrade wrapper.displayname=\"OneDev Upgrade\" wrapper.description=\"OneDev Upgrade\" -- upgrade") } } copy(tofile: binDir.absolutePath + "/apply_db_constraints.bat", file: "${jswPath}/AppCommand.bat.in") { filterset(refid: "batchCommandCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"TurboDev Apply DB Constraints\" wrapper.pidfile=turbodev_apply_db_constraints.pid wrapper.name=turbodev_apply_db_constraints wrapper.displayname=\"TurboDev Apply DB Constraints\" wrapper.description=\"TurboDev Apply DB Constraints\" -- apply_db_constraints") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"OneDev Apply DB Constraints\" wrapper.pidfile=onedev_apply_db_constraints.pid wrapper.name=onedev_apply_db_constraints wrapper.displayname=\"OneDev Apply DB Constraints\" wrapper.description=\"OneDev Apply DB Constraints\" -- apply_db_constraints") } } copy(tofile: binDir.absolutePath + "/reset_admin_password.bat", file: "${jswPath}/AppCommand.bat.in") { filterset(refid: "batchCommandCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"TurboDev Reset Admin Password\" wrapper.pidfile=turbodev_reset_admin_password.pid wrapper.name=turbodev_reset_admin_password wrapper.displayname=\"TurboDev Reset Admin Password\" wrapper.description=\"TurboDev Reset Admin Password\" -- reset_admin_password") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title=\"OneDev Reset Admin Password\" wrapper.pidfile=onedev_reset_admin_password.pid wrapper.name=onedev_reset_admin_password wrapper.displayname=\"OneDev Reset Admin Password\" wrapper.description=\"OneDev Reset Admin Password\" -- reset_admin_password") } } @@ -77,62 +77,62 @@ target(default:"prepare to package the product") { } copy(tofile: binDir.absolutePath + "/restore.sh", file: "${jswPath}/sh.script.in") { filterset() { - filter(token: "app.name", value: "turbodev_restore") - filter(token: "app.long.name", value: "TurboDev Restore") - filter(token: "app.description", value: "TurboDev Restore") + filter(token: "app.name", value: "onedev_restore") + filter(token: "app.long.name", value: "OneDev Restore") + filter(token: "app.description", value: "OneDev Restore") filter(token: "app.class", value: "${bootstrapClass}") } filterset(refid: "shellScriptCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='TurboDev Restore' wrapper.name=turbodev_restore wrapper.displayname='TurboDev Restore' wrapper.description='TurboDev Restore' -- restore") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev Restore' wrapper.name=onedev_restore wrapper.displayname='OneDev Restore' wrapper.description='OneDev Restore' -- restore") } } copy(tofile: binDir.absolutePath + "/backup.sh", file: "${jswPath}/sh.script.in") { filterset() { - filter(token: "app.name", value: "turbodev_backup") - filter(token: "app.long.name", value: "TurboDev Backup") - filter(token: "app.description", value: "TurboDev Backup") + filter(token: "app.name", value: "onedev_backup") + filter(token: "app.long.name", value: "OneDev Backup") + filter(token: "app.description", value: "OneDev Backup") filter(token: "app.class", value: "${bootstrapClass}") } filterset(refid: "shellScriptCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='TurboDev Backup' wrapper.name=turbodev_backup wrapper.displayname='TurboDev Backup' wrapper.description='TurboDev Backup' -- backup") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev Backup' wrapper.name=onedev_backup wrapper.displayname='OneDev Backup' wrapper.description='OneDev Backup' -- backup") } } copy(tofile: binDir.absolutePath + "/upgrade.sh", file: "${jswPath}/sh.script.in") { filterset() { - filter(token: "app.name", value: "turbodev_upgrade") - filter(token: "app.long.name", value: "TurboDev Upgrade") - filter(token: "app.description", value: "TurboDev Upgrade") + filter(token: "app.name", value: "onedev_upgrade") + filter(token: "app.long.name", value: "OneDev Upgrade") + filter(token: "app.description", value: "OneDev Upgrade") filter(token: "app.class", value: "${bootstrapClass}") } filterset(refid: "shellScriptCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='TurboDev Upgrade' wrapper.name=turbodev_upgrade wrapper.displayname='TurboDev Upgrade' wrapper.description='TurboDev Upgrade' -- upgrade") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev Upgrade' wrapper.name=onedev_upgrade wrapper.displayname='OneDev Upgrade' wrapper.description='OneDev Upgrade' -- upgrade") } } copy(tofile: binDir.absolutePath + "/apply_db_constraints.sh", file: "${jswPath}/sh.script.in") { filterset() { - filter(token: "app.name", value: "turbodev_apply_db_constraints") - filter(token: "app.long.name", value: "TurboDev Apply DB Constraints") - filter(token: "app.description", value: "TurboDev Apply DB Constraints") + filter(token: "app.name", value: "onedev_apply_db_constraints") + filter(token: "app.long.name", value: "OneDev Apply DB Constraints") + filter(token: "app.description", value: "OneDev Apply DB Constraints") filter(token: "app.class", value: "${bootstrapClass}") } filterset(refid: "shellScriptCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='TurboDev Apply DB Constraints' wrapper.name=turbodev_apply_db_constraints wrapper.displayname='TurboDev Apply DB Constraints' wrapper.description='TurboDev Apply DB Constraints' -- apply_db_constraints") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev Apply DB Constraints' wrapper.name=onedev_apply_db_constraints wrapper.displayname='OneDev Apply DB Constraints' wrapper.description='OneDev Apply DB Constraints' -- apply_db_constraints") } } copy(tofile: binDir.absolutePath + "/reset_admin_password.sh", file: "${jswPath}/sh.script.in") { filterset() { - filter(token: "app.name", value: "turbodev_reset_admin_password") - filter(token: "app.long.name", value: "TurboDev Reset Admin Password") - filter(token: "app.description", value: "TurboDev Reset Admin Password") + filter(token: "app.name", value: "onedev_reset_admin_password") + filter(token: "app.long.name", value: "OneDev Reset Admin Password") + filter(token: "app.description", value: "OneDev Reset Admin Password") filter(token: "app.class", value: "${bootstrapClass}") } filterset(refid: "shellScriptCommonFilterSet") filterset() { - filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='TurboDev Reset Admin Password' wrapper.name=turbodev_reset_admin_password wrapper.displayname='TurboDev Reset Admin Password' wrapper.description='TurboDev Reset Admin Password' -- reset_admin_password") + filter(token: "properties_and_parameters", value: "wrapper.logfile.loglevel=NONE wrapper.console.title='OneDev Reset Admin Password' wrapper.name=onedev_reset_admin_password wrapper.displayname='OneDev Reset Admin Password' wrapper.description='OneDev Reset Admin Password' -- reset_admin_password") } } diff --git a/product/pom.xml b/product/pom.xml index e69a2002c5..b4a000c028 100644 --- a/product/pom.xml +++ b/product/pom.xml @@ -3,14 +3,14 @@ 4.0.0 server-product - com.turbodev + io.onedev server-parent - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev plugin-maven @@ -92,30 +92,30 @@ - com.turbodev + io.onedev server-core - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev server-web - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev server-rest - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev server-search - 1.0.1-build110 + 1.0.2-build111 bin/*.sh, boot/wrapper-* - com.turbodev.launcher.bootstrap.Bootstrap - com.turbodev.server.product.ProductModule + io.onedev.launcher.bootstrap.Bootstrap + io.onedev.server.product.ProductModule true \ No newline at end of file diff --git a/product/src/main/java/com/turbodev/server/product/DefaultServerConfig.java b/product/src/main/java/io/onedev/server/product/DefaultServerConfig.java similarity index 91% rename from product/src/main/java/com/turbodev/server/product/DefaultServerConfig.java rename to product/src/main/java/io/onedev/server/product/DefaultServerConfig.java index 157bc86f38..881b0f12b7 100644 --- a/product/src/main/java/com/turbodev/server/product/DefaultServerConfig.java +++ b/product/src/main/java/io/onedev/server/product/DefaultServerConfig.java @@ -1,14 +1,14 @@ -package com.turbodev.server.product; +package io.onedev.server.product; import java.io.File; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.util.serverconfig.ServerConfig; -import com.turbodev.server.util.serverconfig.SslConfig; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.utils.StringUtils; +import io.onedev.server.util.serverconfig.ServerConfig; +import io.onedev.server.util.serverconfig.SslConfig; @Singleton public class DefaultServerConfig implements ServerConfig { diff --git a/product/src/main/java/com/turbodev/server/product/ProductConfigurator.java b/product/src/main/java/io/onedev/server/product/ProductConfigurator.java similarity index 88% rename from product/src/main/java/com/turbodev/server/product/ProductConfigurator.java rename to product/src/main/java/io/onedev/server/product/ProductConfigurator.java index fa0c3e6173..eb916968de 100644 --- a/product/src/main/java/com/turbodev/server/product/ProductConfigurator.java +++ b/product/src/main/java/io/onedev/server/product/ProductConfigurator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.product; +package io.onedev.server.product; import javax.inject.Inject; @@ -9,9 +9,9 @@ import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; import org.eclipse.jetty.util.ssl.SslContextFactory; -import com.turbodev.server.util.jetty.ServerConfigurator; -import com.turbodev.server.util.serverconfig.ServerConfig; -import com.turbodev.server.util.serverconfig.SslConfig; +import io.onedev.server.util.jetty.ServerConfigurator; +import io.onedev.server.util.serverconfig.ServerConfig; +import io.onedev.server.util.serverconfig.SslConfig; public class ProductConfigurator implements ServerConfigurator { diff --git a/product/src/main/java/com/turbodev/server/product/ProductModule.java b/product/src/main/java/io/onedev/server/product/ProductModule.java similarity index 69% rename from product/src/main/java/com/turbodev/server/product/ProductModule.java rename to product/src/main/java/io/onedev/server/product/ProductModule.java index c912a44a03..922f07497d 100644 --- a/product/src/main/java/com/turbodev/server/product/ProductModule.java +++ b/product/src/main/java/io/onedev/server/product/ProductModule.java @@ -1,17 +1,17 @@ -package com.turbodev.server.product; +package io.onedev.server.product; import java.io.File; import org.hibernate.cfg.Environment; -import com.turbodev.launcher.loader.AbstractPluginModule; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.persistence.HibernateProperties; -import com.turbodev.server.util.jetty.ServerConfigurator; -import com.turbodev.server.util.jetty.ServletConfigurator; -import com.turbodev.server.util.serverconfig.ServerConfig; +import io.onedev.launcher.loader.AbstractPluginModule; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.utils.FileUtils; +import io.onedev.utils.StringUtils; +import io.onedev.server.persistence.HibernateProperties; +import io.onedev.server.util.jetty.ServerConfigurator; +import io.onedev.server.util.jetty.ServletConfigurator; +import io.onedev.server.util.serverconfig.ServerConfig; public class ProductModule extends AbstractPluginModule { diff --git a/product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.java b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java similarity index 84% rename from product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.java rename to product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java index 218df2b4c7..bf9a1b2e4f 100644 --- a/product/src/main/java/com/turbodev/server/product/ProductServletConfigurator.java +++ b/product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.product; +package io.onedev.server.product; import java.util.EnumSet; @@ -16,18 +16,18 @@ import org.eclipse.jetty.servlet.ServletContextHandler; import org.eclipse.jetty.servlet.ServletHolder; import org.glassfish.jersey.servlet.ServletContainer; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.server.git.GitFilter; -import com.turbodev.server.git.GitPostReceiveCallback; -import com.turbodev.server.git.GitPreReceiveCallback; -import com.turbodev.server.security.TurboDevWebEnvironment; -import com.turbodev.server.util.jetty.ClasspathAssetServlet; -import com.turbodev.server.util.jetty.FileAssetServlet; -import com.turbodev.server.util.jetty.ServletConfigurator; -import com.turbodev.server.util.serverconfig.ServerConfig; -import com.turbodev.server.web.component.markdown.AttachmentUploadServlet; -import com.turbodev.server.web.img.Img; -import com.turbodev.server.web.websocket.WebSocketManager; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.git.GitFilter; +import io.onedev.server.git.GitPostReceiveCallback; +import io.onedev.server.git.GitPreReceiveCallback; +import io.onedev.server.security.OneDevWebEnvironment; +import io.onedev.server.util.jetty.ClasspathAssetServlet; +import io.onedev.server.util.jetty.FileAssetServlet; +import io.onedev.server.util.jetty.ServletConfigurator; +import io.onedev.server.util.serverconfig.ServerConfig; +import io.onedev.server.web.component.markdown.AttachmentUploadServlet; +import io.onedev.server.web.img.Img; +import io.onedev.server.web.websocket.WebSocketManager; public class ProductServletConfigurator implements ServletConfigurator { @@ -67,7 +67,7 @@ public class ProductServletConfigurator implements ServletConfigurator { context.getSessionHandler().getSessionManager().setMaxInactiveInterval(serverConfig.getSessionTimeout()); - context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, TurboDevWebEnvironment.class.getName()); + context.setInitParameter(EnvironmentLoader.ENVIRONMENT_CLASS_PARAM, OneDevWebEnvironment.class.getName()); context.addEventListener(new EnvironmentLoaderListener()); FilterHolder shiroFilterHolder = new FilterHolder(shiroFilter); context.addFilter(shiroFilterHolder, "/*", EnumSet.allOf(DispatcherType.class)); diff --git a/product/src/main/java/com/turbodev/server/product/ServerProperties.java b/product/src/main/java/io/onedev/server/product/ServerProperties.java similarity index 89% rename from product/src/main/java/com/turbodev/server/product/ServerProperties.java rename to product/src/main/java/io/onedev/server/product/ServerProperties.java index 541f1ae059..cee74f49bd 100644 --- a/product/src/main/java/com/turbodev/server/product/ServerProperties.java +++ b/product/src/main/java/io/onedev/server/product/ServerProperties.java @@ -1,4 +1,4 @@ -package com.turbodev.server.product; +package io.onedev.server.product; import java.util.Map; import java.util.Properties; diff --git a/product/src/main/java/com/turbodev/server/product/SslConfigBean.java b/product/src/main/java/io/onedev/server/product/SslConfigBean.java similarity index 90% rename from product/src/main/java/com/turbodev/server/product/SslConfigBean.java rename to product/src/main/java/io/onedev/server/product/SslConfigBean.java index be19149bb3..fd83c11f0b 100644 --- a/product/src/main/java/com/turbodev/server/product/SslConfigBean.java +++ b/product/src/main/java/io/onedev/server/product/SslConfigBean.java @@ -1,6 +1,6 @@ -package com.turbodev.server.product; +package io.onedev.server.product; -import com.turbodev.server.util.serverconfig.SslConfig; +import io.onedev.server.util.serverconfig.SslConfig; class SslConfigBean implements SslConfig { diff --git a/product/src/test/java/com/turbodev/server/product/Test.java b/product/src/test/java/io/onedev/server/product/Test.java similarity index 75% rename from product/src/test/java/com/turbodev/server/product/Test.java rename to product/src/test/java/io/onedev/server/product/Test.java index 3b3090790a..25b80b8b77 100644 --- a/product/src/test/java/com/turbodev/server/product/Test.java +++ b/product/src/test/java/io/onedev/server/product/Test.java @@ -1,4 +1,4 @@ -package com.turbodev.server.product; +package io.onedev.server.product; import java.io.IOException; diff --git a/product/system/conf/hibernate.properties b/product/system/conf/hibernate.properties index c11486e13f..67593b5cc3 100644 --- a/product/system/conf/hibernate.properties +++ b/product/system/conf/hibernate.properties @@ -1,11 +1,11 @@ #---------------------------------------------------------------------------------- -# To use embedded HSQLDB database shipped with TurboDev, please uncomment HSQLDB +# To use embedded HSQLDB database shipped with OneDev, please uncomment HSQLDB # database settings below and comment out settings for other databases. #---------------------------------------------------------------------------------- hibernate.dialect=org.hibernate.dialect.HSQLDialect hibernate.connection.driver_class=org.hsqldb.jdbc.JDBCDriver -hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/turbodev;shutdown=true +hibernate.connection.url=jdbc:hsqldb:file:${installDir}/sampledb/onedev;shutdown=true hibernate.connection.username=sa hibernate.connection.password= @@ -13,9 +13,9 @@ hibernate.connection.password= #---------------------------------------------------------------------------------- # To use MySQL/MariaDB database, please follow these steps: # 1. Uncomment MySQL/MariaDB settings below and comment out settings for other databases. -# 2. Create an empty TurboDev schema at MySQL/MariaDB side. +# 2. Create an empty OneDev schema at MySQL/MariaDB side. # 3. Change the property "hibernate.connection.url", "hibernate.connection.username", -# and "hibernate.connection.password" so that TurboDev can connect and write to +# and "hibernate.connection.password" so that OneDev can connect and write to # the database created in step 3. # 4. For MySQL, make sure to use "InnoDB" as default storage engine, for MariaDB, make # sure to use "XtraDB" or "InnoDB" as the default storage engine. @@ -23,7 +23,7 @@ hibernate.connection.password= #hibernate.dialect=org.hibernate.dialect.MySQL5InnoDBDialect #hibernate.connection.driver_class=org.mariadb.jdbc.Driver -#hibernate.connection.url=jdbc:mysql://localhost:3306/turbodev +#hibernate.connection.url=jdbc:mysql://localhost:3306/onedev #hibernate.connection.username=root #hibernate.connection.password=root @@ -31,15 +31,15 @@ hibernate.connection.password= #---------------------------------------------------------------------------------- # To use PostgreSQL database, please follow these steps: # 1. Uncomment PostgreSQL settings below and comment out settings for other databases. -# 2. Create an empty TurboDev database at PostgreSQL side. +# 2. Create an empty OneDev database at PostgreSQL side. # 3. Change the property "hibernate.connection.url", "hibernate.connection.username", -# and "hibernate.connection.password" so that TurboDev can connect and write to +# and "hibernate.connection.password" so that OneDev can connect and write to # the database created in step 3. #---------------------------------------------------------------------------------- #hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect #hibernate.connection.driver_class=org.postgresql.Driver -#hibernate.connection.url=jdbc:postgresql://localhost:5432/turbodev +#hibernate.connection.url=jdbc:postgresql://localhost:5432/onedev #hibernate.connection.username=postgres #hibernate.connection.password=postgres @@ -51,13 +51,13 @@ hibernate.connection.password= # other databases. # 3. Create an empty database at SQL Server side. # 4. Change the property "hibernate.connection.url", "hibernate.connection.username", -# and "hibernate.connection.password" so that TurboDev can connect and write to +# and "hibernate.connection.password" so that OneDev can connect and write to # the database created in step 3. #---------------------------------------------------------------------------------- #hibernate.dialect=org.hibernate.dialect.SQLServer2012Dialect #hibernate.connection.driver_class=com.microsoft.sqlserver.jdbc.SQLServerDriver -#hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=turbodev +#hibernate.connection.url=jdbc:sqlserver://localhost:1433;databaseName=onedev #hibernate.connection.username=sa #hibernate.connection.password=sa @@ -67,7 +67,7 @@ hibernate.connection.password= # 1. Uncomment Oracle settings below and comment out settings for other databases. # 2. Create an empty Oracle database. # 3. Change the property "hibernate.connection.url", "hibernate.connection.username", -# and "hibernate.connection.password" so that TurboDev can connect and write to +# and "hibernate.connection.password" so that OneDev can connect and write to # the database created in step 3. # 4. Change property "hibernate.dialect" based on different Oracle versions: # 5.1 Use value "org.hibernate.dialect.Oracle9iDialect" if Oracle9i is used. @@ -79,8 +79,8 @@ hibernate.connection.password= #hibernate.dialect=org.hibernate.dialect.Oracle10gDialect #hibernate.connection.driver_class=oracle.jdbc.driver.OracleDriver #hibernate.connection.url=jdbc:oracle:thin:@localhost:1521:XE -#hibernate.connection.username=turbodev -#hibernate.connection.password=turbodev +#hibernate.connection.username=onedev +#hibernate.connection.password=onedev hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider diff --git a/product/system/conf/logback.xml b/product/system/conf/logback.xml index acc7b35f72..9c01393196 100644 --- a/product/system/conf/logback.xml +++ b/product/system/conf/logback.xml @@ -37,7 +37,7 @@ - + diff --git a/product/system/conf/server.properties b/product/system/conf/server.properties index d3cd9b0f31..3fa1b4d420 100644 --- a/product/system/conf/server.properties +++ b/product/system/conf/server.properties @@ -16,7 +16,7 @@ httpsPort=6643 # Uncomment various keystore properties below to use custom keystore path and corresponding # passwords. Keystore can be generated by running command like below: -# /path/to/jdk/bin/keytool -keystore /path/to/keystore -alias TurboDev -genkey -keyalg RSA +# /path/to/jdk/bin/keytool -keystore /path/to/keystore -alias OneDev -genkey -keyalg RSA # You may also import an existing certificate into the keystore, refer to Jetty ssl guide # for details: # http://www.eclipse.org/jetty/documentation/current/configuring-ssl.html diff --git a/product/system/conf/wrapper-license.conf b/product/system/conf/wrapper-license.conf index c9748e7ab3..22e7dfb8b3 100644 --- a/product/system/conf/wrapper-license.conf +++ b/product/system/conf/wrapper-license.conf @@ -1,13 +1,13 @@ #encoding=UTF-8 wrapper.license.type=DEV -wrapper.license.id=201802110000001 +wrapper.license.id=201803060000020 wrapper.license.licensee=Robin Shen -wrapper.license.group=TurboDev -wrapper.license.dev_application=TurboDev +wrapper.license.group=OneDev +wrapper.license.dev_application=OneDev wrapper.license.features=64bit wrapper.license.upgrade_term.begin_date=2009-04-26 wrapper.license.upgrade_term.end_date=2018-04-26 -wrapper.license.key.1=0949-2612-4d04-557e -wrapper.license.key.2=333e-ec7b-2e48-968c -wrapper.license.key.3=e149-f668-0c91-16ce -wrapper.license.key.4=150b-6144-636d-d5d2 \ No newline at end of file +wrapper.license.key.1=b492-fb58-75a2-663e +wrapper.license.key.2=6fdb-dc35-f537-57ac +wrapper.license.key.3=6fa4-94dc-7e98-e4fc +wrapper.license.key.4=dc78-2d11-0637-a727 \ No newline at end of file diff --git a/product/system/license.txt b/product/system/license.txt index 5005888f16..502b6c7b6f 100644 --- a/product/system/license.txt +++ b/product/system/license.txt @@ -1,21 +1,21 @@ -Software License Agreement for TurboDev. +Software License Agreement for OneDev. -This is a legal agreement between you and TurboDev Pty covering your -use of TurboDev (the "Software"). Be sure to read the following +This is a legal agreement between you and OneDev Pty covering your +use of OneDev (the "Software"). Be sure to read the following agreement before using the Software. BY USING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THE TERMS OF THIS AGREEMENT, DO NOT USE THE SOFTWARE AND DESTROY ALL COPIES IN YOUR POSSESSION. -The Software is owned by TurboDev Pty and is protected by +The Software is owned by OneDev Pty and is protected by international treaty provisions. Therefore, you must treat the Software like any other copyrighted material (e. g., a book or musical recording). -TurboDev Pty grants you the right to use TurboDev for free for 10 +OneDev Pty grants you the right to use OneDev for free for 10 named users on unlimited servers. Additional users require license -generated from turbodev.com account. Licenses generated from single -turbodev.com account should only be used in a single TurboDev instance, +generated from onedev.io account. Licenses generated from single +onedev.io account should only be used in a single OneDev instance, except for those used for backup and other non-production purposes. You may not rent or lease the Software, nor may you modify, adapt, @@ -25,13 +25,13 @@ Software terminates automatically and you must then destroy all copies of the Software in your possession. The Software and its related documentation are provided "AS IS" and -without warranty of any kind and TurboDev Pty expressly disclaims all +without warranty of any kind and OneDev Pty expressly disclaims all other warranties, expressed or implied, including, but not limited to, the implied warranties of merchantability and fitness for a particular -purpose. Under no circumstances shall TurboDev Pty be liable for any +purpose. Under no circumstances shall OneDev Pty be liable for any incidental, special, or consequential damages that result from the use or inability to use the Software or related documentation, even if -TurboDev Pty has been advised of the possibility of such damages. In no -event shall TurboDev Pty liability exceed the license fee paid, if any. +OneDev Pty has been advised of the possibility of such damages. In no +event shall OneDev Pty liability exceed the license fee paid, if any. -Copyright (C) 2016-2018 by TurboDev Pty All rights reserved. +Copyright (C) 2016-2018 by OneDev Pty All rights reserved. diff --git a/product/system/site/avatars/turbodev.png b/product/system/site/avatars/onedev.png similarity index 100% rename from product/system/site/avatars/turbodev.png rename to product/system/site/avatars/onedev.png diff --git a/rest/pom.xml b/rest/pom.xml index 74706c2620..0d5a7e1155 100644 --- a/rest/pom.xml +++ b/rest/pom.xml @@ -3,23 +3,23 @@ 4.0.0 server-rest - com.turbodev + io.onedev server-parent - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev plugin-maven - com.turbodev + io.onedev server-core - 1.0.1-build110 + 1.0.2-build111 org.glassfish.jersey.containers @@ -36,6 +36,6 @@ - com.turbodev.server.rest.RestModule + io.onedev.server.rest.RestModule \ No newline at end of file diff --git a/rest/src/main/java/com/turbodev/server/rest/PageUtils.java b/rest/src/main/java/io/onedev/server/rest/PageUtils.java similarity index 98% rename from rest/src/main/java/com/turbodev/server/rest/PageUtils.java rename to rest/src/main/java/io/onedev/server/rest/PageUtils.java index 04787d9f95..34b6e7f405 100644 --- a/rest/src/main/java/com/turbodev/server/rest/PageUtils.java +++ b/rest/src/main/java/io/onedev/server/rest/PageUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import java.util.ArrayList; import java.util.List; diff --git a/rest/src/main/java/com/turbodev/server/rest/ProjectResource.java b/rest/src/main/java/io/onedev/server/rest/ProjectResource.java similarity index 87% rename from rest/src/main/java/com/turbodev/server/rest/ProjectResource.java rename to rest/src/main/java/io/onedev/server/rest/ProjectResource.java index bee7b2a611..235706b781 100644 --- a/rest/src/main/java/com/turbodev/server/rest/ProjectResource.java +++ b/rest/src/main/java/io/onedev/server/rest/ProjectResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import java.util.Collection; @@ -18,11 +18,11 @@ import javax.ws.rs.core.UriInfo; import org.apache.shiro.authz.UnauthorizedException; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.rest.jersey.ValidQueryParams; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.rest.jersey.ValidQueryParams; +import io.onedev.server.security.SecurityUtils; @Path("/projects") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/PullRequestResource.java b/rest/src/main/java/io/onedev/server/rest/PullRequestResource.java similarity index 92% rename from rest/src/main/java/com/turbodev/server/rest/PullRequestResource.java rename to rest/src/main/java/io/onedev/server/rest/PullRequestResource.java index 82f60d19db..886b954724 100644 --- a/rest/src/main/java/com/turbodev/server/rest/PullRequestResource.java +++ b/rest/src/main/java/io/onedev/server/rest/PullRequestResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import java.util.Collection; import java.util.Date; @@ -19,11 +19,11 @@ import javax.ws.rs.core.UriInfo; import org.apache.shiro.authz.UnauthorizedException; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.rest.jersey.ValidQueryParams; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.rest.jersey.ValidQueryParams; +import io.onedev.server.security.SecurityUtils; @Path("/pulls") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/RestConstants.java b/rest/src/main/java/io/onedev/server/rest/RestConstants.java similarity index 88% rename from rest/src/main/java/com/turbodev/server/rest/RestConstants.java rename to rest/src/main/java/io/onedev/server/rest/RestConstants.java index e3eb7e1309..2de65027c8 100644 --- a/rest/src/main/java/com/turbodev/server/rest/RestConstants.java +++ b/rest/src/main/java/io/onedev/server/rest/RestConstants.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import javax.ws.rs.core.MediaType; diff --git a/rest/src/main/java/com/turbodev/server/rest/RestModule.java b/rest/src/main/java/io/onedev/server/rest/RestModule.java similarity index 76% rename from rest/src/main/java/com/turbodev/server/rest/RestModule.java rename to rest/src/main/java/io/onedev/server/rest/RestModule.java index 81c84b443e..a99d14df89 100644 --- a/rest/src/main/java/com/turbodev/server/rest/RestModule.java +++ b/rest/src/main/java/io/onedev/server/rest/RestModule.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import javax.inject.Singleton; @@ -6,11 +6,11 @@ import org.apache.shiro.web.filter.mgt.FilterChainManager; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; -import com.turbodev.launcher.loader.AbstractPluginModule; -import com.turbodev.server.rest.jersey.DefaultServletContainer; -import com.turbodev.server.rest.jersey.JerseyConfigurator; -import com.turbodev.server.rest.jersey.ResourceConfigProvider; -import com.turbodev.server.security.FilterChainConfigurator; +import io.onedev.launcher.loader.AbstractPluginModule; +import io.onedev.server.rest.jersey.DefaultServletContainer; +import io.onedev.server.rest.jersey.JerseyConfigurator; +import io.onedev.server.rest.jersey.ResourceConfigProvider; +import io.onedev.server.security.FilterChainConfigurator; /** * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class. diff --git a/rest/src/main/java/com/turbodev/server/rest/ReviewResource.java b/rest/src/main/java/io/onedev/server/rest/ReviewResource.java similarity index 88% rename from rest/src/main/java/com/turbodev/server/rest/ReviewResource.java rename to rest/src/main/java/io/onedev/server/rest/ReviewResource.java index 0a4ca55d4b..54b0fb98d5 100644 --- a/rest/src/main/java/com/turbodev/server/rest/ReviewResource.java +++ b/rest/src/main/java/io/onedev/server/rest/ReviewResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import java.util.Collection; @@ -22,14 +22,14 @@ import javax.ws.rs.core.UriInfo; import org.apache.shiro.authz.UnauthorizedException; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.manager.ReviewManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.rest.jersey.ValidQueryParams; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.manager.ReviewManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Review; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.rest.jersey.ValidQueryParams; +import io.onedev.server.security.SecurityUtils; @Path("/reviews") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/UserResource.java b/rest/src/main/java/io/onedev/server/rest/UserResource.java similarity index 87% rename from rest/src/main/java/com/turbodev/server/rest/UserResource.java rename to rest/src/main/java/io/onedev/server/rest/UserResource.java index b69f48ad65..ab83647ace 100644 --- a/rest/src/main/java/com/turbodev/server/rest/UserResource.java +++ b/rest/src/main/java/io/onedev/server/rest/UserResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import java.util.Collection; @@ -19,11 +19,11 @@ import org.apache.shiro.authz.UnauthorizedException; import org.hibernate.criterion.Restrictions; import org.hibernate.validator.constraints.Email; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.rest.jersey.ValidQueryParams; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.rest.jersey.ValidQueryParams; +import io.onedev.server.security.SecurityUtils; @Path("/users") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/VerificationResource.java b/rest/src/main/java/io/onedev/server/rest/VerificationResource.java similarity index 88% rename from rest/src/main/java/com/turbodev/server/rest/VerificationResource.java rename to rest/src/main/java/io/onedev/server/rest/VerificationResource.java index d69c1aa682..25b2e59142 100644 --- a/rest/src/main/java/com/turbodev/server/rest/VerificationResource.java +++ b/rest/src/main/java/io/onedev/server/rest/VerificationResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest; +package io.onedev.server.rest; import java.util.Map; @@ -16,11 +16,11 @@ import javax.ws.rs.core.MediaType; import org.apache.shiro.authz.UnauthorizedException; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.Verification; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.Verification; @Path("/verifications") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/github/CommitStatusResource.java b/rest/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java similarity index 90% rename from rest/src/main/java/com/turbodev/server/rest/github/CommitStatusResource.java rename to rest/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java index 825682c740..b315a65632 100644 --- a/rest/src/main/java/com/turbodev/server/rest/github/CommitStatusResource.java +++ b/rest/src/main/java/io/onedev/server/rest/github/CommitStatusResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.github; +package io.onedev.server.rest.github; import java.io.IOException; import java.util.Date; @@ -22,12 +22,13 @@ import org.apache.shiro.authz.UnauthorizedException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.rest.RestConstants; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.Verification; + +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.rest.RestConstants; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.Verification; @Path("/repos/projects") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/github/IssueCommentResource.java b/rest/src/main/java/io/onedev/server/rest/github/IssueCommentResource.java similarity index 92% rename from rest/src/main/java/com/turbodev/server/rest/github/IssueCommentResource.java rename to rest/src/main/java/io/onedev/server/rest/github/IssueCommentResource.java index dcb9a15f21..c91ac51299 100644 --- a/rest/src/main/java/com/turbodev/server/rest/github/IssueCommentResource.java +++ b/rest/src/main/java/io/onedev/server/rest/github/IssueCommentResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.github; +package io.onedev.server.rest.github; import java.util.ArrayList; @@ -14,7 +14,7 @@ import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import javax.ws.rs.core.UriInfo; -import com.turbodev.server.rest.RestConstants; +import io.onedev.server.rest.RestConstants; @Path("/repos/projects") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/github/PullRequestResource.java b/rest/src/main/java/io/onedev/server/rest/github/PullRequestResource.java similarity index 94% rename from rest/src/main/java/com/turbodev/server/rest/github/PullRequestResource.java rename to rest/src/main/java/io/onedev/server/rest/github/PullRequestResource.java index adc673939e..03b6546526 100644 --- a/rest/src/main/java/com/turbodev/server/rest/github/PullRequestResource.java +++ b/rest/src/main/java/io/onedev/server/rest/github/PullRequestResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.github; +package io.onedev.server.rest.github; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -25,15 +25,16 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.hibernate.criterion.Restrictions; import com.google.common.base.Preconditions; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.rest.PageUtils; -import com.turbodev.server.rest.RestConstants; -import com.turbodev.server.security.SecurityUtils; + +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.rest.PageUtils; +import io.onedev.server.rest.RestConstants; +import io.onedev.server.security.SecurityUtils; @Path("/repos/projects") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/github/RepositoryResource.java b/rest/src/main/java/io/onedev/server/rest/github/RepositoryResource.java similarity index 87% rename from rest/src/main/java/com/turbodev/server/rest/github/RepositoryResource.java rename to rest/src/main/java/io/onedev/server/rest/github/RepositoryResource.java index c77039f08d..bc0c6764a6 100644 --- a/rest/src/main/java/com/turbodev/server/rest/github/RepositoryResource.java +++ b/rest/src/main/java/io/onedev/server/rest/github/RepositoryResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.github; +package io.onedev.server.rest.github; import java.util.HashMap; import java.util.Map; @@ -15,10 +15,10 @@ import javax.ws.rs.core.Response; import org.apache.shiro.authz.UnauthorizedException; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.rest.RestConstants; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.rest.RestConstants; +import io.onedev.server.security.SecurityUtils; @Path("/repos/projects") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/github/UserResource.java b/rest/src/main/java/io/onedev/server/rest/github/UserResource.java similarity index 86% rename from rest/src/main/java/com/turbodev/server/rest/github/UserResource.java rename to rest/src/main/java/io/onedev/server/rest/github/UserResource.java index 66bebecc3e..6ff6d6851e 100644 --- a/rest/src/main/java/com/turbodev/server/rest/github/UserResource.java +++ b/rest/src/main/java/io/onedev/server/rest/github/UserResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.github; +package io.onedev.server.rest.github; import java.io.IOException; import java.text.SimpleDateFormat; @@ -19,10 +19,11 @@ import javax.ws.rs.core.UriInfo; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.rest.RestConstants; -import com.turbodev.server.security.SecurityUtils; + +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.rest.RestConstants; +import io.onedev.server.security.SecurityUtils; @Path("/user") @Consumes(MediaType.WILDCARD) diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/CatchAllExceptionMapper.java b/rest/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java similarity index 95% rename from rest/src/main/java/com/turbodev/server/rest/jersey/CatchAllExceptionMapper.java rename to rest/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java index 0686255b50..fc826afb8e 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/CatchAllExceptionMapper.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/CatchAllExceptionMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.ws.rs.WebApplicationException; import javax.ws.rs.core.MediaType; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/DefaultServletContainer.java b/rest/src/main/java/io/onedev/server/rest/jersey/DefaultServletContainer.java similarity index 86% rename from rest/src/main/java/com/turbodev/server/rest/jersey/DefaultServletContainer.java rename to rest/src/main/java/io/onedev/server/rest/jersey/DefaultServletContainer.java index 6e8f8bfd66..1df8111f47 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/DefaultServletContainer.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/DefaultServletContainer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import java.io.IOException; @@ -11,7 +11,7 @@ import javax.servlet.ServletResponse; import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; -import com.turbodev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Sessional; @SuppressWarnings("serial") @Singleton diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/IllegalArgumentExceptionMapper.java b/rest/src/main/java/io/onedev/server/rest/jersey/IllegalArgumentExceptionMapper.java similarity index 95% rename from rest/src/main/java/com/turbodev/server/rest/jersey/IllegalArgumentExceptionMapper.java rename to rest/src/main/java/io/onedev/server/rest/jersey/IllegalArgumentExceptionMapper.java index 8a394b8833..14ab9d355c 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/IllegalArgumentExceptionMapper.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/IllegalArgumentExceptionMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/IncorrectCredentialsExceptionMapper.java b/rest/src/main/java/io/onedev/server/rest/jersey/IncorrectCredentialsExceptionMapper.java similarity index 92% rename from rest/src/main/java/com/turbodev/server/rest/jersey/IncorrectCredentialsExceptionMapper.java rename to rest/src/main/java/io/onedev/server/rest/jersey/IncorrectCredentialsExceptionMapper.java index 5ac2fceed0..63dcc71c0d 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/IncorrectCredentialsExceptionMapper.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/IncorrectCredentialsExceptionMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/JacksonContextResolver.java b/rest/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java similarity index 86% rename from rest/src/main/java/com/turbodev/server/rest/jersey/JacksonContextResolver.java rename to rest/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java index 2e8adb06ae..fb012cf72f 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/JacksonContextResolver.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/JacksonContextResolver.java @@ -1,11 +1,12 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.inject.Inject; import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.server.util.jackson.RestView; + +import io.onedev.server.util.jackson.RestView; @Provider public class JacksonContextResolver implements ContextResolver { diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/JerseyApplication.java b/rest/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java similarity index 95% rename from rest/src/main/java/com/turbodev/server/rest/jersey/JerseyApplication.java rename to rest/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java index de20a92f56..9c4f0e37b6 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/JerseyApplication.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/JerseyApplication.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.inject.Inject; import javax.ws.rs.ext.MessageBodyReader; @@ -15,7 +15,8 @@ import org.jvnet.hk2.guice.bridge.api.GuiceIntoHK2Bridge; import com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper; import com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper; import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; -import com.turbodev.launcher.loader.AppLoader; + +import io.onedev.launcher.loader.AppLoader; public class JerseyApplication extends ResourceConfig { diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/JerseyConfigurator.java b/rest/src/main/java/io/onedev/server/rest/jersey/JerseyConfigurator.java similarity index 77% rename from rest/src/main/java/com/turbodev/server/rest/jersey/JerseyConfigurator.java rename to rest/src/main/java/io/onedev/server/rest/jersey/JerseyConfigurator.java index 0f37d22e6c..1dc4d31288 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/JerseyConfigurator.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/JerseyConfigurator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import org.glassfish.jersey.server.ResourceConfig; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/ResourceConfigProvider.java b/rest/src/main/java/io/onedev/server/rest/jersey/ResourceConfigProvider.java similarity index 87% rename from rest/src/main/java/com/turbodev/server/rest/jersey/ResourceConfigProvider.java rename to rest/src/main/java/io/onedev/server/rest/jersey/ResourceConfigProvider.java index 6fc7f81d37..38a0164255 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/ResourceConfigProvider.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/ResourceConfigProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.inject.Provider; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/UnauthenticatedExceptionMapper.java b/rest/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java similarity index 90% rename from rest/src/main/java/com/turbodev/server/rest/jersey/UnauthenticatedExceptionMapper.java rename to rest/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java index 3e2f6b14c9..a2709c0e0c 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/UnauthenticatedExceptionMapper.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/UnauthenticatedExceptionMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Response; @@ -8,7 +8,7 @@ import javax.ws.rs.ext.Provider; import org.apache.shiro.authz.UnauthenticatedException; -import com.turbodev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoader; @Provider public class UnauthenticatedExceptionMapper implements ExceptionMapper { diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/UnauthorizedExceptionMapper.java b/rest/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java similarity index 92% rename from rest/src/main/java/com/turbodev/server/rest/jersey/UnauthorizedExceptionMapper.java rename to rest/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java index 5238643812..0342160ba6 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/UnauthorizedExceptionMapper.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/UnauthorizedExceptionMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.servlet.http.HttpServletRequest; import javax.ws.rs.core.Response; @@ -9,7 +9,7 @@ import javax.ws.rs.ext.Provider; import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.UnauthorizedException; -import com.turbodev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoader; @Provider public class UnauthorizedExceptionMapper implements ExceptionMapper { diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/UnknownUserExceptionMapper.java b/rest/src/main/java/io/onedev/server/rest/jersey/UnknownUserExceptionMapper.java similarity index 91% rename from rest/src/main/java/com/turbodev/server/rest/jersey/UnknownUserExceptionMapper.java rename to rest/src/main/java/io/onedev/server/rest/jersey/UnknownUserExceptionMapper.java index 983efcffeb..bc36b6fcdf 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/UnknownUserExceptionMapper.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/UnknownUserExceptionMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/ValidQueryParams.java b/rest/src/main/java/io/onedev/server/rest/jersey/ValidQueryParams.java similarity index 94% rename from rest/src/main/java/com/turbodev/server/rest/jersey/ValidQueryParams.java rename to rest/src/main/java/io/onedev/server/rest/jersey/ValidQueryParams.java index 94ff2d5450..9b9e0fef67 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/ValidQueryParams.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/ValidQueryParams.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/ValidQueryParamsValidator.java b/rest/src/main/java/io/onedev/server/rest/jersey/ValidQueryParamsValidator.java similarity index 97% rename from rest/src/main/java/com/turbodev/server/rest/jersey/ValidQueryParamsValidator.java rename to rest/src/main/java/io/onedev/server/rest/jersey/ValidQueryParamsValidator.java index 29421f2fb7..856c2f9cb0 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/ValidQueryParamsValidator.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/ValidQueryParamsValidator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import java.lang.annotation.Annotation; import java.util.HashSet; diff --git a/rest/src/main/java/com/turbodev/server/rest/jersey/ValidationConfigurationContextResolver.java b/rest/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java similarity index 90% rename from rest/src/main/java/com/turbodev/server/rest/jersey/ValidationConfigurationContextResolver.java rename to rest/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java index 8ee6595a43..471a4262d8 100644 --- a/rest/src/main/java/com/turbodev/server/rest/jersey/ValidationConfigurationContextResolver.java +++ b/rest/src/main/java/io/onedev/server/rest/jersey/ValidationConfigurationContextResolver.java @@ -1,11 +1,11 @@ -package com.turbodev.server.rest.jersey; +package io.onedev.server.rest.jersey; import javax.validation.ValidatorFactory; import javax.ws.rs.ext.ContextResolver; import org.glassfish.jersey.server.validation.ValidationConfig; -import com.turbodev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoader; public class ValidationConfigurationContextResolver implements ContextResolver { diff --git a/search/pom.xml b/search/pom.xml index bea69c3901..eb92c6d77d 100644 --- a/search/pom.xml +++ b/search/pom.xml @@ -3,14 +3,14 @@ 4.0.0 server-search - com.turbodev + io.onedev server-parent - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev plugin-maven @@ -24,9 +24,9 @@ - com.turbodev + io.onedev server-core - 1.0.1-build110 + 1.0.2-build111 lucene-core @@ -60,7 +60,7 @@ - com.turbodev.server.search.SearchModule + io.onedev.server.search.SearchModule 4.10.3 \ No newline at end of file diff --git a/search/src/main/java/com/turbodev/server/search/CommitIndexed.java b/search/src/main/java/io/onedev/server/search/CommitIndexed.java similarity index 82% rename from search/src/main/java/com/turbodev/server/search/CommitIndexed.java rename to search/src/main/java/io/onedev/server/search/CommitIndexed.java index 60fb48743e..c79107bd1d 100644 --- a/search/src/main/java/com/turbodev/server/search/CommitIndexed.java +++ b/search/src/main/java/io/onedev/server/search/CommitIndexed.java @@ -1,8 +1,8 @@ -package com.turbodev.server.search; +package io.onedev.server.search; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.model.Project; +import io.onedev.server.model.Project; public class CommitIndexed { diff --git a/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java b/search/src/main/java/io/onedev/server/search/DefaultIndexManager.java similarity index 87% rename from search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java rename to search/src/main/java/io/onedev/server/search/DefaultIndexManager.java index b585843ce8..b3167909ec 100644 --- a/search/src/main/java/com/turbodev/server/search/DefaultIndexManager.java +++ b/search/src/main/java/io/onedev/server/search/DefaultIndexManager.java @@ -1,21 +1,21 @@ -package com.turbodev.server.search; +package io.onedev.server.search; -import static com.turbodev.server.search.FieldConstants.BLOB_HASH; -import static com.turbodev.server.search.FieldConstants.BLOB_INDEX_VERSION; -import static com.turbodev.server.search.FieldConstants.BLOB_NAME; -import static com.turbodev.server.search.FieldConstants.BLOB_PATH; -import static com.turbodev.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS; -import static com.turbodev.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS; -import static com.turbodev.server.search.FieldConstants.BLOB_SYMBOL_LIST; -import static com.turbodev.server.search.FieldConstants.BLOB_TEXT; -import static com.turbodev.server.search.FieldConstants.COMMIT_HASH; -import static com.turbodev.server.search.FieldConstants.COMMIT_INDEX_VERSION; -import static com.turbodev.server.search.FieldConstants.LAST_COMMIT; -import static com.turbodev.server.search.FieldConstants.LAST_COMMIT_HASH; -import static com.turbodev.server.search.FieldConstants.LAST_COMMIT_INDEX_VERSION; -import static com.turbodev.server.search.FieldConstants.META; -import static com.turbodev.server.search.IndexConstants.MAX_INDEXABLE_SIZE; -import static com.turbodev.server.search.IndexConstants.NGRAM_SIZE; +import static io.onedev.server.search.FieldConstants.BLOB_HASH; +import static io.onedev.server.search.FieldConstants.BLOB_INDEX_VERSION; +import static io.onedev.server.search.FieldConstants.BLOB_NAME; +import static io.onedev.server.search.FieldConstants.BLOB_PATH; +import static io.onedev.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS; +import static io.onedev.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS; +import static io.onedev.server.search.FieldConstants.BLOB_SYMBOL_LIST; +import static io.onedev.server.search.FieldConstants.BLOB_TEXT; +import static io.onedev.server.search.FieldConstants.COMMIT_HASH; +import static io.onedev.server.search.FieldConstants.COMMIT_INDEX_VERSION; +import static io.onedev.server.search.FieldConstants.LAST_COMMIT; +import static io.onedev.server.search.FieldConstants.LAST_COMMIT_HASH; +import static io.onedev.server.search.FieldConstants.LAST_COMMIT_INDEX_VERSION; +import static io.onedev.server.search.FieldConstants.META; +import static io.onedev.server.search.IndexConstants.MAX_INDEXABLE_SIZE; +import static io.onedev.server.search.IndexConstants.NGRAM_SIZE; import java.io.File; import java.io.IOException; @@ -62,26 +62,27 @@ import org.eclipse.jgit.treewalk.filter.TreeFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.jsymbol.Symbol; -import com.turbodev.jsymbol.SymbolExtractor; -import com.turbodev.jsymbol.SymbolExtractorRegistry; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.concurrent.Prioritized; +import io.onedev.jsymbol.Symbol; +import io.onedev.jsymbol.SymbolExtractor; +import io.onedev.jsymbol.SymbolExtractorRegistry; +import io.onedev.launcher.loader.Listen; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.BatchWorkManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.util.BatchWorker; +import io.onedev.server.util.ContentDetector; +import io.onedev.server.util.IndexResult; +import io.onedev.utils.StringUtils; +import io.onedev.utils.concurrent.Prioritized; + import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.BatchWorkManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.util.BatchWorker; -import com.turbodev.server.util.ContentDetector; -import com.turbodev.server.util.IndexResult; @Singleton public class DefaultIndexManager implements IndexManager { @@ -92,7 +93,7 @@ public class DefaultIndexManager implements IndexManager { private static final int BACKEND_INDEXING_PRIORITY = 50; - private static final int DATA_VERSION = 2; + private static final int DATA_VERSION = 3; private final StorageManager storageManager; diff --git a/search/src/main/java/com/turbodev/server/search/DefaultSearchManager.java b/search/src/main/java/io/onedev/server/search/DefaultSearchManager.java similarity index 90% rename from search/src/main/java/com/turbodev/server/search/DefaultSearchManager.java rename to search/src/main/java/io/onedev/server/search/DefaultSearchManager.java index 7e4c9fd1d6..de9adeb6a3 100644 --- a/search/src/main/java/com/turbodev/server/search/DefaultSearchManager.java +++ b/search/src/main/java/io/onedev/server/search/DefaultSearchManager.java @@ -1,9 +1,9 @@ -package com.turbodev.server.search; +package io.onedev.server.search; -import static com.turbodev.server.search.FieldConstants.BLOB_HASH; -import static com.turbodev.server.search.FieldConstants.BLOB_INDEX_VERSION; -import static com.turbodev.server.search.FieldConstants.BLOB_PATH; -import static com.turbodev.server.search.FieldConstants.BLOB_SYMBOL_LIST; +import static io.onedev.server.search.FieldConstants.BLOB_HASH; +import static io.onedev.server.search.FieldConstants.BLOB_INDEX_VERSION; +import static io.onedev.server.search.FieldConstants.BLOB_PATH; +import static io.onedev.server.search.FieldConstants.BLOB_SYMBOL_LIST; import java.io.IOException; import java.nio.channels.ClosedByInterruptException; @@ -41,17 +41,18 @@ import org.eclipse.jgit.treewalk.TreeWalk; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.jsymbol.Symbol; -import com.turbodev.jsymbol.SymbolExtractorRegistry; -import com.turbodev.launcher.loader.Listen; import com.google.common.base.Throwables; -import com.turbodev.server.event.lifecycle.SystemStopping; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.annotation.Transactional; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.query.BlobQuery; + +import io.onedev.jsymbol.Symbol; +import io.onedev.jsymbol.SymbolExtractorRegistry; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.lifecycle.SystemStopping; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.annotation.Transactional; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.query.BlobQuery; @Singleton public class DefaultSearchManager implements SearchManager { diff --git a/search/src/main/java/com/turbodev/server/search/FieldConstants.java b/search/src/main/java/io/onedev/server/search/FieldConstants.java similarity index 93% rename from search/src/main/java/com/turbodev/server/search/FieldConstants.java rename to search/src/main/java/io/onedev/server/search/FieldConstants.java index bcf873ad41..4daef1fb0d 100644 --- a/search/src/main/java/com/turbodev/server/search/FieldConstants.java +++ b/search/src/main/java/io/onedev/server/search/FieldConstants.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search; +package io.onedev.server.search; import org.apache.lucene.index.Term; import org.apache.lucene.search.TermQuery; diff --git a/search/src/main/java/com/turbodev/server/search/IndexConstants.java b/search/src/main/java/io/onedev/server/search/IndexConstants.java similarity index 73% rename from search/src/main/java/com/turbodev/server/search/IndexConstants.java rename to search/src/main/java/io/onedev/server/search/IndexConstants.java index e8e8e8b5a1..e04fcfd73b 100644 --- a/search/src/main/java/com/turbodev/server/search/IndexConstants.java +++ b/search/src/main/java/io/onedev/server/search/IndexConstants.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search; +package io.onedev.server.search; public interface IndexConstants { diff --git a/search/src/main/java/com/turbodev/server/search/IndexManager.java b/search/src/main/java/io/onedev/server/search/IndexManager.java similarity index 67% rename from search/src/main/java/com/turbodev/server/search/IndexManager.java rename to search/src/main/java/io/onedev/server/search/IndexManager.java index 51d0c8b683..1a65ff3580 100644 --- a/search/src/main/java/com/turbodev/server/search/IndexManager.java +++ b/search/src/main/java/io/onedev/server/search/IndexManager.java @@ -1,12 +1,12 @@ -package com.turbodev.server.search; +package io.onedev.server.search; import javax.annotation.Nullable; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.jsymbol.Symbol; -import com.turbodev.jsymbol.SymbolExtractor; -import com.turbodev.server.model.Project; +import io.onedev.jsymbol.Symbol; +import io.onedev.jsymbol.SymbolExtractor; +import io.onedev.server.model.Project; public interface IndexManager { diff --git a/search/src/main/java/com/turbodev/server/search/NGramAnalyzer.java b/search/src/main/java/io/onedev/server/search/NGramAnalyzer.java similarity index 96% rename from search/src/main/java/com/turbodev/server/search/NGramAnalyzer.java rename to search/src/main/java/io/onedev/server/search/NGramAnalyzer.java index 7cc3dd7c7c..06c23d3f86 100644 --- a/search/src/main/java/com/turbodev/server/search/NGramAnalyzer.java +++ b/search/src/main/java/io/onedev/server/search/NGramAnalyzer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search; +package io.onedev.server.search; import java.io.IOException; import java.io.Reader; diff --git a/search/src/main/java/com/turbodev/server/search/SearchManager.java b/search/src/main/java/io/onedev/server/search/SearchManager.java similarity index 75% rename from search/src/main/java/com/turbodev/server/search/SearchManager.java rename to search/src/main/java/io/onedev/server/search/SearchManager.java index dfbefa6217..cee9fc6c9d 100644 --- a/search/src/main/java/com/turbodev/server/search/SearchManager.java +++ b/search/src/main/java/io/onedev/server/search/SearchManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search; +package io.onedev.server.search; import java.util.List; @@ -7,11 +7,11 @@ import javax.annotation.Nullable; import org.apache.lucene.search.IndexSearcher; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.jsymbol.Symbol; -import com.turbodev.server.model.Project; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.query.BlobQuery; -import com.turbodev.server.search.query.TooGeneralQueryException; +import io.onedev.jsymbol.Symbol; +import io.onedev.server.model.Project; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.query.BlobQuery; +import io.onedev.server.search.query.TooGeneralQueryException; public interface SearchManager { diff --git a/search/src/main/java/com/turbodev/server/search/SearchModule.java b/search/src/main/java/io/onedev/server/search/SearchModule.java similarity index 80% rename from search/src/main/java/com/turbodev/server/search/SearchModule.java rename to search/src/main/java/io/onedev/server/search/SearchModule.java index 213f055ebc..705e7bb84d 100644 --- a/search/src/main/java/com/turbodev/server/search/SearchModule.java +++ b/search/src/main/java/io/onedev/server/search/SearchModule.java @@ -1,6 +1,6 @@ -package com.turbodev.server.search; +package io.onedev.server.search; -import com.turbodev.launcher.loader.AbstractPluginModule; +import io.onedev.launcher.loader.AbstractPluginModule; /** * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class. diff --git a/search/src/main/java/com/turbodev/server/search/hit/FileHit.java b/search/src/main/java/io/onedev/server/search/hit/FileHit.java similarity index 87% rename from search/src/main/java/com/turbodev/server/search/hit/FileHit.java rename to search/src/main/java/io/onedev/server/search/hit/FileHit.java index 294c2caf16..e885eb84c8 100644 --- a/search/src/main/java/com/turbodev/server/search/hit/FileHit.java +++ b/search/src/main/java/io/onedev/server/search/hit/FileHit.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.hit; +package io.onedev.server.search.hit; import javax.annotation.Nullable; @@ -7,9 +7,9 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.request.resource.PackageResourceReference; -import com.turbodev.utils.Range; -import com.turbodev.jsymbol.util.HighlightableLabel; -import com.turbodev.jsymbol.util.NoAntiCacheImage; +import io.onedev.jsymbol.util.HighlightableLabel; +import io.onedev.jsymbol.util.NoAntiCacheImage; +import io.onedev.utils.Range; public class FileHit extends QueryHit { diff --git a/search/src/main/java/com/turbodev/server/search/hit/PathHit.java b/search/src/main/java/io/onedev/server/search/hit/PathHit.java similarity index 83% rename from search/src/main/java/com/turbodev/server/search/hit/PathHit.java rename to search/src/main/java/io/onedev/server/search/hit/PathHit.java index 17a4b8674a..7b558b503b 100644 --- a/search/src/main/java/com/turbodev/server/search/hit/PathHit.java +++ b/search/src/main/java/io/onedev/server/search/hit/PathHit.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.hit; +package io.onedev.server.search.hit; import javax.annotation.Nullable; @@ -6,9 +6,9 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.request.resource.PackageResourceReference; -import com.turbodev.utils.Range; -import com.turbodev.jsymbol.util.HighlightableLabel; -import com.turbodev.jsymbol.util.NoAntiCacheImage; +import io.onedev.jsymbol.util.HighlightableLabel; +import io.onedev.jsymbol.util.NoAntiCacheImage; +import io.onedev.utils.Range; public class PathHit extends QueryHit { diff --git a/search/src/main/java/com/turbodev/server/search/hit/QueryHit.java b/search/src/main/java/io/onedev/server/search/hit/QueryHit.java similarity index 90% rename from search/src/main/java/com/turbodev/server/search/hit/QueryHit.java rename to search/src/main/java/io/onedev/server/search/hit/QueryHit.java index d98ed18beb..beebc59193 100644 --- a/search/src/main/java/com/turbodev/server/search/hit/QueryHit.java +++ b/search/src/main/java/io/onedev/server/search/hit/QueryHit.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.hit; +package io.onedev.server.search.hit; import java.io.Serializable; @@ -7,7 +7,7 @@ import javax.annotation.Nullable; import org.apache.wicket.Component; import org.apache.wicket.markup.html.image.Image; -import com.turbodev.jsymbol.TokenPosition; +import io.onedev.jsymbol.TokenPosition; public abstract class QueryHit implements Serializable { diff --git a/search/src/main/java/com/turbodev/server/search/hit/SymbolHit.java b/search/src/main/java/io/onedev/server/search/hit/SymbolHit.java similarity index 89% rename from search/src/main/java/com/turbodev/server/search/hit/SymbolHit.java rename to search/src/main/java/io/onedev/server/search/hit/SymbolHit.java index 8f1df78adc..178d1090e2 100644 --- a/search/src/main/java/com/turbodev/server/search/hit/SymbolHit.java +++ b/search/src/main/java/io/onedev/server/search/hit/SymbolHit.java @@ -1,12 +1,12 @@ -package com.turbodev.server.search.hit; +package io.onedev.server.search.hit; import javax.annotation.Nullable; import org.apache.wicket.Component; import org.apache.wicket.markup.html.image.Image; -import com.turbodev.utils.Range; -import com.turbodev.jsymbol.Symbol; +import io.onedev.jsymbol.Symbol; +import io.onedev.utils.Range; public class SymbolHit extends QueryHit { diff --git a/search/src/main/java/com/turbodev/server/search/hit/TextHit.java b/search/src/main/java/io/onedev/server/search/hit/TextHit.java similarity index 84% rename from search/src/main/java/com/turbodev/server/search/hit/TextHit.java rename to search/src/main/java/io/onedev/server/search/hit/TextHit.java index c725c58e24..e5fe860935 100644 --- a/search/src/main/java/com/turbodev/server/search/hit/TextHit.java +++ b/search/src/main/java/io/onedev/server/search/hit/TextHit.java @@ -1,14 +1,14 @@ -package com.turbodev.server.search.hit; +package io.onedev.server.search.hit; import org.apache.commons.lang3.StringUtils; import org.apache.wicket.Component; import org.apache.wicket.markup.html.image.Image; import org.apache.wicket.request.resource.PackageResourceReference; -import com.turbodev.utils.Range; -import com.turbodev.jsymbol.TokenPosition; -import com.turbodev.jsymbol.util.HighlightableLabel; -import com.turbodev.jsymbol.util.NoAntiCacheImage; +import io.onedev.jsymbol.TokenPosition; +import io.onedev.jsymbol.util.HighlightableLabel; +import io.onedev.jsymbol.util.NoAntiCacheImage; +import io.onedev.utils.Range; public class TextHit extends QueryHit { diff --git a/search/src/main/java/com/turbodev/server/search/hit/bullet.gif b/search/src/main/java/io/onedev/server/search/hit/bullet.gif similarity index 100% rename from search/src/main/java/com/turbodev/server/search/hit/bullet.gif rename to search/src/main/java/io/onedev/server/search/hit/bullet.gif diff --git a/search/src/main/java/com/turbodev/server/search/hit/file.png b/search/src/main/java/io/onedev/server/search/hit/file.png similarity index 100% rename from search/src/main/java/com/turbodev/server/search/hit/file.png rename to search/src/main/java/io/onedev/server/search/hit/file.png diff --git a/search/src/main/java/com/turbodev/server/search/query/BlobQuery.java b/search/src/main/java/io/onedev/server/search/query/BlobQuery.java similarity index 90% rename from search/src/main/java/com/turbodev/server/search/query/BlobQuery.java rename to search/src/main/java/io/onedev/server/search/query/BlobQuery.java index 1953107e3f..c8bd3c270b 100644 --- a/search/src/main/java/com/turbodev/server/search/query/BlobQuery.java +++ b/search/src/main/java/io/onedev/server/search/query/BlobQuery.java @@ -1,6 +1,6 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; -import static com.turbodev.server.search.FieldConstants.BLOB_PATH; +import static io.onedev.server.search.FieldConstants.BLOB_PATH; import java.util.List; @@ -13,7 +13,7 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.WildcardQuery; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.QueryHit; public abstract class BlobQuery { diff --git a/search/src/main/java/com/turbodev/server/search/query/FileQuery.java b/search/src/main/java/io/onedev/server/search/query/FileQuery.java similarity index 91% rename from search/src/main/java/com/turbodev/server/search/query/FileQuery.java rename to search/src/main/java/io/onedev/server/search/query/FileQuery.java index d029ac122d..360bc906cb 100644 --- a/search/src/main/java/com/turbodev/server/search/query/FileQuery.java +++ b/search/src/main/java/io/onedev/server/search/query/FileQuery.java @@ -1,6 +1,6 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; -import static com.turbodev.server.search.FieldConstants.BLOB_NAME; +import static io.onedev.server.search.FieldConstants.BLOB_NAME; import java.util.List; @@ -13,11 +13,12 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.WildcardQuery; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.utils.Range; -import com.turbodev.utils.stringmatch.WildcardUtils; import com.google.common.base.Preconditions; -import com.turbodev.server.search.hit.FileHit; -import com.turbodev.server.search.hit.QueryHit; + +import io.onedev.server.search.hit.FileHit; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.utils.Range; +import io.onedev.utils.stringmatch.WildcardUtils; public class FileQuery extends BlobQuery { diff --git a/search/src/main/java/com/turbodev/server/search/query/NGramLuceneQuery.java b/search/src/main/java/io/onedev/server/search/query/NGramLuceneQuery.java similarity index 95% rename from search/src/main/java/com/turbodev/server/search/query/NGramLuceneQuery.java rename to search/src/main/java/io/onedev/server/search/query/NGramLuceneQuery.java index 42c9e8466a..0bc79a1a81 100644 --- a/search/src/main/java/com/turbodev/server/search/query/NGramLuceneQuery.java +++ b/search/src/main/java/io/onedev/server/search/query/NGramLuceneQuery.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; import java.io.IOException; import java.io.StringReader; diff --git a/search/src/main/java/com/turbodev/server/search/query/PathQuery.java b/search/src/main/java/io/onedev/server/search/query/PathQuery.java similarity index 78% rename from search/src/main/java/com/turbodev/server/search/query/PathQuery.java rename to search/src/main/java/io/onedev/server/search/query/PathQuery.java index 6378aa6ddb..adb2d2f6e6 100644 --- a/search/src/main/java/com/turbodev/server/search/query/PathQuery.java +++ b/search/src/main/java/io/onedev/server/search/query/PathQuery.java @@ -1,6 +1,6 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; -import static com.turbodev.server.search.FieldConstants.BLOB_PATH; +import static io.onedev.server.search.FieldConstants.BLOB_PATH; import java.util.List; @@ -13,10 +13,10 @@ import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.WildcardQuery; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.utils.PathUtils; -import com.turbodev.utils.Range; -import com.turbodev.server.search.hit.PathHit; -import com.turbodev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.PathHit; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.utils.PathUtils; +import io.onedev.utils.Range; public class PathQuery extends BlobQuery { diff --git a/search/src/main/java/com/turbodev/server/search/query/SymbolQuery.java b/search/src/main/java/io/onedev/server/search/query/SymbolQuery.java similarity index 88% rename from search/src/main/java/com/turbodev/server/search/query/SymbolQuery.java rename to search/src/main/java/io/onedev/server/search/query/SymbolQuery.java index 6b25e9cd51..6b52250c78 100644 --- a/search/src/main/java/com/turbodev/server/search/query/SymbolQuery.java +++ b/search/src/main/java/io/onedev/server/search/query/SymbolQuery.java @@ -1,8 +1,8 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; -import static com.turbodev.server.search.FieldConstants.BLOB_NAME; -import static com.turbodev.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS; -import static com.turbodev.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS; +import static io.onedev.server.search.FieldConstants.BLOB_NAME; +import static io.onedev.server.search.FieldConstants.BLOB_PRIMARY_SYMBOLS; +import static io.onedev.server.search.FieldConstants.BLOB_SECONDARY_SYMBOLS; import java.util.List; @@ -16,15 +16,16 @@ import org.apache.lucene.search.WildcardQuery; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.utils.Range; -import com.turbodev.utils.stringmatch.WildcardUtils; -import com.turbodev.jsymbol.Symbol; +import io.onedev.jsymbol.Symbol; +import io.onedev.server.OneDev; +import io.onedev.server.search.SearchManager; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.SymbolHit; +import io.onedev.utils.Range; +import io.onedev.utils.stringmatch.WildcardUtils; + import com.google.common.base.Preconditions; import com.google.common.base.Splitter; -import com.turbodev.server.TurboDev; -import com.turbodev.server.search.SearchManager; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.hit.SymbolHit; public class SymbolQuery extends BlobQuery { @@ -61,7 +62,7 @@ public class SymbolQuery extends BlobQuery { String blobPath = treeWalk.getPathString(); ObjectId blobId = treeWalk.getObjectId(0); - List symbols = TurboDev.getInstance(SearchManager.class).getSymbols(searcher, blobId, blobPath); + List symbols = OneDev.getInstance(SearchManager.class).getSymbols(searcher, blobId, blobPath); if (symbols != null) { for (Symbol symbol: symbols) { if (hits.size() < getCount()) { diff --git a/search/src/main/java/com/turbodev/server/search/query/TextQuery.java b/search/src/main/java/io/onedev/server/search/query/TextQuery.java similarity index 92% rename from search/src/main/java/com/turbodev/server/search/query/TextQuery.java rename to search/src/main/java/io/onedev/server/search/query/TextQuery.java index c35882bbe0..8471ae63a2 100644 --- a/search/src/main/java/com/turbodev/server/search/query/TextQuery.java +++ b/search/src/main/java/io/onedev/server/search/query/TextQuery.java @@ -1,8 +1,8 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; -import static com.turbodev.server.search.FieldConstants.BLOB_NAME; -import static com.turbodev.server.search.FieldConstants.BLOB_TEXT; -import static com.turbodev.server.search.IndexConstants.NGRAM_SIZE; +import static io.onedev.server.search.FieldConstants.BLOB_NAME; +import static io.onedev.server.search.FieldConstants.BLOB_TEXT; +import static io.onedev.server.search.IndexConstants.NGRAM_SIZE; import java.io.IOException; import java.util.List; @@ -20,15 +20,16 @@ import org.apache.lucene.search.WildcardQuery; import org.eclipse.jgit.lib.ObjectLoader; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.utils.Range; -import com.turbodev.jsymbol.TokenPosition; +import io.onedev.jsymbol.TokenPosition; +import io.onedev.server.search.IndexConstants; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.TextHit; +import io.onedev.server.search.query.regex.RegexLiterals; +import io.onedev.server.util.ContentDetector; +import io.onedev.utils.Range; + import com.google.common.base.Preconditions; import com.google.common.base.Splitter; -import com.turbodev.server.search.IndexConstants; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.hit.TextHit; -import com.turbodev.server.search.query.regex.RegexLiterals; -import com.turbodev.server.util.ContentDetector; public class TextQuery extends BlobQuery { diff --git a/search/src/main/java/com/turbodev/server/search/query/TooGeneralQueryException.java b/search/src/main/java/io/onedev/server/search/query/TooGeneralQueryException.java similarity index 74% rename from search/src/main/java/com/turbodev/server/search/query/TooGeneralQueryException.java rename to search/src/main/java/io/onedev/server/search/query/TooGeneralQueryException.java index e11db07a9e..8cef221781 100644 --- a/search/src/main/java/com/turbodev/server/search/query/TooGeneralQueryException.java +++ b/search/src/main/java/io/onedev/server/search/query/TooGeneralQueryException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query; +package io.onedev.server.search.query; public class TooGeneralQueryException extends RuntimeException { diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/AndLiterals.java b/search/src/main/java/io/onedev/server/search/query/regex/AndLiterals.java similarity index 97% rename from search/src/main/java/com/turbodev/server/search/query/regex/AndLiterals.java rename to search/src/main/java/io/onedev/server/search/query/regex/AndLiterals.java index 746b2732ca..af29435464 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/AndLiterals.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/AndLiterals.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.ArrayList; import java.util.List; diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/LeafLiterals.java b/search/src/main/java/io/onedev/server/search/query/regex/LeafLiterals.java similarity index 96% rename from search/src/main/java/com/turbodev/server/search/query/regex/LeafLiterals.java rename to search/src/main/java/io/onedev/server/search/query/regex/LeafLiterals.java index 0c93a695fa..e275cfb95a 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/LeafLiterals.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/LeafLiterals.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.ArrayList; import java.util.List; diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/LiteralUtils.java b/search/src/main/java/io/onedev/server/search/query/regex/LiteralUtils.java similarity index 99% rename from search/src/main/java/com/turbodev/server/search/query/regex/LiteralUtils.java rename to search/src/main/java/io/onedev/server/search/query/regex/LiteralUtils.java index 0714a774ba..e9bcdf3c14 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/LiteralUtils.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/LiteralUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.ArrayList; import java.util.HashSet; diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/LiteralVisitor.java b/search/src/main/java/io/onedev/server/search/query/regex/LiteralVisitor.java similarity index 85% rename from search/src/main/java/com/turbodev/server/search/query/regex/LiteralVisitor.java rename to search/src/main/java/io/onedev/server/search/query/regex/LiteralVisitor.java index 0a99f61f81..6d60cb9d24 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/LiteralVisitor.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/LiteralVisitor.java @@ -1,18 +1,18 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import com.turbodev.server.search.query.regex.PCREBaseVisitor; -import com.turbodev.server.search.query.regex.PCREParser.AlternationContext; -import com.turbodev.server.search.query.regex.PCREParser.AtomContext; -import com.turbodev.server.search.query.regex.PCREParser.Cc_atomContext; -import com.turbodev.server.search.query.regex.PCREParser.ElementContext; -import com.turbodev.server.search.query.regex.PCREParser.ExprContext; -import com.turbodev.server.search.query.regex.PCREParser.ParseContext; -import com.turbodev.server.search.query.regex.PCREParser.QuantifierContext; +import io.onedev.server.search.query.regex.PCREBaseVisitor; +import io.onedev.server.search.query.regex.PCREParser.AlternationContext; +import io.onedev.server.search.query.regex.PCREParser.AtomContext; +import io.onedev.server.search.query.regex.PCREParser.Cc_atomContext; +import io.onedev.server.search.query.regex.PCREParser.ElementContext; +import io.onedev.server.search.query.regex.PCREParser.ExprContext; +import io.onedev.server.search.query.regex.PCREParser.ParseContext; +import io.onedev.server.search.query.regex.PCREParser.QuantifierContext; public class LiteralVisitor extends PCREBaseVisitor { diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/Literals.java b/search/src/main/java/io/onedev/server/search/query/regex/Literals.java similarity index 70% rename from search/src/main/java/com/turbodev/server/search/query/regex/Literals.java rename to search/src/main/java/io/onedev/server/search/query/regex/Literals.java index 6f987795cb..cb09db25ee 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/Literals.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/Literals.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.List; diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/LogicalLiterals.java b/search/src/main/java/io/onedev/server/search/query/regex/LogicalLiterals.java similarity index 93% rename from search/src/main/java/com/turbodev/server/search/query/regex/LogicalLiterals.java rename to search/src/main/java/io/onedev/server/search/query/regex/LogicalLiterals.java index 02256cb4c2..ad797d5ce1 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/LogicalLiterals.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/LogicalLiterals.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.Iterator; import java.util.List; diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/OrLiterals.java b/search/src/main/java/io/onedev/server/search/query/regex/OrLiterals.java similarity index 91% rename from search/src/main/java/com/turbodev/server/search/query/regex/OrLiterals.java rename to search/src/main/java/io/onedev/server/search/query/regex/OrLiterals.java index c6e161ad15..38fc093d65 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/OrLiterals.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/OrLiterals.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import java.util.ArrayList; import java.util.List; diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/PCRE.g4 b/search/src/main/java/io/onedev/server/search/query/regex/PCRE.g4 similarity index 100% rename from search/src/main/java/com/turbodev/server/search/query/regex/PCRE.g4 rename to search/src/main/java/io/onedev/server/search/query/regex/PCRE.g4 diff --git a/search/src/main/java/com/turbodev/server/search/query/regex/RegexLiterals.java b/search/src/main/java/io/onedev/server/search/query/regex/RegexLiterals.java similarity index 89% rename from search/src/main/java/com/turbodev/server/search/query/regex/RegexLiterals.java rename to search/src/main/java/io/onedev/server/search/query/regex/RegexLiterals.java index b5083badc8..20ea4cf06e 100644 --- a/search/src/main/java/com/turbodev/server/search/query/regex/RegexLiterals.java +++ b/search/src/main/java/io/onedev/server/search/query/regex/RegexLiterals.java @@ -1,6 +1,6 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; -import static com.turbodev.server.search.IndexConstants.NGRAM_SIZE; +import static io.onedev.server.search.IndexConstants.NGRAM_SIZE; import java.util.List; @@ -16,10 +16,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Strings; -import com.turbodev.server.search.query.NGramLuceneQuery; -import com.turbodev.server.search.query.TooGeneralQueryException; -import com.turbodev.server.search.query.regex.PCRELexer; -import com.turbodev.server.search.query.regex.PCREParser; +import io.onedev.server.search.query.regex.PCRELexer; +import io.onedev.server.search.query.regex.PCREParser; + +import io.onedev.server.search.query.NGramLuceneQuery; +import io.onedev.server.search.query.TooGeneralQueryException; public class RegexLiterals { diff --git a/search/src/test/java/com/turbodev/server/search/query/regex/RegexLiteralsTest.java b/search/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java similarity index 91% rename from search/src/test/java/com/turbodev/server/search/query/regex/RegexLiteralsTest.java rename to search/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java index 5dc3919967..fdb55d1948 100644 --- a/search/src/test/java/com/turbodev/server/search/query/regex/RegexLiteralsTest.java +++ b/search/src/test/java/io/onedev/server/search/query/regex/RegexLiteralsTest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.search.query.regex; +package io.onedev.server.search.query.regex; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -6,7 +6,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import com.google.common.base.Splitter; -import com.turbodev.server.search.query.regex.RegexLiterals; + +import io.onedev.server.search.query.regex.RegexLiterals; public class RegexLiteralsTest { diff --git a/web/pom.xml b/web/pom.xml index 49986f6f3e..399b14386f 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -3,14 +3,14 @@ 4.0.0 server-web - com.turbodev + io.onedev server-parent - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev plugin-maven @@ -77,14 +77,14 @@ 5.21.0 - com.turbodev + io.onedev server-core - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev server-rest - 1.0.1-build110 + 1.0.2-build111 commons-fileupload @@ -102,18 +102,18 @@ 4.0.1.Final - com.turbodev + io.onedev server-search - 1.0.1-build110 + 1.0.2-build111 - com.turbodev + io.onedev codeassist 1.0.0 - com.turbodev.server.web.WebModule + io.onedev.server.web.WebModule 7.3.0 0.10.6 diff --git a/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.java b/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.java deleted file mode 100644 index 6010fa2c7f..0000000000 --- a/web/src/main/java/com/turbodev/server/web/TurboDevUrlMapper.java +++ /dev/null @@ -1,202 +0,0 @@ -package com.turbodev.server.web; - -import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; -import org.apache.wicket.core.request.handler.IPageClassRequestHandler; -import org.apache.wicket.core.request.handler.RenderPageRequestHandler; -import org.apache.wicket.core.request.mapper.ResourceMapper; -import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.request.IRequestHandler; -import org.apache.wicket.request.Url; -import org.apache.wicket.request.mapper.CompoundRequestMapper; - -import com.turbodev.server.web.page.admin.authenticator.AuthenticatorPage; -import com.turbodev.server.web.page.admin.databasebackup.DatabaseBackupPage; -import com.turbodev.server.web.page.admin.licensemanagement.LicenseManagementPage; -import com.turbodev.server.web.page.admin.mailsetting.MailSettingPage; -import com.turbodev.server.web.page.admin.securitysetting.SecuritySettingPage; -import com.turbodev.server.web.page.admin.serverinformation.ServerInformationPage; -import com.turbodev.server.web.page.admin.serverlog.ServerLogPage; -import com.turbodev.server.web.page.admin.systemsetting.SystemSettingPage; -import com.turbodev.server.web.page.group.GroupAuthorizationsPage; -import com.turbodev.server.web.page.group.GroupListPage; -import com.turbodev.server.web.page.group.GroupMembershipsPage; -import com.turbodev.server.web.page.group.GroupProfilePage; -import com.turbodev.server.web.page.group.NewGroupPage; -import com.turbodev.server.web.page.init.ServerInitPage; -import com.turbodev.server.web.page.project.NewProjectPage; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.branches.ProjectBranchesPage; -import com.turbodev.server.web.page.project.comments.ProjectCodeCommentsPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.commit.ProjectCommitsPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.page.project.pullrequest.InvalidRequestPage; -import com.turbodev.server.web.page.project.pullrequest.newrequest.NewRequestPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.page.project.pullrequest.requestlist.RequestListPage; -import com.turbodev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage; -import com.turbodev.server.web.page.project.setting.branchprotection.BranchProtectionPage; -import com.turbodev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage; -import com.turbodev.server.web.page.project.setting.general.GeneralSettingPage; -import com.turbodev.server.web.page.project.setting.tagprotection.TagProtectionPage; -import com.turbodev.server.web.page.project.stats.ProjectContribsPage; -import com.turbodev.server.web.page.project.stats.SourceLinesPage; -import com.turbodev.server.web.page.project.tags.ProjectTagsPage; -import com.turbodev.server.web.page.security.ForgetPage; -import com.turbodev.server.web.page.security.LoginPage; -import com.turbodev.server.web.page.security.LogoutPage; -import com.turbodev.server.web.page.security.RegisterPage; -import com.turbodev.server.web.page.test.TestPage; -import com.turbodev.server.web.page.user.AvatarEditPage; -import com.turbodev.server.web.page.user.NewUserPage; -import com.turbodev.server.web.page.user.PasswordEditPage; -import com.turbodev.server.web.page.user.TaskListPage; -import com.turbodev.server.web.page.user.TokenGeneratePage; -import com.turbodev.server.web.page.user.UserAuthorizationsPage; -import com.turbodev.server.web.page.user.UserListPage; -import com.turbodev.server.web.page.user.UserMembershipsPage; -import com.turbodev.server.web.page.user.UserProfilePage; -import com.turbodev.server.web.util.mapper.TurboDevPageMapper; -import com.turbodev.server.web.util.mapper.TurboDevResourceMapper; -import com.turbodev.server.web.util.resource.ArchiveResourceReference; -import com.turbodev.server.web.util.resource.AttachmentResourceReference; -import com.turbodev.server.web.util.resource.RawBlobResourceReference; -import com.turbodev.server.web.util.resource.ServerLogResourceReference; - -public class TurboDevUrlMapper extends CompoundRequestMapper { - - public TurboDevUrlMapper(WebApplication app) { - add(new TurboDevPageMapper("init", ServerInitPage.class)); - addAdministrationPages(); - addUserPages(); - addGroupPages(); - addProjectPages(); - addSecurityPages(); - - add(new TurboDevPageMapper("test", TestPage.class)); - - addResources(); - } - - private void addResources() { - add(new ResourceMapper("resource/server-log", new ServerLogResourceReference())); - add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference())); - add(new TurboDevResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobResourceReference())); - add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}", - new AttachmentResourceReference())); - } - - private void addSecurityPages() { - add(new TurboDevPageMapper("login", LoginPage.class)); - add(new TurboDevPageMapper("logout", LogoutPage.class)); - add(new TurboDevPageMapper("register", RegisterPage.class)); - add(new TurboDevPageMapper("forget", ForgetPage.class)); - } - - private void addAdministrationPages() { - add(new TurboDevPageMapper("administration/settings/system", SystemSettingPage.class)); - add(new TurboDevPageMapper("administration/settings/mail", MailSettingPage.class)); - add(new TurboDevPageMapper("administration/settings/backup", DatabaseBackupPage.class)); - add(new TurboDevPageMapper("administration/settings/security", SecuritySettingPage.class)); - add(new TurboDevPageMapper("administration/settings/authenticator", AuthenticatorPage.class)); - add(new TurboDevPageMapper("administration/server-log", ServerLogPage.class)); - add(new TurboDevPageMapper("administration/server-information", ServerInformationPage.class)); - add(new TurboDevPageMapper("administration/license-management", LicenseManagementPage.class)); - } - - private void addUserPages() { - add(new TurboDevPageMapper("users", UserListPage.class)); - add(new TurboDevPageMapper("users/new", NewUserPage.class)); - add(new TurboDevPageMapper("users/${user}/profile", UserProfilePage.class)); - add(new TurboDevPageMapper("users/${user}/groups", UserMembershipsPage.class)); - add(new TurboDevPageMapper("users/${user}/authorizations", UserAuthorizationsPage.class)); - add(new TurboDevPageMapper("users/${user}/tasks", TaskListPage.class)); - add(new TurboDevPageMapper("users/${user}/avatar", AvatarEditPage.class)); - add(new TurboDevPageMapper("users/${user}/password", PasswordEditPage.class)); - add(new TurboDevPageMapper("users/${user}/token", TokenGeneratePage.class)); - } - - private void addGroupPages() { - add(new TurboDevPageMapper("groups", GroupListPage.class)); - add(new TurboDevPageMapper("groups/new", NewGroupPage.class)); - add(new TurboDevPageMapper("groups/${group}/profile", GroupProfilePage.class)); - add(new TurboDevPageMapper("groups/${group}/members", GroupMembershipsPage.class)); - add(new TurboDevPageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class)); - } - - private void addProjectPages() { - add(new TurboDevPageMapper("projects", ProjectListPage.class) { - - /* - * This logic is added to prevent url "/" from being redirected to "/projects" - */ - @Override - public Url mapHandler(IRequestHandler requestHandler) { - if (requestHandler instanceof BookmarkablePageRequestHandler - || requestHandler instanceof RenderPageRequestHandler) { - IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler; - if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) { - return null; - } - } - return super.mapHandler(requestHandler); - } - - }); - add(new TurboDevPageMapper("projects/new", NewProjectPage.class)); - add(new TurboDevPageMapper("projects/${project}", ProjectBlobPage.class)); - - add(new TurboDevPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) { - - /* - * This logic is added to prevent url "/projects/" from being redirected to - * "/projects//blob" - */ - @Override - public Url mapHandler(IRequestHandler requestHandler) { - if (requestHandler instanceof BookmarkablePageRequestHandler - || requestHandler instanceof RenderPageRequestHandler) { - IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler; - if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class - && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) { - return null; - } - } - return super.mapHandler(requestHandler); - } - - }); - add(new TurboDevPageMapper("projects/${project}/commit/${revision}", CommitDetailPage.class)); - add(new TurboDevPageMapper("projects/${project}/commits", ProjectCommitsPage.class)); - add(new TurboDevPageMapper("projects/${project}/compare", RevisionComparePage.class)); - add(new TurboDevPageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class)); - add(new TurboDevPageMapper("projects/${project}/stats/lines", SourceLinesPage.class)); - - add(new TurboDevPageMapper("projects/${project}/branches", ProjectBranchesPage.class)); - add(new TurboDevPageMapper("projects/${project}/tags", ProjectTagsPage.class)); - add(new TurboDevPageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class)); - - add(new TurboDevPageMapper("projects/${project}/pull", RequestListPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/new", NewRequestPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/${request}", RequestOverviewPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/${request}/overview", RequestOverviewPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/${request}/code-comments", RequestCodeCommentsPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/${request}/changes", RequestChangesPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/${request}/merge-preview", MergePreviewPage.class)); - add(new TurboDevPageMapper("projects/${project}/pull/${request}/invalid", InvalidRequestPage.class)); - - add(new TurboDevPageMapper("projects/${project}/settings/general", GeneralSettingPage.class)); - add(new TurboDevPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class)); - add(new TurboDevPageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class)); - add(new TurboDevPageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class)); - add(new TurboDevPageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class)); - - add(new TurboDevPageMapper("projects/${project}/no-commits", NoCommitsPage.class)); - } - -} diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/DiffViewMode.java b/web/src/main/java/com/turbodev/server/web/component/diff/revision/DiffViewMode.java deleted file mode 100644 index cb7b3b3df6..0000000000 --- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/DiffViewMode.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.web.component.diff.revision; - -public enum DiffViewMode { - UNIFIED, SPLIT -} diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/Skippable.java b/web/src/main/java/com/turbodev/server/web/component/wizard/Skippable.java deleted file mode 100644 index e0f1bdf4d4..0000000000 --- a/web/src/main/java/com/turbodev/server/web/component/wizard/Skippable.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.web.component.wizard; - -public interface Skippable { - void skip(); -} \ No newline at end of file diff --git a/web/src/main/java/com/turbodev/server/web/editable/EditSupportLocator.java b/web/src/main/java/com/turbodev/server/web/editable/EditSupportLocator.java deleted file mode 100644 index fb9523f015..0000000000 --- a/web/src/main/java/com/turbodev/server/web/editable/EditSupportLocator.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.web.editable; - -public class EditSupportLocator { - -} diff --git a/web/src/main/java/com/turbodev/server/web/img/Img.java b/web/src/main/java/com/turbodev/server/web/img/Img.java deleted file mode 100644 index b47e5f7d85..0000000000 --- a/web/src/main/java/com/turbodev/server/web/img/Img.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.turbodev.server.web.img; - -public class Img { - -} diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/SearchMenuContributor.java b/web/src/main/java/com/turbodev/server/web/page/project/blob/search/SearchMenuContributor.java deleted file mode 100644 index 9b03ea3a6b..0000000000 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/SearchMenuContributor.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.turbodev.server.web.page.project.blob.search; - -import java.util.List; - -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.menu.MenuItem; - -public interface SearchMenuContributor { - - List getMenuItems(FloatingPanel dropdown); - -} diff --git a/web/src/main/java/com/turbodev/server/web/util/commitmessagetransform/CommitMessageTransformer.java b/web/src/main/java/com/turbodev/server/web/util/commitmessagetransform/CommitMessageTransformer.java deleted file mode 100644 index e85f41abf4..0000000000 --- a/web/src/main/java/com/turbodev/server/web/util/commitmessagetransform/CommitMessageTransformer.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.turbodev.server.web.util.commitmessagetransform; - -import com.turbodev.launcher.loader.ExtensionPoint; -import com.turbodev.server.model.Project; - -@ExtensionPoint -public interface CommitMessageTransformer { - - String transform(Project project, String commitMessage); - -} diff --git a/web/src/main/java/com/turbodev/server/web/ComponentRenderer.java b/web/src/main/java/io/onedev/server/web/ComponentRenderer.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/ComponentRenderer.java rename to web/src/main/java/io/onedev/server/web/ComponentRenderer.java index 5fe929f3fe..7f656aebb0 100644 --- a/web/src/main/java/com/turbodev/server/web/ComponentRenderer.java +++ b/web/src/main/java/io/onedev/server/web/ComponentRenderer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/DefaultUrlManager.java b/web/src/main/java/io/onedev/server/web/DefaultUrlManager.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/DefaultUrlManager.java rename to web/src/main/java/io/onedev/server/web/DefaultUrlManager.java index 15ea79fab3..db0e37b9dc 100644 --- a/web/src/main/java/com/turbodev/server/web/DefaultUrlManager.java +++ b/web/src/main/java/io/onedev/server/web/DefaultUrlManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.util.List; @@ -9,18 +9,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; import com.google.common.base.Splitter; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.UrlManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; + +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.UrlManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; @Singleton public class DefaultUrlManager implements UrlManager { diff --git a/web/src/main/java/com/turbodev/server/web/DefaultWicketFilter.java b/web/src/main/java/io/onedev/server/web/DefaultWicketFilter.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/DefaultWicketFilter.java rename to web/src/main/java/io/onedev/server/web/DefaultWicketFilter.java index 2607095d44..65b2f1f52b 100644 --- a/web/src/main/java/com/turbodev/server/web/DefaultWicketFilter.java +++ b/web/src/main/java/io/onedev/server/web/DefaultWicketFilter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import org.apache.wicket.protocol.http.IWebApplicationFactory; import org.apache.wicket.protocol.http.WebApplication; @@ -7,7 +7,8 @@ import org.eclipse.jetty.websocket.api.WebSocketPolicy; import com.google.inject.Inject; import com.google.inject.Singleton; -import com.turbodev.server.web.websocket.WebSocketFilter; + +import io.onedev.server.web.websocket.WebSocketFilter; @Singleton public class DefaultWicketFilter extends WebSocketFilter { diff --git a/web/src/main/java/com/turbodev/server/web/DefaultWicketServlet.java b/web/src/main/java/io/onedev/server/web/DefaultWicketServlet.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/DefaultWicketServlet.java rename to web/src/main/java/io/onedev/server/web/DefaultWicketServlet.java index ef3fc394a6..ec5b29a00d 100644 --- a/web/src/main/java/com/turbodev/server/web/DefaultWicketServlet.java +++ b/web/src/main/java/io/onedev/server/web/DefaultWicketServlet.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.io.IOException; @@ -11,7 +11,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.wicket.protocol.http.WicketFilter; import org.apache.wicket.protocol.http.WicketServlet; -import com.turbodev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.annotation.Sessional; public class DefaultWicketServlet extends WicketServlet { diff --git a/web/src/main/java/com/turbodev/server/web/ExpectedExceptionContribution.java b/web/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/ExpectedExceptionContribution.java rename to web/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java index 4b22b3297c..ea6e57c2c9 100644 --- a/web/src/main/java/com/turbodev/server/web/ExpectedExceptionContribution.java +++ b/web/src/main/java/io/onedev/server/web/ExpectedExceptionContribution.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.util.Collection; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface ExpectedExceptionContribution { diff --git a/web/src/main/java/io/onedev/server/web/OneDevUrlMapper.java b/web/src/main/java/io/onedev/server/web/OneDevUrlMapper.java new file mode 100644 index 0000000000..c487d9e873 --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/OneDevUrlMapper.java @@ -0,0 +1,202 @@ +package io.onedev.server.web; + +import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; +import org.apache.wicket.core.request.handler.IPageClassRequestHandler; +import org.apache.wicket.core.request.handler.RenderPageRequestHandler; +import org.apache.wicket.core.request.mapper.ResourceMapper; +import org.apache.wicket.protocol.http.WebApplication; +import org.apache.wicket.request.IRequestHandler; +import org.apache.wicket.request.Url; +import org.apache.wicket.request.mapper.CompoundRequestMapper; + +import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage; +import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage; +import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage; +import io.onedev.server.web.page.admin.mailsetting.MailSettingPage; +import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage; +import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage; +import io.onedev.server.web.page.admin.serverlog.ServerLogPage; +import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage; +import io.onedev.server.web.page.group.GroupAuthorizationsPage; +import io.onedev.server.web.page.group.GroupListPage; +import io.onedev.server.web.page.group.GroupMembershipsPage; +import io.onedev.server.web.page.group.GroupProfilePage; +import io.onedev.server.web.page.group.NewGroupPage; +import io.onedev.server.web.page.init.ServerInitPage; +import io.onedev.server.web.page.project.NewProjectPage; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.branches.ProjectBranchesPage; +import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.commit.ProjectCommitsPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.page.project.pullrequest.InvalidRequestPage; +import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage; +import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage; +import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage; +import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage; +import io.onedev.server.web.page.project.setting.general.GeneralSettingPage; +import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage; +import io.onedev.server.web.page.project.stats.ProjectContribsPage; +import io.onedev.server.web.page.project.stats.SourceLinesPage; +import io.onedev.server.web.page.project.tags.ProjectTagsPage; +import io.onedev.server.web.page.security.ForgetPage; +import io.onedev.server.web.page.security.LoginPage; +import io.onedev.server.web.page.security.LogoutPage; +import io.onedev.server.web.page.security.RegisterPage; +import io.onedev.server.web.page.test.TestPage; +import io.onedev.server.web.page.user.AvatarEditPage; +import io.onedev.server.web.page.user.NewUserPage; +import io.onedev.server.web.page.user.PasswordEditPage; +import io.onedev.server.web.page.user.TaskListPage; +import io.onedev.server.web.page.user.TokenGeneratePage; +import io.onedev.server.web.page.user.UserAuthorizationsPage; +import io.onedev.server.web.page.user.UserListPage; +import io.onedev.server.web.page.user.UserMembershipsPage; +import io.onedev.server.web.page.user.UserProfilePage; +import io.onedev.server.web.util.mapper.OneDevPageMapper; +import io.onedev.server.web.util.mapper.OneDevResourceMapper; +import io.onedev.server.web.util.resource.ArchiveResourceReference; +import io.onedev.server.web.util.resource.AttachmentResourceReference; +import io.onedev.server.web.util.resource.RawBlobResourceReference; +import io.onedev.server.web.util.resource.ServerLogResourceReference; + +public class OneDevUrlMapper extends CompoundRequestMapper { + + public OneDevUrlMapper(WebApplication app) { + add(new OneDevPageMapper("init", ServerInitPage.class)); + addAdministrationPages(); + addUserPages(); + addGroupPages(); + addProjectPages(); + addSecurityPages(); + + add(new OneDevPageMapper("test", TestPage.class)); + + addResources(); + } + + private void addResources() { + add(new ResourceMapper("resource/server-log", new ServerLogResourceReference())); + add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveResourceReference())); + add(new OneDevResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobResourceReference())); + add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}", + new AttachmentResourceReference())); + } + + private void addSecurityPages() { + add(new OneDevPageMapper("login", LoginPage.class)); + add(new OneDevPageMapper("logout", LogoutPage.class)); + add(new OneDevPageMapper("register", RegisterPage.class)); + add(new OneDevPageMapper("forget", ForgetPage.class)); + } + + private void addAdministrationPages() { + add(new OneDevPageMapper("administration/settings/system", SystemSettingPage.class)); + add(new OneDevPageMapper("administration/settings/mail", MailSettingPage.class)); + add(new OneDevPageMapper("administration/settings/backup", DatabaseBackupPage.class)); + add(new OneDevPageMapper("administration/settings/security", SecuritySettingPage.class)); + add(new OneDevPageMapper("administration/settings/authenticator", AuthenticatorPage.class)); + add(new OneDevPageMapper("administration/server-log", ServerLogPage.class)); + add(new OneDevPageMapper("administration/server-information", ServerInformationPage.class)); + add(new OneDevPageMapper("administration/license-management", LicenseManagementPage.class)); + } + + private void addUserPages() { + add(new OneDevPageMapper("users", UserListPage.class)); + add(new OneDevPageMapper("users/new", NewUserPage.class)); + add(new OneDevPageMapper("users/${user}/profile", UserProfilePage.class)); + add(new OneDevPageMapper("users/${user}/groups", UserMembershipsPage.class)); + add(new OneDevPageMapper("users/${user}/authorizations", UserAuthorizationsPage.class)); + add(new OneDevPageMapper("users/${user}/tasks", TaskListPage.class)); + add(new OneDevPageMapper("users/${user}/avatar", AvatarEditPage.class)); + add(new OneDevPageMapper("users/${user}/password", PasswordEditPage.class)); + add(new OneDevPageMapper("users/${user}/token", TokenGeneratePage.class)); + } + + private void addGroupPages() { + add(new OneDevPageMapper("groups", GroupListPage.class)); + add(new OneDevPageMapper("groups/new", NewGroupPage.class)); + add(new OneDevPageMapper("groups/${group}/profile", GroupProfilePage.class)); + add(new OneDevPageMapper("groups/${group}/members", GroupMembershipsPage.class)); + add(new OneDevPageMapper("groups/${group}/authorizations", GroupAuthorizationsPage.class)); + } + + private void addProjectPages() { + add(new OneDevPageMapper("projects", ProjectListPage.class) { + + /* + * This logic is added to prevent url "/" from being redirected to "/projects" + */ + @Override + public Url mapHandler(IRequestHandler requestHandler) { + if (requestHandler instanceof BookmarkablePageRequestHandler + || requestHandler instanceof RenderPageRequestHandler) { + IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler; + if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) { + return null; + } + } + return super.mapHandler(requestHandler); + } + + }); + add(new OneDevPageMapper("projects/new", NewProjectPage.class)); + add(new OneDevPageMapper("projects/${project}", ProjectBlobPage.class)); + + add(new OneDevPageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) { + + /* + * This logic is added to prevent url "/projects/" from being redirected to + * "/projects//blob" + */ + @Override + public Url mapHandler(IRequestHandler requestHandler) { + if (requestHandler instanceof BookmarkablePageRequestHandler + || requestHandler instanceof RenderPageRequestHandler) { + IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler; + if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class + && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) { + return null; + } + } + return super.mapHandler(requestHandler); + } + + }); + add(new OneDevPageMapper("projects/${project}/commit/${revision}", CommitDetailPage.class)); + add(new OneDevPageMapper("projects/${project}/commits", ProjectCommitsPage.class)); + add(new OneDevPageMapper("projects/${project}/compare", RevisionComparePage.class)); + add(new OneDevPageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class)); + add(new OneDevPageMapper("projects/${project}/stats/lines", SourceLinesPage.class)); + + add(new OneDevPageMapper("projects/${project}/branches", ProjectBranchesPage.class)); + add(new OneDevPageMapper("projects/${project}/tags", ProjectTagsPage.class)); + add(new OneDevPageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class)); + + add(new OneDevPageMapper("projects/${project}/pull", RequestListPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/new", NewRequestPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/${request}", RequestOverviewPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/${request}/overview", RequestOverviewPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/${request}/code-comments", RequestCodeCommentsPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/${request}/changes", RequestChangesPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/${request}/merge-preview", MergePreviewPage.class)); + add(new OneDevPageMapper("projects/${project}/pull/${request}/invalid", InvalidRequestPage.class)); + + add(new OneDevPageMapper("projects/${project}/settings/general", GeneralSettingPage.class)); + add(new OneDevPageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class)); + add(new OneDevPageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class)); + add(new OneDevPageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class)); + add(new OneDevPageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class)); + + add(new OneDevPageMapper("projects/${project}/no-commits", NoCommitsPage.class)); + } + +} diff --git a/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java b/web/src/main/java/io/onedev/server/web/OneDevWebApplication.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java rename to web/src/main/java/io/onedev/server/web/OneDevWebApplication.java index c9b8c7537c..2694ea467c 100644 --- a/web/src/main/java/com/turbodev/server/web/TurboDevWebApplication.java +++ b/web/src/main/java/io/onedev/server/web/OneDevWebApplication.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.io.IOException; import java.util.ArrayList; @@ -50,22 +50,21 @@ import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.request.mapper.info.PageComponentInfo; import org.apache.wicket.util.IProvider; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.web.page.base.BasePage; -import com.turbodev.server.web.page.error.BaseErrorPage; -import com.turbodev.server.web.page.error.ExpectedExceptionPage; -import com.turbodev.server.web.page.error.UnexpectedExceptionPage; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.server.web.util.AbsoluteUrlRenderer; -import com.turbodev.server.web.util.resourcebundle.ResourceBundleReferences; -import com.turbodev.server.web.websocket.WebSocketManager; -import com.turbodev.utils.ExceptionUtils; - import de.agilecoders.wicket.core.settings.BootstrapSettings; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.web.page.base.BasePage; +import io.onedev.server.web.page.error.BaseErrorPage; +import io.onedev.server.web.page.error.ExpectedExceptionPage; +import io.onedev.server.web.page.error.UnexpectedExceptionPage; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.server.web.util.AbsoluteUrlRenderer; +import io.onedev.server.web.util.resourcebundle.ResourceBundleReferences; +import io.onedev.server.web.websocket.WebSocketManager; +import io.onedev.utils.ExceptionUtils; @Singleton -public class TurboDevWebApplication extends WebApplication { +public class OneDevWebApplication extends WebApplication { private final Set expectedExceptionContributions; @@ -180,7 +179,7 @@ public class TurboDevWebApplication extends WebApplication { }); - mount(new TurboDevUrlMapper(this)); + mount(new OneDevUrlMapper(this)); } @Override @@ -213,12 +212,12 @@ public class TurboDevWebApplication extends WebApplication { } @Inject - public TurboDevWebApplication(Set expectedExceptionContributions) { + public OneDevWebApplication(Set expectedExceptionContributions) { this.expectedExceptionContributions = expectedExceptionContributions; } - public static TurboDevWebApplication get() { - return (TurboDevWebApplication) Application.get(); + public static OneDevWebApplication get() { + return (OneDevWebApplication) Application.get(); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/PrioritizedComponentRenderer.java b/web/src/main/java/io/onedev/server/web/PrioritizedComponentRenderer.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/PrioritizedComponentRenderer.java rename to web/src/main/java/io/onedev/server/web/PrioritizedComponentRenderer.java index 05e18389b1..9c60344805 100644 --- a/web/src/main/java/com/turbodev/server/web/PrioritizedComponentRenderer.java +++ b/web/src/main/java/io/onedev/server/web/PrioritizedComponentRenderer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import org.apache.wicket.Component; diff --git a/web/src/main/java/com/turbodev/server/web/ResourcePackScopeContribution.java b/web/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java similarity index 63% rename from web/src/main/java/com/turbodev/server/web/ResourcePackScopeContribution.java rename to web/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java index 79a75f65bd..a72b8208b2 100644 --- a/web/src/main/java/com/turbodev/server/web/ResourcePackScopeContribution.java +++ b/web/src/main/java/io/onedev/server/web/ResourcePackScopeContribution.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.util.Collection; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface ResourcePackScopeContribution { diff --git a/web/src/main/java/com/turbodev/server/web/WebConstants.java b/web/src/main/java/io/onedev/server/web/WebConstants.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/WebConstants.java rename to web/src/main/java/io/onedev/server/web/WebConstants.java index 54ae4230a9..89a047e449 100644 --- a/web/src/main/java/com/turbodev/server/web/WebConstants.java +++ b/web/src/main/java/io/onedev/server/web/WebConstants.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; diff --git a/web/src/main/java/com/turbodev/server/web/WebModule.java b/web/src/main/java/io/onedev/server/web/WebModule.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/WebModule.java rename to web/src/main/java/io/onedev/server/web/WebModule.java index 25848b527b..7c6b597211 100644 --- a/web/src/main/java/com/turbodev/server/web/WebModule.java +++ b/web/src/main/java/io/onedev/server/web/WebModule.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import java.util.Collection; @@ -16,37 +16,38 @@ import org.hibernate.ObjectNotFoundException; import org.hibernate.StaleStateException; import org.hibernate.exception.ConstraintViolationException; -import com.turbodev.launcher.loader.AbstractPlugin; -import com.turbodev.launcher.loader.AbstractPluginModule; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import com.turbodev.server.git.exception.GitException; -import com.turbodev.server.manager.UrlManager; -import com.turbodev.server.util.markdown.MarkdownProcessor; -import com.turbodev.server.util.reviewrequirement.InvalidReviewRuleException; -import com.turbodev.server.web.component.diff.DiffRenderer; -import com.turbodev.server.web.component.markdown.SourcePositionTrackExtension; -import com.turbodev.server.web.component.markdown.emoji.EmojiExtension; -import com.turbodev.server.web.editable.DefaultEditSupportRegistry; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.EditSupportLocator; -import com.turbodev.server.web.editable.EditSupportRegistry; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.util.avatar.AvatarManager; -import com.turbodev.server.web.util.avatar.DefaultAvatarManager; -import com.turbodev.server.web.util.commitmessagetransform.CommitMessageTransformer; -import com.turbodev.server.web.util.commitmessagetransform.PatternCommitMessageTransformer; -import com.turbodev.server.web.util.markdown.MentionProcessor; -import com.turbodev.server.web.util.markdown.PullRequestProcessor; -import com.turbodev.server.web.util.markdown.RelativeUrlProcessor; -import com.turbodev.server.web.websocket.CodeCommentChangeBroadcaster; -import com.turbodev.server.web.websocket.CommitIndexedBroadcaster; -import com.turbodev.server.web.websocket.DefaultWebSocketManager; -import com.turbodev.server.web.websocket.PullRequestChangeBroadcaster; -import com.turbodev.server.web.websocket.TaskChangeBroadcaster; -import com.turbodev.server.web.websocket.WebSocketManager; import com.vladsch.flexmark.Extension; +import io.onedev.launcher.loader.AbstractPlugin; +import io.onedev.launcher.loader.AbstractPluginModule; +import io.onedev.server.git.exception.GitException; +import io.onedev.server.manager.UrlManager; +import io.onedev.server.util.markdown.MarkdownProcessor; +import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException; +import io.onedev.server.web.component.diff.DiffRenderer; +import io.onedev.server.web.component.markdown.SourcePositionTrackExtension; +import io.onedev.server.web.component.markdown.emoji.EmojiExtension; +import io.onedev.server.web.editable.DefaultEditSupportRegistry; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.EditSupportLocator; +import io.onedev.server.web.editable.EditSupportRegistry; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.util.avatar.AvatarManager; +import io.onedev.server.web.util.avatar.DefaultAvatarManager; +import io.onedev.server.web.util.commitmessagetransform.CommitMessageTransformer; +import io.onedev.server.web.util.commitmessagetransform.PatternCommitMessageTransformer; +import io.onedev.server.web.util.markdown.MentionProcessor; +import io.onedev.server.web.util.markdown.PullRequestProcessor; +import io.onedev.server.web.util.markdown.RelativeUrlProcessor; +import io.onedev.server.web.websocket.CodeCommentChangeBroadcaster; +import io.onedev.server.web.websocket.CommitIndexedBroadcaster; +import io.onedev.server.web.websocket.DefaultWebSocketManager; +import io.onedev.server.web.websocket.PullRequestChangeBroadcaster; +import io.onedev.server.web.websocket.TaskChangeBroadcaster; +import io.onedev.server.web.websocket.WebSocketManager; + /** * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class. * @@ -67,8 +68,8 @@ public class WebModule extends AbstractPluginModule { contributeFromPackage(EditSupport.class, EditSupport.class); - bind(WebApplication.class).to(TurboDevWebApplication.class); - bind(Application.class).to(TurboDevWebApplication.class); + bind(WebApplication.class).to(OneDevWebApplication.class); + bind(Application.class).to(OneDevWebApplication.class); bind(AvatarManager.class).to(DefaultAvatarManager.class); bind(WebSocketManager.class).to(DefaultWebSocketManager.class); diff --git a/web/src/main/java/com/turbodev/server/web/WebPlugin.java b/web/src/main/java/io/onedev/server/web/WebPlugin.java similarity index 72% rename from web/src/main/java/com/turbodev/server/web/WebPlugin.java rename to web/src/main/java/io/onedev/server/web/WebPlugin.java index bbd7a63fdb..ac78af883a 100644 --- a/web/src/main/java/com/turbodev/server/web/WebPlugin.java +++ b/web/src/main/java/io/onedev/server/web/WebPlugin.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import javax.inject.Inject; -import com.turbodev.launcher.loader.AbstractPlugin; -import com.turbodev.server.web.websocket.WebSocketManager; +import io.onedev.launcher.loader.AbstractPlugin; +import io.onedev.server.web.websocket.WebSocketManager; public class WebPlugin extends AbstractPlugin { diff --git a/web/src/main/java/com/turbodev/server/web/WebSession.java b/web/src/main/java/io/onedev/server/web/WebSession.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/WebSession.java rename to web/src/main/java/io/onedev/server/web/WebSession.java index 4b2cf4d250..9c939464b0 100644 --- a/web/src/main/java/com/turbodev/server/web/WebSession.java +++ b/web/src/main/java/io/onedev/server/web/WebSession.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web; +package io.onedev.server.web; import javax.servlet.http.HttpSession; @@ -8,7 +8,7 @@ import org.apache.shiro.subject.Subject; import org.apache.wicket.protocol.http.WicketServlet; import org.apache.wicket.request.Request; -import com.turbodev.server.TurboDev; +import io.onedev.server.OneDev; public class WebSession extends org.apache.wicket.protocol.http.WebSession { @@ -44,7 +44,7 @@ public class WebSession extends org.apache.wicket.protocol.http.WebSession { } public static WebSession from(HttpSession session) { - String attributeName = "wicket:" + TurboDev.getInstance(WicketServlet.class).getServletName() + ":session"; + String attributeName = "wicket:" + OneDev.getInstance(WicketServlet.class).getServletName() + ":session"; return (WebSession) session.getAttribute(attributeName); } diff --git a/web/src/main/java/com/turbodev/server/web/asset/align/AlignResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/align/AlignResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/asset/align/AlignResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/align/AlignResourceReference.java index 1c06d4d19c..f4d02c1e05 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/align/AlignResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/align/AlignResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.align; +package io.onedev.server.web.asset.align; import java.util.ArrayList; import java.util.List; @@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference; +import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference; public class AlignResourceReference extends JavaScriptResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/asset/align/jquery.align.js b/web/src/main/java/io/onedev/server/web/asset/align/jquery.align.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/align/jquery.align.js rename to web/src/main/java/io/onedev/server/web/asset/align/jquery.align.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/areyousure/AreYouSureResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/areyousure/AreYouSureResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/areyousure/AreYouSureResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/areyousure/AreYouSureResourceReference.java index d2c033d122..5a6a84fd5d 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/areyousure/AreYouSureResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/areyousure/AreYouSureResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.areyousure; +package io.onedev.server.web.asset.areyousure; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/areyousure/jquery.are-you-sure.patched.js b/web/src/main/java/io/onedev/server/web/asset/areyousure/jquery.are-you-sure.patched.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/areyousure/jquery.are-you-sure.patched.js rename to web/src/main/java/io/onedev/server/web/asset/areyousure/jquery.are-you-sure.patched.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/atwho/AtWhoResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/asset/atwho/AtWhoResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java index 9a43585ad0..07617f8bde 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/atwho/AtWhoResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.atwho; +package io.onedev.server.web.asset.atwho; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho-caret.js b/web/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho-caret.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho-caret.js rename to web/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho-caret.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.css b/web/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.css rename to web/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.css diff --git a/web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.js b/web/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/atwho/jquery.atwho.js rename to web/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/autosize/AutoSizeResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/autosize/AutoSizeResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/autosize/AutoSizeResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/autosize/AutoSizeResourceReference.java index fe82ebd147..3a86df1924 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/autosize/AutoSizeResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/autosize/AutoSizeResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.autosize; +package io.onedev.server.web.asset.autosize; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/autosize/autosize.js b/web/src/main/java/io/onedev/server/web/asset/autosize/autosize.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/autosize/autosize.js rename to web/src/main/java/io/onedev/server/web/asset/autosize/autosize.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/caret/CaretResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/caret/CaretResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/caret/CaretResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/caret/CaretResourceReference.java index 27c44d8bfb..e56b6859e8 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/caret/CaretResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/caret/CaretResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.caret; +package io.onedev.server.web.asset.caret; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/caret/jquery.caret-1.5.2.js b/web/src/main/java/io/onedev/server/web/asset/caret/jquery.caret-1.5.2.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/caret/jquery.caret-1.5.2.js rename to web/src/main/java/io/onedev/server/web/asset/caret/jquery.caret-1.5.2.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/chart/ChartResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/chart/ChartResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/chart/ChartResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/chart/ChartResourceReference.java index 183a83e413..f297a06bd3 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/chart/ChartResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/chart/ChartResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.chart; +package io.onedev.server.web.asset.chart; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/chart/chart.bundle.min.js b/web/src/main/java/io/onedev/server/web/asset/chart/chart.bundle.min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/chart/chart.bundle.min.js rename to web/src/main/java/io/onedev/server/web/asset/chart/chart.bundle.min.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/clipboard/ClipboardResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/clipboard/ClipboardResourceReference.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/asset/clipboard/ClipboardResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/clipboard/ClipboardResourceReference.java index 1ba2eed84b..cebc3f143d 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/clipboard/ClipboardResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/clipboard/ClipboardResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.clipboard; +package io.onedev.server.web.asset.clipboard; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/asset/clipboard/clipboard.min.js b/web/src/main/java/io/onedev/server/web/asset/clipboard/clipboard.min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/clipboard/clipboard.min.js rename to web/src/main/java/io/onedev/server/web/asset/clipboard/clipboard.min.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/CodeMirrorResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/CodeMirrorResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java index 958d6c0013..bc3463fcf4 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/codemirror/CodeMirrorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/codemirror/CodeMirrorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.codemirror; +package io.onedev.server.web.asset.codemirror; import java.util.List; @@ -6,13 +6,12 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; -import com.turbodev.server.web.util.resourcebundle.ResourceBundle; - import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference; import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.util.resourcebundle.ResourceBundle; @ResourceBundle public class CodeMirrorResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/ModeUrlResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/ModeUrlResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java index 4464f3963d..042b2af5cc 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/codemirror/ModeUrlResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/codemirror/ModeUrlResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.codemirror; +package io.onedev.server.web.asset.codemirror; import java.util.List; @@ -8,9 +8,8 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.utils.StringUtils; - import de.agilecoders.wicket.webjars.request.resource.WebjarsJavaScriptResourceReference; +import io.onedev.utils.StringUtils; public class ModeUrlResourceReference extends JavaScriptResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/annotatescrollbar2.js b/web/src/main/java/io/onedev/server/web/asset/codemirror/annotatescrollbar2.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/annotatescrollbar2.js rename to web/src/main/java/io/onedev/server/web/asset/codemirror/annotatescrollbar2.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/blank.js b/web/src/main/java/io/onedev/server/web/asset/codemirror/blank.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/blank.js rename to web/src/main/java/io/onedev/server/web/asset/codemirror/blank.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.css b/web/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.css rename to web/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.css diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.js b/web/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js similarity index 97% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.js rename to web/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js index 457c292337..0712b61f6a 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/codemirror/codemirror.js +++ b/web/src/main/java/io/onedev/server/web/asset/codemirror/codemirror.js @@ -1,4 +1,4 @@ -turbodev.server.codemirror = { +onedev.server.codemirror = { clearMark: function(cm) { var marks = cm.getAllMarks(); for (var i=0; icode").each(function() { var $this = $(this); $this.parent().addClass("highlight"); var text = $this.text().trim(); $this.empty(); var cm = CodeMirror(this, { - readOnly: turbodev.server.util.isDevice()?"nocursor":true, + readOnly: onedev.server.util.isDevice()?"nocursor":true, value: text, highlightIdentifiers: {delay: 500}, theme: "eclipse", diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/identifier-highlighter.js b/web/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/identifier-highlighter.js rename to web/src/main/java/io/onedev/server/web/asset/codemirror/identifier-highlighter.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/matchesonscrollbar2.js b/web/src/main/java/io/onedev/server/web/asset/codemirror/matchesonscrollbar2.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/matchesonscrollbar2.js rename to web/src/main/java/io/onedev/server/web/asset/codemirror/matchesonscrollbar2.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/codemirror/simplescrollbars.js b/web/src/main/java/io/onedev/server/web/asset/codemirror/simplescrollbars.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/codemirror/simplescrollbars.js rename to web/src/main/java/io/onedev/server/web/asset/codemirror/simplescrollbars.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/cookies/CookiesResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/cookies/CookiesResourceReference.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/asset/cookies/CookiesResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/cookies/CookiesResourceReference.java index 261799600b..5fb99fc67c 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/cookies/CookiesResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/cookies/CookiesResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.cookies; +package io.onedev.server.web.asset.cookies; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/asset/cookies/cookies.min.js b/web/src/main/java/io/onedev/server/web/asset/cookies/cookies.min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/cookies/cookies.min.js rename to web/src/main/java/io/onedev/server/web/asset/cookies/cookies.min.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java index bd508f25e2..84cd13e577 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/diffmatchpatch/DiffMatchPatchResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.diffmatchpatch; +package io.onedev.server.web.asset.diffmatchpatch; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/diff_match_patch.js b/web/src/main/java/io/onedev/server/web/asset/diffmatchpatch/diff_match_patch.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/diffmatchpatch/diff_match_patch.js rename to web/src/main/java/io/onedev/server/web/asset/diffmatchpatch/diff_match_patch.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/doneevents/DoneEventsResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/doneevents/DoneEventsResourceReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/asset/doneevents/DoneEventsResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/doneevents/DoneEventsResourceReference.java index 36eca834c6..f091f857c0 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/doneevents/DoneEventsResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/doneevents/DoneEventsResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.doneevents; +package io.onedev.server.web.asset.doneevents; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/doneevents/jquery.doneevents.js b/web/src/main/java/io/onedev/server/web/asset/doneevents/jquery.doneevents.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/doneevents/jquery.doneevents.js rename to web/src/main/java/io/onedev/server/web/asset/doneevents/jquery.doneevents.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/dropzone/DropzoneResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/dropzone/DropzoneResourceReference.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/asset/dropzone/DropzoneResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/dropzone/DropzoneResourceReference.java index 6d771f42cb..2475b7fc1d 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/dropzone/DropzoneResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/dropzone/DropzoneResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.dropzone; +package io.onedev.server.web.asset.dropzone; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.css b/web/src/main/java/io/onedev/server/web/asset/dropzone/dropzone.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.css rename to web/src/main/java/io/onedev/server/web/asset/dropzone/dropzone.css diff --git a/web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.js b/web/src/main/java/io/onedev/server/web/asset/dropzone/dropzone.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/dropzone/dropzone.js rename to web/src/main/java/io/onedev/server/web/asset/dropzone/dropzone.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/FontExtResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/fontext/FontExtResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/FontExtResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/fontext/FontExtResourceReference.java index 1c7fbdd2c6..7b1133baaf 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/fontext/FontExtResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/fontext/FontExtResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.fontext; +package io.onedev.server.web.asset.fontext; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/cheatsheet.html b/web/src/main/java/io/onedev/server/web/asset/fontext/cheatsheet.html similarity index 98% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/cheatsheet.html rename to web/src/main/java/io/onedev/server/web/asset/fontext/cheatsheet.html index 916bc88244..106b91fda3 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/fontext/cheatsheet.html +++ b/web/src/main/java/io/onedev/server/web/asset/fontext/cheatsheet.html @@ -87,7 +87,7 @@

Basic Shapes 9 icons

    -
  • turbodev-logo F100
    • +
  • onedev-logo F100
  • markdown F110
    • diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.css b/web/src/main/java/io/onedev/server/web/asset/fontext/fontext.css similarity index 98% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.css rename to web/src/main/java/io/onedev/server/web/asset/fontext/fontext.css index 7256e5d21d..0fc57d73ef 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.css +++ b/web/src/main/java/io/onedev/server/web/asset/fontext/fontext.css @@ -1,7 +1,7 @@ @font-face { font-family: "fontext"; src: url("fontext.eot?v=1.0.19"); src: url("fontext.eot?v=1.0.19#iefix") format("embedded-opentype"), url("fontext.ttf?v=1.0.19") format("truetype"), url("../fonts/ponticons.woff?v=1.0.19") format("woff"), url("fontext.svg?v=1.0.19#fontext") format("svg"); font-weight: normal; font-style: normal; } .fa-ext {font: normal 14px "fontext"; display: inline-block; speak: none; text-transform: none; text-rendering: auto; line-height: 1; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;} -.fa-turbodev-logo:before { content: "\f100"; } +.fa-onedev-logo:before { content: "\f100"; } .fa-markdown:before { content: "\f110"; } diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.eot b/web/src/main/java/io/onedev/server/web/asset/fontext/fontext.eot similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.eot rename to web/src/main/java/io/onedev/server/web/asset/fontext/fontext.eot diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.svg b/web/src/main/java/io/onedev/server/web/asset/fontext/fontext.svg similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.svg rename to web/src/main/java/io/onedev/server/web/asset/fontext/fontext.svg diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.ttf b/web/src/main/java/io/onedev/server/web/asset/fontext/fontext.ttf similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.ttf rename to web/src/main/java/io/onedev/server/web/asset/fontext/fontext.ttf diff --git a/web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.woff b/web/src/main/java/io/onedev/server/web/asset/fontext/fontext.woff similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/fontext/fontext.woff rename to web/src/main/java/io/onedev/server/web/asset/fontext/fontext.woff diff --git a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/hotkeys/HotkeysResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/hotkeys/HotkeysResourceReference.java index c1098c88ff..8dc5649888 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/HotkeysResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/hotkeys/HotkeysResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.hotkeys; +package io.onedev.server.web.asset.hotkeys; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.js b/web/src/main/java/io/onedev/server/web/asset/hotkeys/jquery.hotkeys.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/hotkeys/jquery.hotkeys.js rename to web/src/main/java/io/onedev/server/web/asset/hotkeys/jquery.hotkeys.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/hover/HoverResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/hover/HoverResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/hover/HoverResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/hover/HoverResourceReference.java index 81feae1bff..27944e1d70 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/hover/HoverResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/hover/HoverResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.hover; +package io.onedev.server.web.asset.hover; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/hover/jquery.hover.js b/web/src/main/java/io/onedev/server/web/asset/hover/jquery.hover.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/hover/jquery.hover.js rename to web/src/main/java/io/onedev/server/web/asset/hover/jquery.hover.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/jqueryui/JQueryUIResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/jqueryui/JQueryUIResourceReference.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/asset/jqueryui/JQueryUIResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/jqueryui/JQueryUIResourceReference.java index 71cb7d1fa8..8d0efad7c8 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/jqueryui/JQueryUIResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/jqueryui/JQueryUIResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.jqueryui; +package io.onedev.server.web.asset.jqueryui; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.css b/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.css rename to web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.css diff --git a/web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.js b/web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/jqueryui/jquery-ui.min.js rename to web/src/main/java/io/onedev/server/web/asset/jqueryui/jquery-ui.min.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/mousewheel/MouseWheelResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/mousewheel/MouseWheelResourceReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/asset/mousewheel/MouseWheelResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/mousewheel/MouseWheelResourceReference.java index 69db4d170c..b5915162d4 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/mousewheel/MouseWheelResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/mousewheel/MouseWheelResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.mousewheel; +package io.onedev.server.web.asset.mousewheel; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/mousewheel/jquery.mousewheel.js b/web/src/main/java/io/onedev/server/web/asset/mousewheel/jquery.mousewheel.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/mousewheel/jquery.mousewheel.js rename to web/src/main/java/io/onedev/server/web/asset/mousewheel/jquery.mousewheel.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/oneline/OnelineResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/oneline/OnelineResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/asset/oneline/OnelineResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/oneline/OnelineResourceReference.java index 5edc022de1..5e726d468b 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/oneline/OnelineResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/oneline/OnelineResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.oneline; +package io.onedev.server.web.asset.oneline; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/oneline/jquery.oneline.js b/web/src/main/java/io/onedev/server/web/asset/oneline/jquery.oneline.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/oneline/jquery.oneline.js rename to web/src/main/java/io/onedev/server/web/asset/oneline/jquery.oneline.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java index 4f8de08b66..5f0f6a103a 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/PerfectScrollbarResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.perfectscrollbar; +package io.onedev.server.web.asset.perfectscrollbar; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.css b/web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/perfect-scrollbar.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.css rename to web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/perfect-scrollbar.css diff --git a/web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.js b/web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.js rename to web/src/main/java/io/onedev/server/web/asset/perfectscrollbar/perfect-scrollbar.min.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java index 7be72263a3..cb4658e6b7 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/scrollintoview/ScrollIntoViewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.scrollintoview; +package io.onedev.server.web.asset.scrollintoview; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/scrollintoview/jquery.scrollintoview.js b/web/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/scrollintoview/jquery.scrollintoview.js rename to web/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java index c260c7fa8d..62f5c9d7c8 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/selectionpopover/SelectionPopoverResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.selectionpopover; +package io.onedev.server.web.asset.selectionpopover; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.css b/web/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.css rename to web/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.css diff --git a/web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.js b/web/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/selectionpopover/jquery.selectionpopover.js rename to web/src/main/java/io/onedev/server/web/asset/selectionpopover/jquery.selectionpopover.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/snapsvg/SnapSvgResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/snapsvg/SnapSvgResourceReference.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/asset/snapsvg/SnapSvgResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/snapsvg/SnapSvgResourceReference.java index dd32093b65..ce46264b7a 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/snapsvg/SnapSvgResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/snapsvg/SnapSvgResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.snapsvg; +package io.onedev.server.web.asset.snapsvg; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/asset/snapsvg/snap.svg-min.js b/web/src/main/java/io/onedev/server/web/asset/snapsvg/snap.svg-min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/snapsvg/snap.svg-min.js rename to web/src/main/java/io/onedev/server/web/asset/snapsvg/snap.svg-min.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java index a4f012fd2c..7315491a1b 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/textareacaretposition/TextareaCaretPositionResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.textareacaretposition; +package io.onedev.server.web.asset.textareacaretposition; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/textarea-caret-position.js b/web/src/main/java/io/onedev/server/web/asset/textareacaretposition/textarea-caret-position.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/textareacaretposition/textarea-caret-position.js rename to web/src/main/java/io/onedev/server/web/asset/textareacaretposition/textarea-caret-position.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/uri/URI.js b/web/src/main/java/io/onedev/server/web/asset/uri/URI.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/asset/uri/URI.js rename to web/src/main/java/io/onedev/server/web/asset/uri/URI.js diff --git a/web/src/main/java/com/turbodev/server/web/asset/uri/URIResourceReference.java b/web/src/main/java/io/onedev/server/web/asset/uri/URIResourceReference.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/asset/uri/URIResourceReference.java rename to web/src/main/java/io/onedev/server/web/asset/uri/URIResourceReference.java index 6bd5b5e4ed..31e4c333dc 100644 --- a/web/src/main/java/com/turbodev/server/web/asset/uri/URIResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/asset/uri/URIResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.asset.uri; +package io.onedev.server.web.asset.uri; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/behavior/AbstractPostAjaxBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/AbstractPostAjaxBehavior.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/behavior/AbstractPostAjaxBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/AbstractPostAjaxBehavior.java index 6dfddb0e68..6a6f78960c 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/AbstractPostAjaxBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/AbstractPostAjaxBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; diff --git a/web/src/main/java/com/turbodev/server/web/behavior/BranchPatternAssistBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/behavior/BranchPatternAssistBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java index 5b8be13990..07342003c5 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/BranchPatternAssistBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/BranchPatternAssistBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,15 @@ import java.util.List; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.utils.Range; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.inputassist.InputAssistBehavior; +import io.onedev.server.web.util.SuggestionUtils; +import io.onedev.utils.Range; + import com.google.common.collect.Lists; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.inputassist.InputAssistBehavior; -import com.turbodev.server.web.util.SuggestionUtils; @SuppressWarnings("serial") public class BranchPatternAssistBehavior extends InputAssistBehavior { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/InputChangeBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/InputChangeBehavior.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/behavior/InputChangeBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/InputChangeBehavior.java index 91358780fc..905b61473a 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/InputChangeBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/InputChangeBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import java.util.Objects; diff --git a/web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java index fd318c04ec..7c267b1c62 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/OnTypingDoneBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import java.util.Objects; @@ -10,7 +10,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.form.FormComponent; -import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference; +import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference; @SuppressWarnings("serial") public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehavior{ diff --git a/web/src/main/java/com/turbodev/server/web/behavior/PathPatternAssistBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/behavior/PathPatternAssistBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java index 9d344320ce..2f8a9d3acf 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/PathPatternAssistBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/PathPatternAssistBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,15 @@ import java.util.List; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.utils.Range; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.inputassist.InputAssistBehavior; +import io.onedev.server.web.util.SuggestionUtils; +import io.onedev.utils.Range; + import com.google.common.collect.Lists; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.inputassist.InputAssistBehavior; -import com.turbodev.server.web.util.SuggestionUtils; @SuppressWarnings("serial") public class PathPatternAssistBehavior extends InputAssistBehavior { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/RunTaskBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/behavior/RunTaskBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java index 0cd4eb9b64..c556b1aef9 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/RunTaskBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/RunTaskBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import org.apache.wicket.ajax.AjaxRequestTarget; diff --git a/web/src/main/java/com/turbodev/server/web/behavior/TagPatternAssistBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/behavior/TagPatternAssistBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java index d6a5a65a25..96e282c2b0 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/TagPatternAssistBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/TagPatternAssistBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import java.util.ArrayList; import java.util.List; @@ -6,14 +6,15 @@ import java.util.List; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.utils.Range; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.inputassist.InputAssistBehavior; +import io.onedev.server.web.util.SuggestionUtils; +import io.onedev.utils.Range; + import com.google.common.collect.Lists; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.inputassist.InputAssistBehavior; -import com.turbodev.server.web.util.SuggestionUtils; @SuppressWarnings("serial") public class TagPatternAssistBehavior extends InputAssistBehavior { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/TooltipBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/TooltipBehavior.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/behavior/TooltipBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/TooltipBehavior.java index dd87c60dad..4a20b279f2 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/TooltipBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/TooltipBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior; +package io.onedev.server.web.behavior; import org.apache.wicket.Component; import org.apache.wicket.markup.ComponentTag; diff --git a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java index 3da9bf05ec..f0a82b2045 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.blamemessage; +package io.onedev.server.web.behavior.blamemessage; 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.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.util.DateUtils; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.util.DateUtils; public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior { @@ -35,7 +35,7 @@ public abstract class BlameMessageBehavior extends AbstractPostAjaxBehavior { authoring = "undefined"; } String message = JavaScriptEscape.escapeJavaScript(commit.getFullMessage()); - String script = String.format("turbodev.server.blameMessage.show('%s', %s, '%s');", tooltipId, authoring, message); + String script = String.format("onedev.server.blameMessage.show('%s', %s, '%s');", tooltipId, authoring, message); target.appendJavaScript(script); } diff --git a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java index 4cb6b76cc1..2a2b10ce53 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageCssResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.behavior.blamemessage; +package io.onedev.server.web.behavior.blamemessage; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class BlameMessageCssResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageResourceReference.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageResourceReference.java index c76c7ff08a..7a87a98b67 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/BlameMessageResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/BlameMessageResourceReference.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.behavior.blamemessage; +package io.onedev.server.web.behavior.blamemessage; import java.util.List; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class BlameMessageResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/blame-message.css b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/blamemessage/blame-message.css rename to web/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.css diff --git a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/blame-message.js b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.js similarity index 93% rename from web/src/main/java/com/turbodev/server/web/behavior/blamemessage/blame-message.js rename to web/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.js index 0249df87e1..4d5c314d76 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/blamemessage/blame-message.js +++ b/web/src/main/java/io/onedev/server/web/behavior/blamemessage/blame-message.js @@ -1,4 +1,4 @@ -turbodev.server.blameMessage = { +onedev.server.blameMessage = { show: function(tooltipId, authoring, message) { var $blameTooltip = $("#" + tooltipId); $blameTooltip.empty(); diff --git a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java index 37684ba395..b7493b8d9d 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.clipboard; +package io.onedev.server.web.behavior.clipboard; import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; @@ -28,7 +28,7 @@ public class CopyClipboardBehavior extends Behavior { public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); response.render(JavaScriptHeaderItem.forReference(new CopyClipboardResourceReference())); - String script = String.format("turbodev.server.copyclipboard.init('%s', '%s');", + String script = String.format("onedev.server.copyclipboard.init('%s', '%s');", component.getMarkupId(true), JavaScriptEscape.escapeJavaScript(textModel.getObject())); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java index 60e78ac925..182418a698 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/CopyClipboardResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/clipboard/CopyClipboardResourceReference.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.behavior.clipboard; +package io.onedev.server.web.behavior.clipboard; import java.util.List; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.clipboard.ClipboardResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class CopyClipboardResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/copy-clipboard.js b/web/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js similarity index 94% rename from web/src/main/java/com/turbodev/server/web/behavior/clipboard/copy-clipboard.js rename to web/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js index dbb61c9393..28fb9653da 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/clipboard/copy-clipboard.js +++ b/web/src/main/java/io/onedev/server/web/behavior/clipboard/copy-clipboard.js @@ -1,4 +1,4 @@ -turbodev.server.copyclipboard = { +onedev.server.copyclipboard = { init: function(buttonId, text) { var $button = $("#" + buttonId); var clipboard = new Clipboard("#"+buttonId, { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/DragBehavior.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/dragdrop/DragBehavior.java index 0c5f7dcd79..430b6695a8 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/DragBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.dragdrop; +package io.onedev.server.web.behavior.dragdrop; import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; @@ -32,7 +32,7 @@ public class DragBehavior extends Behavior { @Override public void renderHead(Component component, IHeaderResponse response) { response.render(JavaScriptReferenceHeaderItem.forReference(new DragDropResourceReference())); - response.render(OnDomReadyHeaderItem.forScript(String.format("turbodev.server.dragdrop.setupDraggable('#%s', '%s', '%s');", + response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.dragdrop.setupDraggable('#%s', '%s', '%s');", component.getMarkupId(), dragData, dragText))); } diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/DragDropResourceReference.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/dragdrop/DragDropResourceReference.java index c5311cfb1b..3d735adb55 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DragDropResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/DragDropResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.dragdrop; +package io.onedev.server.web.behavior.dragdrop; import java.util.List; @@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class DragDropResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DropBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/DropBehavior.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DropBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/dragdrop/DropBehavior.java index fb88cf4623..e708d99ec4 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/DropBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/DropBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.dragdrop; +package io.onedev.server.web.behavior.dragdrop; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -10,7 +10,7 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; @SuppressWarnings("serial") public abstract class DropBehavior extends AbstractPostAjaxBehavior { @@ -18,7 +18,7 @@ public abstract class DropBehavior extends AbstractPostAjaxBehavior { @Override public void renderHead(Component component, IHeaderResponse response) { response.render(JavaScriptReferenceHeaderItem.forReference(new DragDropResourceReference())); - String script = String.format("turbodev.server.dragdrop.setupDroppable('#%s', %s, %s);", + String script = String.format("onedev.server.dragdrop.setupDroppable('#%s', %s, %s);", component.getMarkupId(), getAccept(), getCallbackFunction(explicit("dragData"))); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/dragdrop.css b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/dragdrop/dragdrop.css rename to web/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.css diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/dragdrop.js b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.js similarity index 94% rename from web/src/main/java/com/turbodev/server/web/behavior/dragdrop/dragdrop.js rename to web/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.js index 71c641ca7f..530ffcd085 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dragdrop/dragdrop.js +++ b/web/src/main/java/io/onedev/server/web/behavior/dragdrop/dragdrop.js @@ -1,4 +1,4 @@ -turbodev.server.dragdrop = { +onedev.server.dragdrop = { setupDraggable: function(dragSelector, dragData, dragText) { $(dragSelector).draggable({ cursor: 'move', diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dropdown/DropdownHover.java b/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/behavior/dropdown/DropdownHover.java rename to web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java index 71ef7c93d4..181fb78385 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dropdown/DropdownHover.java +++ b/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHover.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.dropdown; +package io.onedev.server.web.behavior.dropdown; import javax.annotation.Nullable; @@ -9,10 +9,10 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.component.floating.AlignPlacement; -import com.turbodev.server.web.component.floating.ComponentTarget; -import com.turbodev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.component.floating.AlignPlacement; +import io.onedev.server.web.component.floating.ComponentTarget; +import io.onedev.server.web.component.floating.FloatingPanel; @SuppressWarnings("serial") public abstract class DropdownHover extends AbstractPostAjaxBehavior { @@ -75,7 +75,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior { AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); if (target != null) { - String script = String.format("turbodev.server.dropdownhover.closed('%s', '%s');", + String script = String.format("onedev.server.dropdownhover.closed('%s', '%s');", getComponent().getMarkupId(true), getMarkupId(true)); target.appendJavaScript(script); } @@ -84,7 +84,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior { } }; - String script = String.format("turbodev.server.dropdownhover.opened('%s', '%s');", + String script = String.format("onedev.server.dropdownhover.opened('%s', '%s');", getComponent().getMarkupId(true), dropdown.getMarkupId(true)); target.appendJavaScript(script); } @@ -100,7 +100,7 @@ public abstract class DropdownHover extends AbstractPostAjaxBehavior { super.renderHead(component, response); response.render(JavaScriptHeaderItem.forReference(new DropdownHoverResourceReference())); - String script = String.format("turbodev.server.dropdownhover.init('%s', %s, %s);", + String script = String.format("onedev.server.dropdownhover.init('%s', %s, %s);", getComponent().getMarkupId(true), hoverDelay, getCallbackFunction()); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dropdown/DropdownHoverResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverResourceReference.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/behavior/dropdown/DropdownHoverResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverResourceReference.java index cbeae93052..bb86696e7e 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dropdown/DropdownHoverResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/dropdown/DropdownHoverResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.behavior.dropdown; +package io.onedev.server.web.behavior.dropdown; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class DropdownHoverResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/dropdown/dropdown-hover.js b/web/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js similarity index 95% rename from web/src/main/java/com/turbodev/server/web/behavior/dropdown/dropdown-hover.js rename to web/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js index 50a0af588c..20b692b383 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/dropdown/dropdown-hover.js +++ b/web/src/main/java/io/onedev/server/web/behavior/dropdown/dropdown-hover.js @@ -1,11 +1,11 @@ -turbodev.server.dropdownhover = { +onedev.server.dropdownhover = { init: function(triggerId, hoverDelay, openCallback) { var $trigger = $("#" + triggerId); $trigger.addClass("dropdown-hover"); $trigger.data("hide", function() { if ($trigger.data("dropdown")) - turbodev.server.floating.close($trigger.data("dropdown"), true); + onedev.server.floating.close($trigger.data("dropdown"), true); $trigger.data("hideTimer", null); }); $trigger.data("prepareToHide", function() { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java index f81b506842..c79a7370e2 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.infinitescroll; +package io.onedev.server.web.behavior.infinitescroll; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -12,7 +12,7 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.PackageResourceReference; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior { @@ -33,7 +33,7 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior { appendPage(target, page); - target.appendJavaScript(String.format("turbodev.infiniteScroll.check('%s');", + target.appendJavaScript(String.format("onedev.infiniteScroll.check('%s');", getComponent().getMarkupId())); } @@ -46,7 +46,7 @@ public abstract class InfiniteScrollBehavior extends AbstractPostAjaxBehavior { CharSequence url = RequestCycle.get().urlFor(new PackageResourceReference( InfiniteScrollBehavior.class, "ajax-indicator.gif"), new PageParameters()); - String script = String.format("turbodev.infiniteScroll.init('%s', %s, '%s', %s);", + String script = String.format("onedev.infiniteScroll.init('%s', %s, '%s', %s);", component.getMarkupId(true), getCallbackFunction(explicit("page")), url, pageSize); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java index a08655c8fa..80e1f78e49 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/InfiniteScrollResourceReference.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.behavior.infinitescroll; +package io.onedev.server.web.behavior.infinitescroll; import java.util.List; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class InfiniteScrollResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/ajax-indicator.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/ajax-indicator.gif rename to web/src/main/java/io/onedev/server/web/behavior/infinitescroll/ajax-indicator.gif diff --git a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/infinite-scroll.js b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js similarity index 92% rename from web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/infinite-scroll.js rename to web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js index 91a336faed..08dfbb2768 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/infinitescroll/infinite-scroll.js +++ b/web/src/main/java/io/onedev/server/web/behavior/infinitescroll/infinite-scroll.js @@ -1,4 +1,4 @@ -turbodev.infiniteScroll = { +onedev.infiniteScroll = { init: function(containerId, callback, loadingIndicatorUrl, pageSize) { var $container = $("#" + containerId); $container.data("callback", callback); @@ -6,10 +6,10 @@ turbodev.infiniteScroll = { $container.data("page", 1); $container.data("pageSize", pageSize); $container.scroll(function() { - turbodev.infiniteScroll.check(containerId); + onedev.infiniteScroll.check(containerId); }); setTimeout(function() { - turbodev.infiniteScroll.check(containerId); + onedev.infiniteScroll.check(containerId); }, 0); }, check: function(containerId) { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/ANTLRAssistBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/ANTLRAssistBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java index 7f77e86c42..e8d17c20b3 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/ANTLRAssistBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/inputassist/ANTLRAssistBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.inputassist; +package io.onedev.server.web.behavior.inputassist; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; @@ -20,15 +20,15 @@ import org.antlr.v4.runtime.Recognizer; import org.antlr.v4.runtime.Token; import org.antlr.v4.runtime.TokenStream; -import com.turbodev.codeassist.AntlrUtils; -import com.turbodev.codeassist.CodeAssist; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.codeassist.ParentedElement; -import com.turbodev.codeassist.grammar.ElementSpec; -import com.turbodev.utils.Range; -import com.turbodev.utils.StringUtils; +import io.onedev.codeassist.AntlrUtils; +import io.onedev.codeassist.CodeAssist; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.codeassist.ParentedElement; +import io.onedev.codeassist.grammar.ElementSpec; +import io.onedev.utils.Range; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public abstract class ANTLRAssistBehavior extends InputAssistBehavior { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/AssistPanel.html b/web/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/AssistPanel.html rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/AssistPanel.java b/web/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/AssistPanel.java rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java index b74f2562f0..aa0eb4cc4f 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/AssistPanel.java +++ b/web/src/main/java/io/onedev/server/web/behavior/inputassist/AssistPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.inputassist; +package io.onedev.server.web.behavior.inputassist; import java.util.List; @@ -11,10 +11,10 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.RepeatingView; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.utils.Range; -import com.turbodev.server.web.behavior.infinitescroll.InfiniteScrollBehavior; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior; +import io.onedev.utils.Range; @SuppressWarnings("serial") class AssistPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java index 03170d98b0..880bf4a911 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.inputassist; +package io.onedev.server.web.behavior.inputassist; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -19,18 +19,20 @@ import org.unbescape.javascript.JavaScriptEscape; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.utils.Range; -import com.turbodev.utils.RangeUtils; + +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.component.floating.AlignPlacement; +import io.onedev.server.web.component.floating.AlignTarget; +import io.onedev.server.web.component.floating.ComponentTarget; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.utils.Range; +import io.onedev.utils.RangeUtils; + import com.google.common.base.Preconditions; import com.google.common.base.Splitter; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.component.floating.AlignPlacement; -import com.turbodev.server.web.component.floating.AlignTarget; -import com.turbodev.server.web.component.floating.ComponentTarget; -import com.turbodev.server.web.component.floating.FloatingPanel; @SuppressWarnings("serial") public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior { @@ -124,7 +126,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior { } catch (JsonProcessingException e) { throw new RuntimeException(e); } - String script = String.format("turbodev.server.inputassist.markErrors('%s', %s);", + String script = String.format("onedev.server.inputassist.markErrors('%s', %s);", getComponent().getMarkupId(), json); target.appendJavaScript(script); @@ -161,7 +163,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior { } }; - script = String.format("turbodev.server.inputassist.assistOpened('%s', '%s', '%s');", + script = String.format("onedev.server.inputassist.assistOpened('%s', '%s', '%s');", getComponent().getMarkupId(), dropdown.getMarkupId(), JavaScriptEscape.escapeJavaScript(inputContent)); target.appendJavaScript(script); } else { @@ -175,7 +177,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior { script = String.format("$('#%s').data('alignment').target=%s;", dropdown.getMarkupId(), alignTarget); target.prependJavaScript(script); - script = String.format("turbodev.server.inputassist.assistUpdated('%s', '%s', '%s');", + script = String.format("onedev.server.inputassist.assistUpdated('%s', '%s', '%s');", getComponent().getMarkupId(), dropdown.getMarkupId(), JavaScriptEscape.escapeJavaScript(inputContent)); target.appendJavaScript(script); } @@ -199,7 +201,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior { response.render(JavaScriptHeaderItem.forReference(new InputAssistResourceReference())); - String script = String.format("turbodev.server.inputassist.init('%s', %s);", + String script = String.format("onedev.server.inputassist.init('%s', %s);", getComponent().getMarkupId(true), getCallbackFunction(explicit("type"), explicit("input"), explicit("caret"))); diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.java b/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.java rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java index 2010dfc8dd..546fd68f8d 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/InputAssistResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.inputassist; +package io.onedev.server.web.behavior.inputassist; import java.util.List; @@ -6,12 +6,12 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.caret.CaretResourceReference; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; -import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.caret.CaretResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; +import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class InputAssistResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/bullet.gif b/web/src/main/java/io/onedev/server/web/behavior/inputassist/bullet.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/bullet.gif rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/bullet.gif diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/hint.png b/web/src/main/java/io/onedev/server/web/behavior/inputassist/hint.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/hint.png rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/hint.png diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/input-assist.css b/web/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/input-assist.css rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.css diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/input-assist.js b/web/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js similarity index 94% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/input-assist.js rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js index f6fa6e90ac..b740f797f1 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/input-assist.js +++ b/web/src/main/java/io/onedev/server/web/behavior/inputassist/input-assist.js @@ -1,4 +1,4 @@ -turbodev.server.inputassist = { +onedev.server.inputassist = { init: function(inputId, callback) { var $input = $("#" + inputId); @@ -18,7 +18,7 @@ turbodev.server.inputassist = { callback("input", value, caret); } if (value.trim().length == 0) - turbodev.server.inputassist.markErrors(inputId, []); + onedev.server.inputassist.markErrors(inputId, []); }); function onFocus() { var value = $input.val(); @@ -60,7 +60,7 @@ turbodev.server.inputassist = { $dropdown.find("tr:not(.loading-indicator)").last().addClass("active"); } $dropdown.find(".suggestions").scrollIntoView("tr.active"); - turbodev.server.inputassist.updateHelp($dropdown); + onedev.server.inputassist.updateHelp($dropdown); $dropdown.align($dropdown.data("alignment")); return false; } @@ -80,7 +80,7 @@ turbodev.server.inputassist = { $dropdown.find("tr:not(.loading-indicator)").first().addClass("active"); } $dropdown.find(".suggestions").scrollIntoView("tr.active"); - turbodev.server.inputassist.updateHelp($dropdown); + onedev.server.inputassist.updateHelp($dropdown); $dropdown.align($dropdown.data("alignment")); return false; } @@ -164,7 +164,7 @@ turbodev.server.inputassist = { $dropdown.on("close", function() { $input.data("dropdown", null); }); - turbodev.server.inputassist.assistUpdated(inputId, dropdownId, inputContent); + onedev.server.inputassist.assistUpdated(inputId, dropdownId, inputContent); }, assistUpdated: function(inputId, dropdownId, inputContent) { @@ -179,7 +179,7 @@ turbodev.server.inputassist = { var $this = $(this); $input.data("update")($this); }); - turbodev.server.inputassist.updateHelp($dropdown); + onedev.server.inputassist.updateHelp($dropdown); }, initInfiniteScroll: function(assistId, callback) { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/inputassist/wave.png b/web/src/main/java/io/onedev/server/web/behavior/inputassist/wave.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/behavior/inputassist/wave.png rename to web/src/main/java/io/onedev/server/web/behavior/inputassist/wave.png diff --git a/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java index b8f70418e2..da990a29e5 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.sortable; +package io.onedev.server.web.behavior.sortable; import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; @@ -9,8 +9,8 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnLoadHeaderItem; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; public abstract class SortBehavior extends AbstractPostAjaxBehavior { @@ -123,7 +123,7 @@ public abstract class SortBehavior extends AbstractPostAjaxBehavior { .getParameterValue("toItem").toInt(); if (fromList != toList || fromItem != toItem) { onSort(target, new SortPosition(fromList, fromItem), new SortPosition(toList, toItem)); - String script = String.format("turbodev.server.form.markDirty($('#%s').closest('form.leave-confirm'));", + String script = String.format("onedev.server.form.markDirty($('#%s').closest('form.leave-confirm'));", getComponent().getMarkupId(true)); target.appendJavaScript(script); diff --git a/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortPosition.java b/web/src/main/java/io/onedev/server/web/behavior/sortable/SortPosition.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/behavior/sortable/SortPosition.java rename to web/src/main/java/io/onedev/server/web/behavior/sortable/SortPosition.java index d22a66fff2..7c310f13b4 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/sortable/SortPosition.java +++ b/web/src/main/java/io/onedev/server/web/behavior/sortable/SortPosition.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.sortable; +package io.onedev.server.web.behavior.sortable; import com.google.common.base.Objects; diff --git a/web/src/main/java/com/turbodev/server/web/behavior/testform/TestFormBehavior.java b/web/src/main/java/io/onedev/server/web/behavior/testform/TestFormBehavior.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/behavior/testform/TestFormBehavior.java rename to web/src/main/java/io/onedev/server/web/behavior/testform/TestFormBehavior.java index 2291005a63..1a08423106 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/testform/TestFormBehavior.java +++ b/web/src/main/java/io/onedev/server/web/behavior/testform/TestFormBehavior.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.behavior.testform; +package io.onedev.server.web.behavior.testform; import org.apache.commons.lang3.StringUtils; import org.apache.wicket.ajax.AjaxRequestTarget; import org.unbescape.html.HtmlEscape; import org.unbescape.javascript.JavaScriptEscape; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; @SuppressWarnings("serial") public abstract class TestFormBehavior extends AbstractPostAjaxBehavior { diff --git a/web/src/main/java/com/turbodev/server/web/behavior/testform/TestResult.java b/web/src/main/java/io/onedev/server/web/behavior/testform/TestResult.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/behavior/testform/TestResult.java rename to web/src/main/java/io/onedev/server/web/behavior/testform/TestResult.java index 48eb0daa97..0774b2d239 100644 --- a/web/src/main/java/com/turbodev/server/web/behavior/testform/TestResult.java +++ b/web/src/main/java/io/onedev/server/web/behavior/testform/TestResult.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.behavior.testform; +package io.onedev.server.web.behavior.testform; public interface TestResult { String getMessage(); diff --git a/web/src/main/java/com/turbodev/server/web/component/BlobIcon.java b/web/src/main/java/io/onedev/server/web/component/BlobIcon.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/BlobIcon.java rename to web/src/main/java/io/onedev/server/web/component/BlobIcon.java index c6915bb3f1..0a34510edb 100644 --- a/web/src/main/java/com/turbodev/server/web/component/BlobIcon.java +++ b/web/src/main/java/io/onedev/server/web/component/BlobIcon.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.component; +package io.onedev.server.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.turbodev.server.git.BlobIdent; +import io.onedev.server.git.BlobIdent; @SuppressWarnings("serial") public class BlobIcon extends WebComponent { diff --git a/web/src/main/java/com/turbodev/server/web/component/MultilineLabel.java b/web/src/main/java/io/onedev/server/web/component/MultilineLabel.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/MultilineLabel.java rename to web/src/main/java/io/onedev/server/web/component/MultilineLabel.java index e6773c6778..cf1d1696ec 100644 --- a/web/src/main/java/com/turbodev/server/web/component/MultilineLabel.java +++ b/web/src/main/java/io/onedev/server/web/component/MultilineLabel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component; +package io.onedev.server.web.component; import org.apache.wicket.markup.ComponentTag; import org.apache.wicket.markup.MarkupStream; diff --git a/web/src/main/java/com/turbodev/server/web/component/ProjectPicker.java b/web/src/main/java/io/onedev/server/web/component/ProjectPicker.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/component/ProjectPicker.java rename to web/src/main/java/io/onedev/server/web/component/ProjectPicker.java index 6d507ea3f1..883ea7a582 100644 --- a/web/src/main/java/com/turbodev/server/web/component/ProjectPicker.java +++ b/web/src/main/java/io/onedev/server/web/component/ProjectPicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component; +package io.onedev.server.web.component; import java.util.Collection; @@ -7,12 +7,12 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.projectselector.ProjectSelector; +import io.onedev.server.OneDev; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.projectselector.ProjectSelector; @SuppressWarnings("serial") public abstract class ProjectPicker extends DropdownLink { @@ -51,7 +51,7 @@ public abstract class ProjectPicker extends DropdownLink { @Override public IModel getBody() { - Project currentProject = TurboDev.getInstance(Dao.class).load(Project.class, currentProjectId); + Project currentProject = OneDev.getInstance(Dao.class).load(Project.class, currentProjectId); return Model.of(String.format(" %s ", currentProject.getName())); } diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/Avatar.java b/web/src/main/java/io/onedev/server/web/component/avatar/Avatar.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/component/avatar/Avatar.java rename to web/src/main/java/io/onedev/server/web/component/avatar/Avatar.java index cceac0fe67..ee83495ac6 100644 --- a/web/src/main/java/com/turbodev/server/web/component/avatar/Avatar.java +++ b/web/src/main/java/io/onedev/server/web/component/avatar/Avatar.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.avatar; +package io.onedev.server.web.component.avatar; import javax.annotation.Nullable; @@ -9,10 +9,10 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.WebComponent; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.util.avatar.AvatarManager; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.web.util.avatar.AvatarManager; @SuppressWarnings("serial") public class Avatar extends WebComponent { @@ -24,7 +24,7 @@ public class Avatar extends WebComponent { public Avatar(String id, @Nullable User user) { super(id); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); if (user == null) { userId = null; } else if (user.getId() == null) { @@ -38,9 +38,9 @@ public class Avatar extends WebComponent { public Avatar(String id, PersonIdent person) { super(id); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); - User user = TurboDev.getInstance(UserManager.class).find(person); + User user = OneDev.getInstance(UserManager.class).find(person); if (user != null) { userId = user.getId(); url = avatarManager.getAvatarUrl(user.getFacade()); @@ -57,7 +57,7 @@ public class Avatar extends WebComponent { if (event.getPayload() instanceof AvatarChanged) { AvatarChanged avatarChanged = (AvatarChanged) event.getPayload(); if (avatarChanged.getUser().getId().equals(userId)) { - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); url = avatarManager.getAvatarUrl(avatarChanged.getUser().getFacade()); avatarChanged.getHandler().add(this); } diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/AvatarChanged.java b/web/src/main/java/io/onedev/server/web/component/avatar/AvatarChanged.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/component/avatar/AvatarChanged.java rename to web/src/main/java/io/onedev/server/web/component/avatar/AvatarChanged.java index d534e765fa..2a2af0cef5 100644 --- a/web/src/main/java/com/turbodev/server/web/component/avatar/AvatarChanged.java +++ b/web/src/main/java/io/onedev/server/web/component/avatar/AvatarChanged.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.component.avatar; +package io.onedev.server.web.component.avatar; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.model.User; -import com.turbodev.server.web.util.AjaxPayload; +import io.onedev.server.model.User; +import io.onedev.server.web.util.AjaxPayload; public class AvatarChanged extends AjaxPayload { diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/AvatarLink.java b/web/src/main/java/io/onedev/server/web/component/avatar/AvatarLink.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/component/avatar/AvatarLink.java rename to web/src/main/java/io/onedev/server/web/component/avatar/AvatarLink.java index b4dd93c5e7..ceeb26c326 100644 --- a/web/src/main/java/com/turbodev/server/web/component/avatar/AvatarLink.java +++ b/web/src/main/java/io/onedev/server/web/component/avatar/AvatarLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.avatar; +package io.onedev.server.web.component.avatar; import javax.annotation.Nullable; @@ -11,16 +11,15 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.behavior.TooltipBehavior; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.user.UserPage; -import com.turbodev.server.web.page.user.UserProfilePage; -import com.turbodev.server.web.util.avatar.AvatarManager; - import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.web.behavior.TooltipBehavior; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.user.UserPage; +import io.onedev.server.web.page.user.UserProfilePage; +import io.onedev.server.web.util.avatar.AvatarManager; @SuppressWarnings("serial") public class AvatarLink extends ViewStateAwarePageLink { @@ -40,7 +39,7 @@ public class AvatarLink extends ViewStateAwarePageLink { public AvatarLink(String id, @Nullable User user, boolean showTooltip) { super(id, UserProfilePage.class); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); if (user == null) { userId = null; params = new PageParameters(); @@ -55,7 +54,7 @@ public class AvatarLink extends ViewStateAwarePageLink { if (user != null) tooltip = user.getDisplayName(); else - tooltip = TurboDev.NAME; + tooltip = OneDev.NAME; } else { tooltip = null; } @@ -69,9 +68,9 @@ public class AvatarLink extends ViewStateAwarePageLink { public AvatarLink(String id, PersonIdent person, boolean showTooltip) { super(id, UserProfilePage.class); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); - User user = TurboDev.getInstance(UserManager.class).find(person); + User user = OneDev.getInstance(UserManager.class).find(person); if (user != null) { userId = user.getId(); params = UserPage.paramsOf(user); @@ -105,7 +104,7 @@ public class AvatarLink extends ViewStateAwarePageLink { if (event.getPayload() instanceof AvatarChanged) { AvatarChanged avatarChanged = (AvatarChanged) event.getPayload(); if (avatarChanged.getUser().getId().equals(userId)) { - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); url = avatarManager.getAvatarUrl(avatarChanged.getUser().getFacade()); avatarChanged.getHandler().add(this); } diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/AvatarResourceReference.java b/web/src/main/java/io/onedev/server/web/component/avatar/AvatarResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/avatar/AvatarResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/avatar/AvatarResourceReference.java index 4f8d9c7c21..13109feacc 100644 --- a/web/src/main/java/com/turbodev/server/web/component/avatar/AvatarResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/avatar/AvatarResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.avatar; +package io.onedev.server.web.component.avatar; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/ContributorAvatars.html b/web/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/avatar/ContributorAvatars.html rename to web/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.html diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/ContributorAvatars.java b/web/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/avatar/ContributorAvatars.java rename to web/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.java index a731309976..e0659722c0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/avatar/ContributorAvatars.java +++ b/web/src/main/java/io/onedev/server/web/component/avatar/ContributorAvatars.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.avatar; +package io.onedev.server.web.component.avatar; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; diff --git a/web/src/main/java/com/turbodev/server/web/component/avatar/avatar.css b/web/src/main/java/io/onedev/server/web/component/avatar/avatar.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/avatar/avatar.css rename to web/src/main/java/io/onedev/server/web/component/avatar/avatar.css diff --git a/web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPicker.html b/web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPicker.html rename to web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.html diff --git a/web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPicker.java b/web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPicker.java rename to web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.java index efa64c2859..bf5847bb2e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPicker.java +++ b/web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.blobpicker; +package io.onedev.server.web.component.blobpicker; import java.util.Iterator; import java.util.List; @@ -21,11 +21,11 @@ import org.apache.wicket.model.Model; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.BlobIdentFilter; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.BlobIcon; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.BlobIdentFilter; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.BlobIcon; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; @SuppressWarnings("serial") public abstract class BlobPicker extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPickerResourceReference.java b/web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPickerResourceReference.java similarity index 63% rename from web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPickerResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPickerResourceReference.java index 8d8efab4db..3e809c34dc 100644 --- a/web/src/main/java/com/turbodev/server/web/component/blobpicker/BlobPickerResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/blobpicker/BlobPickerResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.blobpicker; +package io.onedev.server.web.component.blobpicker; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; @SuppressWarnings("serial") public class BlobPickerResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/blobpicker/blob-picker.css b/web/src/main/java/io/onedev/server/web/component/blobpicker/blob-picker.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/blobpicker/blob-picker.css rename to web/src/main/java/io/onedev/server/web/component/blobpicker/blob-picker.css diff --git a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchChoiceProvider.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/branchchoice/BranchChoiceProvider.java index d7bb6f1eea..db46bcc392 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchChoiceProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchchoice; +package io.onedev.server.web.component.branchchoice; import java.util.ArrayList; import java.util.Collection; @@ -10,12 +10,12 @@ import org.apache.wicket.model.IModel; import org.json.JSONException; import org.json.JSONWriter; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.select2.ChoiceProvider; -import com.turbodev.server.web.component.select2.Response; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.model.Project; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.select2.ChoiceProvider; +import io.onedev.server.web.component.select2.Response; @SuppressWarnings("serial") public class BranchChoiceProvider extends ChoiceProvider { diff --git a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchChoiceResourceReference.java b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchChoiceResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchChoiceResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/branchchoice/BranchChoiceResourceReference.java index 03109a345c..d818780726 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchChoiceResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchChoiceResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchchoice; +package io.onedev.server.web.component.branchchoice; import java.util.List; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class BranchChoiceResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchMultiChoice.java b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchMultiChoice.java similarity index 63% rename from web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchMultiChoice.java rename to web/src/main/java/io/onedev/server/web/component/branchchoice/BranchMultiChoice.java index df19d82e13..3cbb6875a0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchMultiChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchMultiChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchchoice; +package io.onedev.server.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.turbodev.server.web.component.select2.ChoiceProvider; -import com.turbodev.server.web.component.select2.Select2MultiChoice; +import io.onedev.server.web.component.select2.ChoiceProvider; +import io.onedev.server.web.component.select2.Select2MultiChoice; @SuppressWarnings("serial") public class BranchMultiChoice extends Select2MultiChoice { @@ -20,9 +20,9 @@ public class BranchMultiChoice extends Select2MultiChoice { protected void onInitialize() { super.onInitialize(); getSettings().setPlaceholder("Choose branches ..."); - getSettings().setFormatResult("turbodev.server.branchChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.branchChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.branchChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.branchChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.branchChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.branchChoiceFormatter.escapeMarkup"); setConvertEmptyInputStringToNull(true); } diff --git a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchSingleChoice.java b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchSingleChoice.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchSingleChoice.java rename to web/src/main/java/io/onedev/server/web/component/branchchoice/BranchSingleChoice.java index aa9689689b..e4f7faed37 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchchoice/BranchSingleChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/branchchoice/BranchSingleChoice.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.component.branchchoice; +package io.onedev.server.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.turbodev.server.web.component.select2.ChoiceProvider; -import com.turbodev.server.web.component.select2.Select2Choice; +import io.onedev.server.web.component.select2.ChoiceProvider; +import io.onedev.server.web.component.select2.Select2Choice; @SuppressWarnings("serial") public class BranchSingleChoice extends Select2Choice { @@ -20,9 +20,9 @@ public class BranchSingleChoice extends Select2Choice { super.onInitialize(); getSettings().setPlaceholder("Choose a branch ..."); - getSettings().setFormatResult("turbodev.server.branchChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.branchChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.branchChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.branchChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.branchChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.branchChoiceFormatter.escapeMarkup"); setConvertEmptyInputStringToNull(true); } diff --git a/web/src/main/java/com/turbodev/server/web/component/branchchoice/branch-choice.css b/web/src/main/java/io/onedev/server/web/component/branchchoice/branch-choice.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/branchchoice/branch-choice.css rename to web/src/main/java/io/onedev/server/web/component/branchchoice/branch-choice.css diff --git a/web/src/main/java/com/turbodev/server/web/component/branchchoice/branch-choice.js b/web/src/main/java/io/onedev/server/web/component/branchchoice/branch-choice.js similarity index 80% rename from web/src/main/java/com/turbodev/server/web/component/branchchoice/branch-choice.js rename to web/src/main/java/io/onedev/server/web/component/branchchoice/branch-choice.js index 69e7792c29..12312f39c3 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchchoice/branch-choice.js +++ b/web/src/main/java/io/onedev/server/web/component/branchchoice/branch-choice.js @@ -1,4 +1,4 @@ -turbodev.server.branchChoiceFormatter = { +onedev.server.branchChoiceFormatter = { formatSelection: function(branch) { return branch.name; }, diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/AffinalBranchPicker.html b/web/src/main/java/io/onedev/server/web/component/branchpicker/AffinalBranchPicker.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/AffinalBranchPicker.html rename to web/src/main/java/io/onedev/server/web/component/branchpicker/AffinalBranchPicker.html diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/AffinalBranchPicker.java b/web/src/main/java/io/onedev/server/web/component/branchpicker/AffinalBranchPicker.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/AffinalBranchPicker.java rename to web/src/main/java/io/onedev/server/web/component/branchpicker/AffinalBranchPicker.java index a462b31ddb..6017954faf 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/AffinalBranchPicker.java +++ b/web/src/main/java/io/onedev/server/web/component/branchpicker/AffinalBranchPicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchpicker; +package io.onedev.server.web.component.branchpicker; import javax.annotation.Nullable; @@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.web.component.ProjectPicker; -import com.turbodev.server.web.util.model.AffinalProjectsModel; +import io.onedev.server.OneDev; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.web.component.ProjectPicker; +import io.onedev.server.web.util.model.AffinalProjectsModel; @SuppressWarnings("serial") public abstract class AffinalBranchPicker extends Panel { @@ -53,7 +53,7 @@ public abstract class AffinalBranchPicker extends Panel { } private Project getProject() { - return TurboDev.getInstance(Dao.class).load(Project.class, projectId); + return OneDev.getInstance(Dao.class).load(Project.class, projectId); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchPicker.java b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchPicker.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchPicker.java rename to web/src/main/java/io/onedev/server/web/component/branchpicker/BranchPicker.java index 4d4040ad54..5072f98cac 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchPicker.java +++ b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchPicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchpicker; +package io.onedev.server.web.component.branchpicker; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -6,9 +6,9 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.unbescape.html.HtmlEscape; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; @SuppressWarnings("serial") public abstract class BranchPicker extends DropdownLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchPickerResourceReference.java b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchPickerResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchPickerResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/branchpicker/BranchPickerResourceReference.java index 6526678aa0..1f8e449601 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchPickerResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchPickerResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchpicker; +package io.onedev.server.web.component.branchpicker; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelector.html b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelector.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelector.html rename to web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelector.html diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelector.java b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelector.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelector.java rename to web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelector.java index 27426fee4d..5c8522d914 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelector.java +++ b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchpicker; +package io.onedev.server.web.component.branchpicker; import java.util.ArrayList; import java.util.List; @@ -24,12 +24,12 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.InputChangeBehavior; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.InputChangeBehavior; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; @SuppressWarnings("serial") public abstract class BranchSelector extends Panel { @@ -92,7 +92,7 @@ public abstract class BranchSelector extends Panel { @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); - String script = String.format("turbodev.server.branchSelector.init('%s', %s);", + String script = String.format("onedev.server.branchSelector.init('%s', %s);", getMarkupId(true), getCallbackFunction(CallbackParameter.explicit("key"))); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelectorResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelectorResourceReference.java index ccb66feb1a..e2457ff6ed 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/BranchSelectorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/branchpicker/BranchSelectorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.branchpicker; +package io.onedev.server.web.component.branchpicker; import java.util.List; @@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class BranchSelectorResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-picker.css b/web/src/main/java/io/onedev/server/web/component/branchpicker/branch-picker.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-picker.css rename to web/src/main/java/io/onedev/server/web/component/branchpicker/branch-picker.css diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-selector.css b/web/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-selector.css rename to web/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.css diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-selector.js b/web/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-selector.js rename to web/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js index a759f0b92b..39f6f644d9 100644 --- a/web/src/main/java/com/turbodev/server/web/component/branchpicker/branch-selector.js +++ b/web/src/main/java/io/onedev/server/web/component/branchpicker/branch-selector.js @@ -1,11 +1,11 @@ -turbodev.server.branchSelector = { +onedev.server.branchSelector = { init: function(containerId, callback) { var $container = $("#" + containerId); var $floating = $container.closest(".floating"); $floating.on("open click", function() { $container.find("input").focus(); }); - turbodev.server.branchSelector.bindInputKeys(containerId, callback); + onedev.server.branchSelector.bindInputKeys(containerId, callback); }, bindInputKeys: function(containerId, callback) { var $container = $("#" + containerId); diff --git a/web/src/main/java/com/turbodev/server/web/component/branchpicker/search.gif b/web/src/main/java/io/onedev/server/web/component/branchpicker/search.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/branchpicker/search.gif rename to web/src/main/java/io/onedev/server/web/component/branchpicker/search.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentFilter.java b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentFilter.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentFilter.java rename to web/src/main/java/io/onedev/server/web/component/comment/CodeCommentFilter.java index 640b731935..94f0e7f9b7 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentFilter.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentFilter.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import java.io.Serializable; import java.util.Date; @@ -10,16 +10,16 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.hibernate.Criteria; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentRelation; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.FileChoice; -import com.turbodev.server.util.editable.annotation.UserChoice; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentRelation; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.FileChoice; +import io.onedev.server.util.editable.annotation.UserChoice; +import io.onedev.server.web.page.project.ProjectPage; @Editable public class CodeCommentFilter implements Serializable { @@ -164,7 +164,7 @@ public class CodeCommentFilter implements Serializable { private static List getCommentedFiles() { IPageRequestHandler handler = (IPageRequestHandler) RequestCycle.get().getActiveRequestHandler(); Project project = ((ProjectPage) handler.getPage()).getProject(); - return TurboDev.getInstance(CommitInfoManager.class).getFiles(project); + return OneDev.getInstance(CommitInfoManager.class).getFiles(project); } } diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.html b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.html rename to web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.java rename to web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java index 3a9e33508e..aa2cb1f532 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentListPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentListPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import java.util.ArrayList; import java.util.Date; @@ -33,30 +33,30 @@ import org.hibernate.FetchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CodeCommentRelationManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentRelation; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.datatable.HistoryAwarePagingNavigator; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.markdown.ContentVersionSupport; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CodeCommentRelationManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentRelation; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.markdown.ContentVersionSupport; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public abstract class CodeCommentListPanel extends Panel { @@ -194,7 +194,7 @@ public abstract class CodeCommentListPanel extends Panel { public void setObject(String object) { CodeComment comment = rowModel.getObject(); comment.setContent(object); - TurboDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest()); + OneDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest()); } }, contentVersionSupport)); @@ -243,7 +243,7 @@ public abstract class CodeCommentListPanel extends Panel { criteria.add(Restrictions.eq("request", getPullRequest())); filterOptionModel.getObject().fillRelationCriteria(criteria); criteria.addOrder(Order.desc("id")); - return TurboDev.getInstance(CodeCommentRelationManager.class) + return OneDev.getInstance(CodeCommentRelationManager.class) .findRange(criteria, (int)first, (int)count) .stream() .map(CodeCommentRelation::getComment) @@ -253,7 +253,7 @@ public abstract class CodeCommentListPanel extends Panel { criteria.add(Restrictions.eq("project", getProject())); filterOptionModel.getObject().fillCriteria(criteria); criteria.addOrder(Order.desc("id")); - return TurboDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator(); + return OneDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator(); } } @@ -265,12 +265,12 @@ public abstract class CodeCommentListPanel extends Panel { EntityCriteria criteria = EntityCriteria.of(CodeCommentRelation.class); criteria.add(Restrictions.eq("request", getPullRequest())); filterOptionModel.getObject().fillRelationCriteria(criteria); - return TurboDev.getInstance(CodeCommentRelationManager.class).count(criteria); + return OneDev.getInstance(CodeCommentRelationManager.class).count(criteria); } else { EntityCriteria criteria = EntityCriteria.of(CodeComment.class); criteria.add(Restrictions.eq("project", page.getProject())); filterOptionModel.getObject().fillCriteria(criteria); - return TurboDev.getInstance(Dao.class).count(criteria); + return OneDev.getInstance(Dao.class).count(criteria); } } @@ -281,7 +281,7 @@ public abstract class CodeCommentListPanel extends Panel { @Override protected CodeComment load() { - return TurboDev.getInstance(CodeCommentManager.class).load(commentId); + return OneDev.getInstance(CodeCommentManager.class).load(commentId); } }; diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.html b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.html rename to web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.java b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.java rename to web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java index d91916ff95..419d9f8f36 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import java.util.ArrayList; import java.util.Collections; @@ -36,31 +36,30 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.hibernate.StaleStateException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CodeCommentReplyManager; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.CodeCommentReply; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.asset.caret.CaretResourceReference; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.markdown.ContentVersionSupport; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.util.ajaxlistener.ConfirmListener; -import com.turbodev.server.web.websocket.PageDataChanged; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CodeCommentReplyManager; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.CodeCommentReply; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.asset.caret.CaretResourceReference; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.markdown.ContentVersionSupport; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.util.ajaxlistener.ConfirmListener; +import io.onedev.server.web.websocket.PageDataChanged; @SuppressWarnings("serial") public abstract class CodeCommentPanel extends Panel { @@ -85,7 +84,7 @@ public abstract class CodeCommentPanel extends Panel { } protected CodeComment getComment() { - return TurboDev.getInstance(CodeCommentManager.class).load(commentId); + return OneDev.getInstance(CodeCommentManager.class).load(commentId); } private WebMarkupContainer newCommentContainer() { @@ -135,7 +134,7 @@ public abstract class CodeCommentPanel extends Panel { public void setObject(String object) { CodeComment comment = getComment(); comment.setContent(object); - TurboDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest()); + OneDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest()); } }, contentVersionSupport)); @@ -212,7 +211,7 @@ public abstract class CodeCommentPanel extends Panel { if (comment.getVersion() != lastVersion) throw new StaleStateException(""); comment.setContent(contentInput.getModelObject()); - TurboDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest()); + OneDev.getInstance(CodeCommentManager.class).save(comment, getPullRequest()); WebMarkupContainer commentContainer = newCommentContainer(); fragment.replaceWith(commentContainer); target.add(commentContainer); @@ -252,7 +251,7 @@ public abstract class CodeCommentPanel extends Panel { @Override public void onClick(AjaxRequestTarget target) { onDeleteComment(target, getComment()); - TurboDev.getInstance(CodeCommentManager.class).delete(getComment()); + OneDev.getInstance(CodeCommentManager.class).delete(getComment()); } }); @@ -262,7 +261,7 @@ public abstract class CodeCommentPanel extends Panel { } private CodeCommentReply getReply(Long replyId) { - return TurboDev.getInstance(CodeCommentReplyManager.class).load(replyId); + return OneDev.getInstance(CodeCommentReplyManager.class).load(replyId); } private WebMarkupContainer newReplyContainer(String componentId, CodeCommentReply reply) { @@ -307,7 +306,7 @@ public abstract class CodeCommentPanel extends Panel { public void setObject(String object) { CodeCommentReply reply = getReply(replyId); reply.setContent(object); - TurboDev.getInstance(CodeCommentReplyManager.class).save(reply, getCompareContext(), getPullRequest()); + OneDev.getInstance(CodeCommentReplyManager.class).save(reply, getCompareContext(), getPullRequest()); } }, contentVersionSupport)); @@ -385,7 +384,7 @@ public abstract class CodeCommentPanel extends Panel { throw new StaleStateException(""); reply.setContent(contentInput.getModelObject()); - TurboDev.getInstance(CodeCommentReplyManager.class).save(reply, getCompareContext(), + OneDev.getInstance(CodeCommentReplyManager.class).save(reply, getCompareContext(), getPullRequest()); WebMarkupContainer replyContainer = newReplyContainer(componentId, reply); fragment.replaceWith(replyContainer); @@ -417,7 +416,7 @@ public abstract class CodeCommentPanel extends Panel { @Override public void onClick(AjaxRequestTarget target) { replyContainer.remove(); - TurboDev.getInstance(CodeCommentReplyManager.class).delete(getReply(replyId)); + OneDev.getInstance(CodeCommentReplyManager.class).delete(getReply(replyId)); String script = String.format("$('#%s').remove();", replyContainer.getMarkupId()); target.appendJavaScript(script); } @@ -540,7 +539,7 @@ public abstract class CodeCommentPanel extends Panel { @Override public void onEndRequest(RequestCycle cycle) { if (SecurityUtils.getUser() != null) { - TurboDev.getInstance(VisitManager.class).visitCodeComment(SecurityUtils.getUser(), getComment()); + OneDev.getInstance(VisitManager.class).visitCodeComment(SecurityUtils.getUser(), getComment()); } } @@ -702,7 +701,7 @@ public abstract class CodeCommentPanel extends Panel { reply.setDate(date); reply.setUser(user); reply.setContent(contentInput.getModelObject()); - TurboDev.getInstance(CodeCommentReplyManager.class).save(reply, getCompareContext(), getPullRequest()); + OneDev.getInstance(CodeCommentReplyManager.class).save(reply, getCompareContext(), getPullRequest()); WebMarkupContainer replyContainer = newReplyContainer(repliesView.newChildId(), reply); repliesView.add(replyContainer); diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentResourceReference.java b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/comment/CodeCommentResourceReference.java index f84ed18bb5..29799c2404 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/CodeCommentResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/CodeCommentResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/CommentInput.java b/web/src/main/java/io/onedev/server/web/component/comment/CommentInput.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/component/comment/CommentInput.java rename to web/src/main/java/io/onedev/server/web/component/comment/CommentInput.java index 19b2382c66..097e00d611 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/CommentInput.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/CommentInput.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import java.util.ArrayList; import java.util.Comparator; @@ -9,20 +9,20 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.component.markdown.MarkdownEditor; -import com.turbodev.server.web.component.markdown.PullRequestReferenceSupport; -import com.turbodev.server.web.component.markdown.UserMentionSupport; +import io.onedev.server.OneDev; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.component.markdown.MarkdownEditor; +import io.onedev.server.web.component.markdown.PullRequestReferenceSupport; +import io.onedev.server.web.component.markdown.UserMentionSupport; +import io.onedev.utils.StringUtils; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public abstract class CommentInput extends MarkdownEditor { @@ -74,7 +74,7 @@ public abstract class CommentInput extends MarkdownEditor { Restrictions.ilike("numberStr", query, MatchMode.START))); } criteria.addOrder(Order.desc("number")); - return TurboDev.getInstance(Dao.class).findRange(criteria, 0, count); + return OneDev.getInstance(Dao.class).findRange(criteria, 0, count); } }; diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/InvalidCodeCommentPanel.html b/web/src/main/java/io/onedev/server/web/component/comment/InvalidCodeCommentPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/comment/InvalidCodeCommentPanel.html rename to web/src/main/java/io/onedev/server/web/component/comment/InvalidCodeCommentPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/InvalidCodeCommentPanel.java b/web/src/main/java/io/onedev/server/web/component/comment/InvalidCodeCommentPanel.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/component/comment/InvalidCodeCommentPanel.java rename to web/src/main/java/io/onedev/server/web/component/comment/InvalidCodeCommentPanel.java index d6668f2293..b1ebb1f28f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/InvalidCodeCommentPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/InvalidCodeCommentPanel.java @@ -1,15 +1,15 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.util.ConfirmOnClick; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.util.ConfirmOnClick; @SuppressWarnings("serial") public class InvalidCodeCommentPanel extends Panel { @@ -25,7 +25,7 @@ public class InvalidCodeCommentPanel extends Panel { } private CodeComment getCodeComment() { - return TurboDev.getInstance(CodeCommentManager.class).load(codeCommentId); + return OneDev.getInstance(CodeCommentManager.class).load(codeCommentId); } @Override @@ -35,7 +35,7 @@ public class InvalidCodeCommentPanel extends Panel { @Override public void onClick() { - TurboDev.getInstance(CodeCommentManager.class).delete(getCodeComment()); + OneDev.getInstance(CodeCommentManager.class).delete(getCodeComment()); InvalidCodeCommentPanel.this.replaceWith(codeCommentListPanel); } diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/ProjectAttachmentSupport.java b/web/src/main/java/io/onedev/server/web/component/comment/ProjectAttachmentSupport.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/component/comment/ProjectAttachmentSupport.java rename to web/src/main/java/io/onedev/server/web/component/comment/ProjectAttachmentSupport.java index 3eeb672db1..a7faa6d9c1 100644 --- a/web/src/main/java/com/turbodev/server/web/component/comment/ProjectAttachmentSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/comment/ProjectAttachmentSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.comment; +package io.onedev.server.web.component.comment; import java.io.File; import java.io.FileOutputStream; @@ -10,20 +10,21 @@ import java.util.List; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.StringUtils; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.AttachmentManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.util.resource.AttachmentResource; -import com.turbodev.server.web.util.resource.AttachmentResourceReference; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.AttachmentManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.util.resource.AttachmentResource; +import io.onedev.server.web.util.resource.AttachmentResourceReference; +import io.onedev.utils.FileUtils; +import io.onedev.utils.StringUtils; public class ProjectAttachmentSupport implements AttachmentSupport { @@ -51,7 +52,7 @@ public class ProjectAttachmentSupport implements AttachmentSupport { @Override public List getAttachments() { List attachments = new ArrayList<>(); - File attachmentDir = TurboDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID); + File attachmentDir = OneDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID); if (attachmentDir.exists()) { for (File file: attachmentDir.listFiles()) attachments.add(file.getName()); @@ -60,12 +61,12 @@ public class ProjectAttachmentSupport implements AttachmentSupport { } private File getAttachmentDir() { - return TurboDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID); + return OneDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID); } @Override public void deleteAttachemnt(String attachment) { - File attachmentDir = TurboDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID); + File attachmentDir = OneDev.getInstance(AttachmentManager.class).getAttachmentDir(getProject(), attachmentDirUUID); FileUtils.deleteFile(new File(attachmentDir, attachment)); } @@ -75,10 +76,10 @@ public class ProjectAttachmentSupport implements AttachmentSupport { } private ProjectFacade getProject() { - UnitOfWork unitOfWork = TurboDev.getInstance(UnitOfWork.class); + UnitOfWork unitOfWork = OneDev.getInstance(UnitOfWork.class); unitOfWork.begin(); try { - return TurboDev.getInstance(ProjectManager.class).load(projectId).getFacade(); + return OneDev.getInstance(ProjectManager.class).load(projectId).getFacade(); } finally { unitOfWork.end(); } diff --git a/web/src/main/java/com/turbodev/server/web/component/comment/code-comment.css b/web/src/main/java/io/onedev/server/web/component/comment/code-comment.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/comment/code-comment.css rename to web/src/main/java/io/onedev/server/web/component/comment/code-comment.css diff --git a/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.java b/web/src/main/java/io/onedev/server/web/component/commitgraph/CommitGraphResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/commitgraph/CommitGraphResourceReference.java index 55d19cc923..2a11823379 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/commitgraph/CommitGraphResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commitgraph; +package io.onedev.server.web.component.commitgraph; import java.util.List; @@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.asset.snapsvg.SnapSvgResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.snapsvg.SnapSvgResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class CommitGraphResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphUtils.java b/web/src/main/java/io/onedev/server/web/component/commitgraph/CommitGraphUtils.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphUtils.java rename to web/src/main/java/io/onedev/server/web/component/commitgraph/CommitGraphUtils.java index beada9b7f8..946b12c272 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitgraph/CommitGraphUtils.java +++ b/web/src/main/java/io/onedev/server/web/component/commitgraph/CommitGraphUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commitgraph; +package io.onedev.server.web.component.commitgraph; import java.util.ArrayList; import java.util.HashMap; @@ -10,7 +10,8 @@ import org.eclipse.jgit.revwalk.RevCommit; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.server.TurboDev; + +import io.onedev.server.OneDev; public class CommitGraphUtils { @@ -75,7 +76,7 @@ public class CommitGraphUtils { } } try { - return TurboDev.getInstance(ObjectMapper.class).writeValueAsString(commitIndexes); + return OneDev.getInstance(ObjectMapper.class).writeValueAsString(commitIndexes); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/web/src/main/java/com/turbodev/server/web/component/commitgraph/commit-graph.css b/web/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commitgraph/commit-graph.css rename to web/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.css diff --git a/web/src/main/java/com/turbodev/server/web/component/commitgraph/commit-graph.js b/web/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js similarity index 98% rename from web/src/main/java/com/turbodev/server/web/component/commitgraph/commit-graph.js rename to web/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js index 75fb94817f..4026f177d7 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitgraph/commit-graph.js +++ b/web/src/main/java/io/onedev/server/web/component/commitgraph/commit-graph.js @@ -1,10 +1,10 @@ -turbodev.server.commitgraph = { +onedev.server.commitgraph = { render: function(containerId, commits) { var $container = $("#" + containerId); $container.prepend(""); var $graph = $container.children("svg"); - turbodev.server.commitgraph.populateData($graph, commits); - turbodev.server.commitgraph.drawGraph($graph); + onedev.server.commitgraph.populateData($graph, commits); + onedev.server.commitgraph.drawGraph($graph); var paper = Snap($graph[0]); function getCommitDot(e) { @@ -429,7 +429,7 @@ $(function() { return; e.stopPropagation(); $(".commit-graph").each(function() { - turbodev.server.commitgraph.drawGraph($(this)); + onedev.server.commitgraph.drawGraph($(this)); }); }); }); diff --git a/web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashPanel.html b/web/src/main/java/io/onedev/server/web/component/commithash/CommitHashPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashPanel.html rename to web/src/main/java/io/onedev/server/web/component/commithash/CommitHashPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashPanel.java b/web/src/main/java/io/onedev/server/web/component/commithash/CommitHashPanel.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashPanel.java rename to web/src/main/java/io/onedev/server/web/component/commithash/CommitHashPanel.java index 562f18fc72..cedaeebbd0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/commithash/CommitHashPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commithash; +package io.onedev.server.web.component.commithash; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; diff --git a/web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashResourceReference.java b/web/src/main/java/io/onedev/server/web/component/commithash/CommitHashResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/commithash/CommitHashResourceReference.java index d1ffbb1b97..483ece6462 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commithash/CommitHashResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/commithash/CommitHashResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commithash; +package io.onedev.server.web.component.commithash; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/commithash/commit-hash.css b/web/src/main/java/io/onedev/server/web/component/commithash/commit-hash.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commithash/commit-hash.css rename to web/src/main/java/io/onedev/server/web/component/commithash/commit-hash.css diff --git a/web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListPanel.html b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListPanel.html rename to web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListPanel.java b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListPanel.java rename to web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java index 74664f998b..68cf40e90e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commitlist; +package io.onedev.server.web.component.commitlist; import java.util.ArrayList; import java.util.List; @@ -26,24 +26,24 @@ import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.revwalk.RevCommit; import org.joda.time.DateTime; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.util.Verification; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.component.avatar.ContributorAvatars; -import com.turbodev.server.web.component.commitgraph.CommitGraphResourceReference; -import com.turbodev.server.web.component.commitgraph.CommitGraphUtils; -import com.turbodev.server.web.component.commitmessage.ExpandableCommitMessagePanel; -import com.turbodev.server.web.component.contributorpanel.ContributorPanel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.util.model.CommitRefsModel; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.util.Verification; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.component.avatar.ContributorAvatars; +import io.onedev.server.web.component.commitgraph.CommitGraphResourceReference; +import io.onedev.server.web.component.commitgraph.CommitGraphUtils; +import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel; +import io.onedev.server.web.component.contributorpanel.ContributorPanel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.util.model.CommitRefsModel; @SuppressWarnings("serial") public class CommitListPanel extends Panel { @@ -153,7 +153,7 @@ public class CommitListPanel extends Panel { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class) + return OneDev.getInstance(VerificationManager.class) .getVerifications(projectModel.getObject(), commitHash); } @@ -212,7 +212,7 @@ public class CommitListPanel extends Panel { response.render(CssHeaderItem.forReference(new CommitListResourceReference())); String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject()); - String script = String.format("turbodev.server.commitgraph.render('%s', %s);", container.getMarkupId(), jsonOfCommits); + String script = String.format("onedev.server.commitgraph.render('%s', %s);", container.getMarkupId(), jsonOfCommits); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListResourceReference.java b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/commitlist/CommitListResourceReference.java index ea56e9cff8..1c1474610c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitlist/CommitListResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/commitlist/CommitListResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commitlist; +package io.onedev.server.web.component.commitlist; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/commitlist/commit-list.css b/web/src/main/java/io/onedev/server/web/component/commitlist/commit-list.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commitlist/commit-list.css rename to web/src/main/java/io/onedev/server/web/component/commitlist/commit-list.css diff --git a/web/src/main/java/com/turbodev/server/web/component/commitmessage/CommitMessageLabel.java b/web/src/main/java/io/onedev/server/web/component/commitmessage/CommitMessageLabel.java similarity index 72% rename from web/src/main/java/com/turbodev/server/web/component/commitmessage/CommitMessageLabel.java rename to web/src/main/java/io/onedev/server/web/component/commitmessage/CommitMessageLabel.java index 4e3597c9bc..adec3d2c09 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitmessage/CommitMessageLabel.java +++ b/web/src/main/java/io/onedev/server/web/component/commitmessage/CommitMessageLabel.java @@ -1,13 +1,13 @@ -package com.turbodev.server.web.component.commitmessage; +package io.onedev.server.web.component.commitmessage; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.unbescape.html.HtmlEscape; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.util.commitmessagetransform.CommitMessageTransformer; +import io.onedev.server.OneDev; +import io.onedev.server.model.Project; +import io.onedev.server.web.util.commitmessagetransform.CommitMessageTransformer; @SuppressWarnings("serial") public class CommitMessageLabel extends Label { @@ -18,7 +18,7 @@ public class CommitMessageLabel extends Label { @Override protected String load() { String message = HtmlEscape.escapeHtml5(messageModel.getObject()); - for (CommitMessageTransformer transformer: TurboDev.getExtensions(CommitMessageTransformer.class)) { + for (CommitMessageTransformer transformer: OneDev.getExtensions(CommitMessageTransformer.class)) { message = transformer.transform(projectModel.getObject(), message); } return message; diff --git a/web/src/main/java/com/turbodev/server/web/component/commitmessage/CommitMessageResourceReference.java b/web/src/main/java/io/onedev/server/web/component/commitmessage/CommitMessageResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/commitmessage/CommitMessageResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/commitmessage/CommitMessageResourceReference.java index 73541b1be3..c69cd7e97f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitmessage/CommitMessageResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/commitmessage/CommitMessageResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commitmessage; +package io.onedev.server.web.component.commitmessage; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/commitmessage/ExpandableCommitMessagePanel.html b/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commitmessage/ExpandableCommitMessagePanel.html rename to web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java b/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java rename to web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java index ac38a59c09..b8cdca12fb 100644 --- a/web/src/main/java/com/turbodev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java +++ b/web/src/main/java/io/onedev/server/web/component/commitmessage/ExpandableCommitMessagePanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.commitmessage; +package io.onedev.server.web.component.commitmessage; import java.util.ArrayList; import java.util.List; @@ -16,12 +16,12 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.eclipse.jgit.revwalk.RevCommit; import org.unbescape.html.HtmlEscape; -import com.turbodev.utils.Highlighter; -import com.turbodev.utils.Transformer; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.utils.Highlighter; +import io.onedev.utils.Transformer; @SuppressWarnings("serial") public class ExpandableCommitMessagePanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/commitmessage/commit-message.css b/web/src/main/java/io/onedev/server/web/component/commitmessage/commit-message.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/commitmessage/commit-message.css rename to web/src/main/java/io/onedev/server/web/component/commitmessage/commit-message.css diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteModal.java b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteModal.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteModal.java rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteModal.java index 0235321af9..00a1d3416b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteModal.java +++ b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteModal.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.component.confirmdelete; +package io.onedev.server.web.component.confirmdelete; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.modal.ModalPanel; @SuppressWarnings("serial") public abstract class ConfirmDeleteModal extends ModalPanel { diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeletePanel.html b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeletePanel.html rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeletePanel.java b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeletePanel.java rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.java index 202d73839a..9f53098d60 100644 --- a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeletePanel.java +++ b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.confirmdelete; +package io.onedev.server.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.turbodev.server.web.component.link.PreventDefaultAjaxLink; +import io.onedev.server.web.component.link.PreventDefaultAjaxLink; @SuppressWarnings("serial") abstract class ConfirmDeletePanel extends Panel { @@ -64,7 +64,7 @@ abstract class ConfirmDeletePanel extends Panel { super.renderHead(response); response.render(JavaScriptHeaderItem.forReference(new ConfirmDeleteResourceReference())); - String script = String.format("turbodev.server.confirmDelete('%s', '%s');", getMarkupId(), getConfirmInput()); + String script = String.format("onedev.server.confirmDelete('%s', '%s');", getMarkupId(), getConfirmInput()); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java index e0fcbf0e11..182135ec23 100644 --- a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java +++ b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.component.confirmdelete; +package io.onedev.server.web.component.confirmdelete; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; @SuppressWarnings("serial") public abstract class ConfirmDeleteProjectModal extends ConfirmDeleteModal { @@ -17,7 +17,7 @@ public abstract class ConfirmDeleteProjectModal extends ConfirmDeleteModal { protected void doDelete(AjaxRequestTarget target) { Project project = getProject(); - TurboDev.getInstance(ProjectManager.class).delete(project); + OneDev.getInstance(ProjectManager.class).delete(project); getSession().success("Repository has been deleted"); onDeleted(target); diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java index e38fffba94..725b9c2acf 100644 --- a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.confirmdelete; +package io.onedev.server.web.component.confirmdelete; import java.util.List; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ConfirmDeleteResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/confirm-delete.css b/web/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/confirm-delete.css rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.css diff --git a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/confirm-delete.js b/web/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.js similarity index 80% rename from web/src/main/java/com/turbodev/server/web/component/confirmdelete/confirm-delete.js rename to web/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.js index 3b490a2341..aee0763704 100644 --- a/web/src/main/java/com/turbodev/server/web/component/confirmdelete/confirm-delete.js +++ b/web/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.js @@ -1,4 +1,4 @@ -turbodev.server.confirmDelete = function(containerId, confirmText) { +onedev.server.confirmDelete = function(containerId, confirmText) { var $container = $("#" + containerId); $container.find("input.confirm").on("input", function() { diff --git a/web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorPanel.html b/web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorPanel.html rename to web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorPanel.java b/web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorPanel.java rename to web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java index 3217022c80..663676f706 100644 --- a/web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.contributorpanel; +package io.onedev.server.web.component.contributorpanel; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; @@ -7,8 +7,8 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.util.DateUtils; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.util.DateUtils; @SuppressWarnings("serial") public class ContributorPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorResourceReference.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorResourceReference.java index e3b6ad20a5..c4cb2e602f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/contributorpanel/ContributorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/contributorpanel/ContributorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.contributorpanel; +package io.onedev.server.web.component.contributorpanel; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/contributorpanel/contributor.css b/web/src/main/java/io/onedev/server/web/component/contributorpanel/contributor.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/contributorpanel/contributor.css rename to web/src/main/java/io/onedev/server/web/component/contributorpanel/contributor.css diff --git a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java b/web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchLink.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java rename to web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchLink.java index 6750c8f735..37dbb76f7d 100644 --- a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchLink.java +++ b/web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchLink.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.component.createbranch; +package io.onedev.server.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 com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; @SuppressWarnings("serial") public abstract class CreateBranchLink extends ModalLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.html b/web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.html rename to web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java b/web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java rename to web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.java index 8ddea3b0cc..f00c957445 100644 --- a/web/src/main/java/com/turbodev/server/web/component/createbranch/CreateBranchPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/createbranch/CreateBranchPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.createbranch; +package io.onedev.server.web.component.createbranch; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -11,13 +11,13 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import com.google.common.base.Preconditions; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.security.SecurityUtils; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.security.SecurityUtils; @SuppressWarnings("serial") abstract class CreateBranchPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagLink.java b/web/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagLink.java rename to web/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java index b85156b3ae..9027b7736e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagLink.java +++ b/web/src/main/java/io/onedev/server/web/component/createtag/CreateTagLink.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.component.createtag; +package io.onedev.server.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 com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; @SuppressWarnings("serial") public abstract class CreateTagLink extends ModalLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.html b/web/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.html rename to web/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java b/web/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java rename to web/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java index 389afa6bc7..28a5593e85 100644 --- a/web/src/main/java/com/turbodev/server/web/component/createtag/CreateTagPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/createtag/CreateTagPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.createtag; +package io.onedev.server.web.component.createtag; import javax.annotation.Nullable; @@ -16,13 +16,13 @@ import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.lib.Repository; import com.google.common.base.Preconditions; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.security.SecurityUtils; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.security.SecurityUtils; @SuppressWarnings("serial") public abstract class CreateTagPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/datatable/EntityColumn.java b/web/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/datatable/EntityColumn.java rename to web/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java index 1e52d5dc75..1b44f59e96 100644 --- a/web/src/main/java/com/turbodev/server/web/component/datatable/EntityColumn.java +++ b/web/src/main/java/io/onedev/server/web/component/datatable/EntityColumn.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.datatable; +package io.onedev.server.web.component.datatable; import org.apache.wicket.Component; import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator; @@ -7,10 +7,10 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; public class EntityColumn implements IStyledColumn { diff --git a/web/src/main/java/com/turbodev/server/web/component/datatable/EntityDataProvider.java b/web/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/component/datatable/EntityDataProvider.java rename to web/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java index 7ee35ef561..7d8bd8b552 100644 --- a/web/src/main/java/com/turbodev/server/web/component/datatable/EntityDataProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/datatable/EntityDataProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.datatable; +package io.onedev.server.web.component.datatable; import java.util.Iterator; @@ -8,10 +8,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.hibernate.criterion.Order; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; @SuppressWarnings("serial") public class EntityDataProvider extends SortableDataProvider { diff --git a/web/src/main/java/com/turbodev/server/web/component/datatable/HistoryAwareDataTable.java b/web/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/datatable/HistoryAwareDataTable.java rename to web/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java index 6c2950cd90..dc5713bc78 100644 --- a/web/src/main/java/com/turbodev/server/web/component/datatable/HistoryAwareDataTable.java +++ b/web/src/main/java/io/onedev/server/web/component/datatable/HistoryAwareDataTable.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.datatable; +package io.onedev.server.web.component.datatable; import java.util.List; @@ -15,7 +15,7 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.markup.repeater.OddEvenItem; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class HistoryAwareDataTable extends DataTable { diff --git a/web/src/main/java/com/turbodev/server/web/component/datatable/HistoryAwarePagingNavigator.java b/web/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/datatable/HistoryAwarePagingNavigator.java rename to web/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java index 2bd3379889..7d87d4e177 100644 --- a/web/src/main/java/com/turbodev/server/web/component/datatable/HistoryAwarePagingNavigator.java +++ b/web/src/main/java/io/onedev/server/web/component/datatable/HistoryAwarePagingNavigator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.datatable; +package io.onedev.server.web.component.datatable; import org.apache.wicket.AttributeModifier; import org.apache.wicket.markup.html.link.AbstractLink; @@ -11,9 +11,8 @@ import org.apache.wicket.markup.html.navigation.paging.PagingNavigation; import org.apache.wicket.markup.html.navigation.paging.PagingNavigationIncrementLink; import org.apache.wicket.markup.html.navigation.paging.PagingNavigationLink; -import com.turbodev.server.web.util.PagingHistorySupport; - import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagingNavigator; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class HistoryAwarePagingNavigator extends BootstrapPagingNavigator { diff --git a/web/src/main/java/com/turbodev/server/web/component/datatable/SelectionColumn.java b/web/src/main/java/io/onedev/server/web/component/datatable/SelectionColumn.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/component/datatable/SelectionColumn.java rename to web/src/main/java/io/onedev/server/web/component/datatable/SelectionColumn.java index 49a8c81db7..d028417a22 100644 --- a/web/src/main/java/com/turbodev/server/web/component/datatable/SelectionColumn.java +++ b/web/src/main/java/io/onedev/server/web/component/datatable/SelectionColumn.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.datatable; +package io.onedev.server.web.component.datatable; import java.util.HashSet; import java.util.Set; @@ -26,7 +26,7 @@ import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; /** * Add this column to the wicket DataTable component so that user can select row of the diff --git a/web/src/main/java/com/turbodev/server/web/component/datetime/DatetimePicker.java b/web/src/main/java/io/onedev/server/web/component/datetime/DatetimePicker.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/datetime/DatetimePicker.java rename to web/src/main/java/io/onedev/server/web/component/datetime/DatetimePicker.java index 40b80d287d..0527b0a01c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/datetime/DatetimePicker.java +++ b/web/src/main/java/io/onedev/server/web/component/datetime/DatetimePicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.datetime; +package io.onedev.server.web.component.datetime; import java.util.Date; diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/DiffRenderer.java b/web/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java similarity index 57% rename from web/src/main/java/com/turbodev/server/web/component/diff/DiffRenderer.java rename to web/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java index 6408ace09e..18077c7399 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/DiffRenderer.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/DiffRenderer.java @@ -1,13 +1,13 @@ -package com.turbodev.server.web.component.diff; +package io.onedev.server.web.component.diff; import javax.annotation.Nullable; import org.apache.tika.mime.MediaType; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.launcher.loader.ExtensionPoint; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.web.component.diff.revision.DiffViewMode; +import io.onedev.launcher.loader.ExtensionPoint; +import io.onedev.server.git.BlobChange; +import io.onedev.server.web.component.diff.revision.DiffViewMode; @ExtensionPoint public interface DiffRenderer { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffPanel.html b/web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffPanel.html rename to web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffPanel.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffPanel.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java index f5bdd84d12..bad2e572bf 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.blob; +package io.onedev.server.web.component.diff.blob; import javax.annotation.Nullable; @@ -14,20 +14,20 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.eclipse.jgit.diff.DiffEntry.ChangeType; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.util.diff.DiffUtils; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.diff.DiffRenderer; -import com.turbodev.server.web.component.diff.blob.text.TextDiffPanel; -import com.turbodev.server.web.component.diff.difftitle.BlobDiffTitle; -import com.turbodev.server.web.component.diff.revision.BlobCommentSupport; -import com.turbodev.server.web.component.diff.revision.DiffViewMode; +import io.onedev.server.OneDev; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobChange; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.util.diff.DiffUtils; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.diff.DiffRenderer; +import io.onedev.server.web.component.diff.blob.text.TextDiffPanel; +import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle; +import io.onedev.server.web.component.diff.revision.BlobCommentSupport; +import io.onedev.server.web.component.diff.revision.DiffViewMode; @SuppressWarnings("serial") public class BlobDiffPanel extends Panel implements SourceAware { @@ -88,7 +88,7 @@ public class BlobDiffPanel extends Panel implements SourceAware { add(newFragment("File is too large to be loaded.", true)); } else { Panel diffPanel = null; - for (DiffRenderer renderer: TurboDev.getExtensions(DiffRenderer.class)) { + for (DiffRenderer renderer: OneDev.getExtensions(DiffRenderer.class)) { diffPanel = renderer.render(CONTENT_ID, blob.getMediaType(), change, diffMode); if (diffPanel != null) break; @@ -124,7 +124,7 @@ public class BlobDiffPanel extends Panel implements SourceAware { add(newFragment("File is too large to be loaded.", true)); } else if (change.getOldBlob().getMediaType().equals(change.getNewBlob().getMediaType())) { Panel diffPanel = null; - for (DiffRenderer renderer: TurboDev.getExtensions(DiffRenderer.class)) { + for (DiffRenderer renderer: OneDev.getExtensions(DiffRenderer.class)) { diffPanel = renderer.render(CONTENT_ID, change.getNewBlob().getMediaType(), change, diffMode); if (diffPanel != null) break; diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffResourceReference.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffResourceReference.java index 0048014b5e..4d2081bc3f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/BlobDiffResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.blob; +package io.onedev.server.web.component.diff.blob; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/SourceAware.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/SourceAware.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/SourceAware.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/SourceAware.java index f0caa2f9c3..a96deed0a1 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/SourceAware.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/SourceAware.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.component.diff.blob; +package io.onedev.server.web.component.diff.blob; import javax.annotation.Nullable; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.support.MarkPos; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.support.MarkPos; public interface SourceAware { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/blob-diff.css b/web/src/main/java/io/onedev/server/web/component/diff/blob/blob-diff.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/blob-diff.css rename to web/src/main/java/io/onedev/server/web/component/diff/blob/blob-diff.css diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffPanel.html b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffPanel.html rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffPanel.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffPanel.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java index 5f973f4a26..fcce38326c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.blob.image; +package io.onedev.server.web.component.diff.blob.image; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; @@ -8,11 +8,11 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.resource.DynamicImageResource; import org.apache.wicket.request.resource.PackageResourceReference; -import com.turbodev.utils.Provider; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobChange; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.utils.Provider; @SuppressWarnings("serial") public class ImageDiffPanel extends Panel { @@ -78,7 +78,7 @@ public class ImageDiffPanel extends Panel { public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render(JavaScriptHeaderItem.forReference(new ImageDiffResourceReference())); - String script = String.format("turbodev.server.imageDiff.onDomReady('%s');", getMarkupId()); + String script = String.format("onedev.server.imageDiff.onDomReady('%s');", getMarkupId()); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffRenderer.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffRenderer.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.java index 0cb62d6a4c..394a9095f7 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffRenderer.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffRenderer.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.component.diff.blob.image; +package io.onedev.server.web.component.diff.blob.image; import org.apache.tika.mime.MediaType; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.web.component.diff.DiffRenderer; -import com.turbodev.server.web.component.diff.revision.DiffViewMode; +import io.onedev.server.git.BlobChange; +import io.onedev.server.web.component.diff.DiffRenderer; +import io.onedev.server.web.component.diff.revision.DiffViewMode; public class ImageDiffRenderer implements DiffRenderer { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffResourceReference.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffResourceReference.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffResourceReference.java index f57ef6a3ee..c38b9a6fd4 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/ImageDiffResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.blob.image; +package io.onedev.server.web.component.diff.blob.image; 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.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ImageDiffResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/blank.png b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/blank.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/blank.png rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/blank.png diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/image-diff.css b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/image-diff.css rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.css diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/image-diff.js b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.js similarity index 81% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/image/image-diff.js rename to web/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.js index 218f2b000b..22335663b0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/image/image-diff.js +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/image/image-diff.js @@ -1,4 +1,4 @@ -turbodev.server.imageDiff = { +onedev.server.imageDiff = { onDomReady: function(containerId) { $("#" + containerId + " img").on("load", function() { // $(window).resize(); diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java index 2eb925153a..4b248201c9 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/MarkAwareDiffBlock.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.component.diff.blob.text; +package io.onedev.server.web.component.diff.blob.text; import java.io.Serializable; import java.util.List; -import com.turbodev.jsyntax.Tokenized; +import io.onedev.jsyntax.Tokenized; public class MarkAwareDiffBlock implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffPanel.html b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffPanel.html rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffPanel.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffPanel.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java index e2dd530882..0c7bbd85b9 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.blob.text; +package io.onedev.server.web.component.diff.blob.text; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -37,49 +37,51 @@ import org.unbescape.javascript.JavaScriptEscape; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.utils.Range; -import com.turbodev.utils.RangeUtils; -import com.turbodev.utils.StringUtils; -import com.turbodev.jsyntax.TextToken; -import com.turbodev.jsyntax.Tokenized; -import com.turbodev.jsyntax.TokenUtils; + +import io.onedev.jsyntax.TextToken; +import io.onedev.jsyntax.TokenUtils; +import io.onedev.jsyntax.Tokenized; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlameBlock; +import io.onedev.server.git.BlameCommit; +import io.onedev.server.git.BlobChange; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.BlameCommand; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.diff.DiffBlock; +import io.onedev.server.util.diff.DiffUtils; +import io.onedev.server.util.diff.LineDiff; +import io.onedev.server.util.diff.DiffMatchPatch.Operation; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior; +import io.onedev.server.web.component.diff.blob.SourceAware; +import io.onedev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type; +import io.onedev.server.web.component.diff.diffstat.DiffStatBar; +import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle; +import io.onedev.server.web.component.diff.revision.BlobCommentSupport; +import io.onedev.server.web.component.diff.revision.DiffViewMode; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.utils.Range; +import io.onedev.utils.RangeUtils; +import io.onedev.utils.StringUtils; + import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlameBlock; -import com.turbodev.server.git.BlameCommit; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.BlameCommand; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.diff.DiffBlock; -import com.turbodev.server.util.diff.DiffUtils; -import com.turbodev.server.util.diff.LineDiff; -import com.turbodev.server.util.diff.DiffMatchPatch.Operation; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.blamemessage.BlameMessageBehavior; -import com.turbodev.server.web.component.diff.blob.SourceAware; -import com.turbodev.server.web.component.diff.blob.text.MarkAwareDiffBlock.Type; -import com.turbodev.server.web.component.diff.diffstat.DiffStatBar; -import com.turbodev.server.web.component.diff.difftitle.BlobDiffTitle; -import com.turbodev.server.web.component.diff.revision.BlobCommentSupport; -import com.turbodev.server.web.component.diff.revision.DiffViewMode; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.symboltooltip.SymbolTooltipPanel; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage; -import com.turbodev.server.web.util.DateUtils; @SuppressWarnings("serial") public class TextDiffPanel extends Panel implements SourceAware { @@ -142,7 +144,7 @@ public class TextDiffPanel extends Panel implements SourceAware { private String getJson(MarkPos mark) { try { MarkInfo markInfo = new MarkInfo(mark, getOldCommit().name()); - return TurboDev.getInstance(ObjectMapper.class).writeValueAsString(markInfo); + return OneDev.getInstance(ObjectMapper.class).writeValueAsString(markInfo); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -344,7 +346,7 @@ public class TextDiffPanel extends Panel implements SourceAware { String expanded = StringUtils.replace(builder.toString(), "\"", "\\\""); expanded = StringUtils.replace(expanded, "\n", ""); - String script = String.format("turbodev.server.textDiff.expand('%s', %d, \"%s\");", + String script = String.format("onedev.server.textDiff.expand('%s', %d, \"%s\");", getMarkupId(), index, expanded); target.appendJavaScript(script); break; @@ -353,7 +355,7 @@ public class TextDiffPanel extends Panel implements SourceAware { params.getParameterValue("param1").toInt(), params.getParameterValue("param2").toInt()); MarkPos mark = getMark(params, "param3", "param4", "param5", "param6", "param7"); - script = String.format("turbodev.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s);", + script = String.format("onedev.server.textDiff.openSelectionPopover('%s', %s, %s, '%s', '%s', %s);", getMarkupId(), jsonOfPosition, getJson(mark), commentSupport.getMarkUrl(mark), JavaScriptEscape.escapeJavaScript(getMarkedText(mark)), SecurityUtils.getUser()!=null); @@ -364,17 +366,17 @@ public class TextDiffPanel extends Panel implements SourceAware { mark = getMark(params, "param1", "param2", "param3", "param4", "param5"); commentSupport.onAddComment(target, mark); - script = String.format("turbodev.server.textDiff.onAddComment($('#%s'), %s);", + script = String.format("onedev.server.textDiff.onAddComment($('#%s'), %s);", getMarkupId(), getJson(mark)); target.appendJavaScript(script); break; case "toggleComment": Long commentId = params.getParameterValue("param1").toLong(); - CodeComment comment = TurboDev.getInstance(CodeCommentManager.class).load(commentId); + CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId); CodeComment prevComment = commentSupport.getOpenComment(); commentSupport.onToggleComment(target, comment); if (!comment.equals(prevComment)) { - script = String.format("turbodev.server.textDiff.onOpenComment($('#%s'), %s);", + script = String.format("onedev.server.textDiff.onOpenComment($('#%s'), %s);", getMarkupId(), getJsonOfComment(comment)); target.appendJavaScript(script); } else { @@ -534,7 +536,7 @@ public class TextDiffPanel extends Panel implements SourceAware { value.sort((o1, o2)->(int)(o1.id-o2.id)); } - ObjectMapper mapper = TurboDev.getInstance(ObjectMapper.class); + ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class); try { jsonOfOldCommentInfos = mapper.writeValueAsString(oldCommentInfos); jsonOfNewCommentInfos = mapper.writeValueAsString(newCommentInfos); @@ -574,17 +576,17 @@ public class TextDiffPanel extends Panel implements SourceAware { } else { unableCommentMessage = "Unable to comment at this place"; } - String script = String.format("turbodev.server.textDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, '%s', %s," + String script = String.format("onedev.server.textDiff.onDomReady('%s', '%s', '%s', '%s', %s, %s, %s, '%s', %s," + "%s, %s, %s, %s, '%s');", getMarkupId(), symbolTooltip.getMarkupId(), change.getOldBlobIdent().revision, change.getNewBlobIdent().revision, callback, blameMessageBehavior.getCallback(), commentSupport!=null, unableCommentMessage, jsonOfMark, jsonOfCommentInfo, jsonOfOldCommentInfos, jsonOfNewCommentInfos, dirtyContainerId, - TurboDev.getInstance().getDocLink()); + OneDev.getInstance().getDocLink()); response.render(OnDomReadyHeaderItem.forScript(script)); - script = String.format("turbodev.server.textDiff.onWindowLoad('%s', %b, %s);", + script = String.format("onedev.server.textDiff.onWindowLoad('%s', %b, %s);", getMarkupId(), RequestCycle.get().find(AjaxRequestTarget.class) != null, jsonOfMark); response.render(OnLoadHeaderItem.forScript(script)); } @@ -1144,7 +1146,7 @@ public class TextDiffPanel extends Panel implements SourceAware { String jsonOfCommentInfo; try { - jsonOfCommentInfo = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo); + jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -1153,7 +1155,7 @@ public class TextDiffPanel extends Panel implements SourceAware { @Override public void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) { - String script = String.format("turbodev.server.textDiff.onCommentDeleted($('#%s'), %s);", + String script = String.format("onedev.server.textDiff.onCommentDeleted($('#%s'), %s);", getMarkupId(), getJsonOfComment(comment)); target.appendJavaScript(script); mark(target, null); @@ -1161,14 +1163,14 @@ public class TextDiffPanel extends Panel implements SourceAware { @Override public void onCommentClosed(AjaxRequestTarget target, CodeComment comment) { - String script = String.format("turbodev.server.textDiff.onCloseComment($('#%s'));", getMarkupId()); + String script = String.format("onedev.server.textDiff.onCloseComment($('#%s'));", getMarkupId()); target.appendJavaScript(script); mark(target, null); } @Override public void onCommentAdded(AjaxRequestTarget target, CodeComment comment) { - String script = String.format("turbodev.server.textDiff.onCommentAdded($('#%s'), %s);", + String script = String.format("onedev.server.textDiff.onCommentAdded($('#%s'), %s);", getMarkupId(), getJsonOfComment(comment)); target.appendJavaScript(script); } @@ -1180,13 +1182,13 @@ public class TextDiffPanel extends Panel implements SourceAware { script = String.format("" + "var $container = $('#%s');" + "var mark = %s;" - + "turbodev.server.textDiff.scrollTo($container, mark);" - + "turbodev.server.textDiff.mark($container, mark);", + + "onedev.server.textDiff.scrollTo($container, mark);" + + "onedev.server.textDiff.mark($container, mark);", getMarkupId(), getJson(mark)); } else { script = String.format("" + "var $container = $('#%s');" - + "turbodev.server.textDiff.clearMark($container);" + + "onedev.server.textDiff.clearMark($container);" + "$container.removeData('mark');", getMarkupId()); } diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.java b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java index e0bf0a7216..b84f674fde 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/TextDiffResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.blob.text; +package io.onedev.server.web.component.diff.blob.text; import java.util.List; @@ -7,12 +7,11 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference; -import com.turbodev.server.web.asset.hover.HoverResourceReference; -import com.turbodev.server.web.asset.selectionpopover.SelectionPopoverResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; - import de.agilecoders.wicket.webjars.request.resource.WebjarsCssResourceReference; +import io.onedev.server.web.asset.clipboard.ClipboardResourceReference; +import io.onedev.server.web.asset.hover.HoverResourceReference; +import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class TextDiffResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/ajax-indicator.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/ajax-indicator.gif rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/ajax-indicator.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.css rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.css diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.js b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.js rename to web/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js index 97bfe67b14..27659aac08 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/blob/text/text-diff.js +++ b/web/src/main/java/io/onedev/server/web/component/diff/blob/text/text-diff.js @@ -1,4 +1,4 @@ -turbodev.server.textDiff = { +onedev.server.textDiff = { symbolClasses: ".cm-property, .cm-variable, .cm-variable-2, .cm-variable-3, .cm-def, .cm-meta, .cm-string, .cm-tag, .cm-attribute, cm-builtin, cm-qualifier", onDomReady: function(containerId, symbolTooltipId, oldRev, newRev, callback, blameMessageCallback, commentSupport, unableCommentMessage, mark, openComment, oldComments, newComments, dirtyContainerId, doclink) { @@ -25,7 +25,7 @@ turbodev.server.textDiff = { symbolTooltip.onMouseOverSymbol(revision, this); }); $container.data("onMouseOverContent", function() { - if (!turbodev.server.mouseState.pressed) { + if (!onedev.server.mouseState.pressed) { if ($(this).hasClass("left")) { $container.find("td.content.right").addClass("noselect"); $container.find("td.content.left").removeClass("noselect"); @@ -35,11 +35,11 @@ turbodev.server.textDiff = { } } }); - var $symbols = $container.find(turbodev.server.textDiff.symbolClasses); + var $symbols = $container.find(onedev.server.textDiff.symbolClasses); $symbols.mouseover($container.data("symbolHover")); $container.find("td.content").mouseover($container.data("onMouseOverContent")); - turbodev.server.textDiff.initBlameTooltip(containerId, $container.find("td.blame>a.hash")); + onedev.server.textDiff.initBlameTooltip(containerId, $container.find("td.blame>a.hash")); $container.selectionPopover("init", function() { var selection = window.getSelection(); @@ -430,26 +430,26 @@ turbodev.server.textDiff = { } for (var line in oldComments) { if (oldComments.hasOwnProperty(line)) { - turbodev.server.textDiff.addCommentIndicator($container, true, line, oldComments[line][1]); + onedev.server.textDiff.addCommentIndicator($container, true, line, oldComments[line][1]); } } for (var line in newComments) { if (newComments.hasOwnProperty(line)) { - turbodev.server.textDiff.addCommentIndicator($container, false, line, newComments[line][1]); + onedev.server.textDiff.addCommentIndicator($container, false, line, newComments[line][1]); } } - turbodev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.highlightCommentTrigger($container); if (mark) { $container.data("mark", mark); - turbodev.server.textDiff.mark($container, mark); + onedev.server.textDiff.mark($container, mark); } }, onWindowLoad: function(containerId, ajax, mark) { var $container = $("#" + containerId); - if (!ajax && mark && !turbodev.server.history.isVisited()) { - turbodev.server.textDiff.scrollTo($container, mark); + if (!ajax && mark && !onedev.server.history.isVisited()) { + onedev.server.textDiff.scrollTo($container, mark); } }, initBlameTooltip: function(containerId, $hashLink) { @@ -522,7 +522,7 @@ turbodev.server.textDiff = { } else { $expandedTrs = $nextTr.prevAll(); } - var $symbols = $expandedTrs.find(turbodev.server.textDiff.symbolClasses); + var $symbols = $expandedTrs.find(onedev.server.textDiff.symbolClasses); $symbols.mouseover($container.data("symbolHover")); $expandedTrs.find("td.content").mouseover($container.data("onMouseOverContent")); var $firstExpandedTr = $expandedTrs.first(); @@ -566,7 +566,7 @@ turbodev.server.textDiff = { processBlames(1); } - turbodev.server.textDiff.initBlameTooltip(containerId, $expandedTrs.find(">td.blame>a.hash")); + onedev.server.textDiff.initBlameTooltip(containerId, $expandedTrs.find(">td.blame>a.hash")); $(window).resize(); }, @@ -605,7 +605,7 @@ turbodev.server.textDiff = { }; }, scrollTo: function($container, mark) { - var markInfo = turbodev.server.textDiff.getMarkInfo($container, mark); + var markInfo = onedev.server.textDiff.getMarkInfo($container, mark); var $startTd = markInfo.startTd; var $endTd = markInfo.endTd; if ($startTd && $endTd) { @@ -621,9 +621,9 @@ turbodev.server.textDiff = { } }, mark: function($container, mark) { - turbodev.server.textDiff.clearMark($container); + onedev.server.textDiff.clearMark($container); - var markInfo = turbodev.server.textDiff.getMarkInfo($container, mark); + var markInfo = onedev.server.textDiff.getMarkInfo($container, mark); var $startTd = markInfo.startTd; var $endTd = markInfo.endTd; if ($startTd && $endTd) { @@ -742,21 +742,21 @@ turbodev.server.textDiff = { $this.removeClass("content-mark"); $this.removeData("beforemark"); $container = $this.closest(".text-diff").parent(); - $this.find(turbodev.server.textDiff.symbolClasses).mouseover($container.data("symbolHover")); + $this.find(onedev.server.textDiff.symbolClasses).mouseover($container.data("symbolHover")); }); }, restoreMark: function($container) { var mark = $container.data("mark"); if (mark) { - turbodev.server.textDiff.mark($container, mark); + onedev.server.textDiff.mark($container, mark); } else { - turbodev.server.textDiff.clearMark($container); + onedev.server.textDiff.clearMark($container); } }, addCommentIndicator: function($container, leftSide, line, comments) { var oldOrNew = leftSide?"old":"new"; $container.find("." + oldOrNew + ".comment-popover[data-line='" + line + "']").remove(); - var $lineNumTd = turbodev.server.textDiff.getLineNumTd($container, leftSide, line); + var $lineNumTd = onedev.server.textDiff.getLineNumTd($container, leftSide, line); var callback = $container.data("callback"); @@ -789,10 +789,10 @@ turbodev.server.textDiff = { $("." + oldOrNew + ".comment-popover[data-line='" + line + "'] a").each(function() { $(this).mouseover(function() { var comment = comments[$(this).index()]; - turbodev.server.textDiff.mark($container, comment.mark); + onedev.server.textDiff.mark($container, comment.mark); }); $(this).mouseout(function() { - turbodev.server.textDiff.restoreMark($container); + onedev.server.textDiff.restoreMark($container); }); $(this).click(function() { if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0 @@ -803,17 +803,17 @@ turbodev.server.textDiff = { callback("toggleComment", comment.id); }); }); - turbodev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.highlightCommentTrigger($container); }); } else { var comment = comments[0]; $indicator.addClass("comment-trigger").attr("title", "Click to show comment of marked text"); $indicator.append(""); $indicator.mouseover(function() { - turbodev.server.textDiff.mark($container, comment.mark); + onedev.server.textDiff.mark($container, comment.mark); }); $indicator.mouseout(function() { - turbodev.server.textDiff.restoreMark($container); + onedev.server.textDiff.restoreMark($container); }); $indicator.click(function() { if ($("#"+$container.data("dirtyContainerId")).find("form.dirty").length != 0 @@ -844,7 +844,7 @@ turbodev.server.textDiff = { var openComment = $container.data("openComment"); if (openComment) { var line = parseInt(openComment.mark.beginLine); - var $indicator = turbodev.server.textDiff.getLineNumTd($container, openComment.mark.leftSide, line).children(".comment-indicator"); + var $indicator = onedev.server.textDiff.getLineNumTd($container, openComment.mark.leftSide, line).children(".comment-indicator"); if ($indicator.length != 0) { var comments = $indicator.data("comments"); if (comments.length == 1) { @@ -868,7 +868,7 @@ turbodev.server.textDiff = { var line = parseInt(comment.mark.beginLine); var leftSide = comment.mark.leftSide; - var $indicator = turbodev.server.textDiff.getLineNumTd($container, leftSide, line).children(".comment-indicator"); + var $indicator = onedev.server.textDiff.getLineNumTd($container, leftSide, line).children(".comment-indicator"); var comments; if ($indicator.length != 0) { comments = $indicator.data("comments"); @@ -876,15 +876,15 @@ turbodev.server.textDiff = { comments = []; } comments.push(comment); - turbodev.server.textDiff.addCommentIndicator($container, leftSide, line, comments); - turbodev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.addCommentIndicator($container, leftSide, line, comments); + onedev.server.textDiff.highlightCommentTrigger($container); }, onCommentDeleted: function($container, comment) { $container.removeData("openComment"); var line = parseInt(comment.mark.beginLine); var leftSide = comment.mark.leftSide; - var $indicator = turbodev.server.textDiff.getLineNumTd($container, leftSide, line).children(".comment-indicator"); + var $indicator = onedev.server.textDiff.getLineNumTd($container, leftSide, line).children(".comment-indicator"); var comments = $indicator.data("comments"); if (comments.length == 1) { $indicator.remove(); @@ -896,20 +896,20 @@ turbodev.server.textDiff = { break; } } - turbodev.server.textDiff.addCommentIndicator($container, leftSide, line, comments); + onedev.server.textDiff.addCommentIndicator($container, leftSide, line, comments); } - turbodev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.highlightCommentTrigger($container); }, onOpenComment: function($container, comment) { $container.data("openComment", comment); $container.data("mark", comment.mark); - turbodev.server.textDiff.highlightCommentTrigger($container); - turbodev.server.textDiff.mark($container, comment.mark); - turbodev.server.textDiff.scrollTo($container, comment.mark); + onedev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.mark($container, comment.mark); + onedev.server.textDiff.scrollTo($container, comment.mark); }, onCloseComment: function($container) { $container.removeData("openComment"); - turbodev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.highlightCommentTrigger($container); }, onAddComment: function($container, mark) { $container.removeData("openComment"); @@ -921,9 +921,9 @@ turbodev.server.textDiff = { // continue to operate DOM in a timer to give browser a chance to // clear selections setTimeout(function() { - turbodev.server.textDiff.highlightCommentTrigger($container); - turbodev.server.textDiff.mark($container, mark); - turbodev.server.textDiff.scrollTo($container, mark); + onedev.server.textDiff.highlightCommentTrigger($container); + onedev.server.textDiff.mark($container, mark); + onedev.server.textDiff.scrollTo($container, mark); }, 100); } }; diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBar.html b/web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBar.html rename to web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.html diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBar.java b/web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBar.java rename to web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java index 1fb9227829..2939ea2c4c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBar.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBar.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.diffstat; +package io.onedev.server.web.component.diff.diffstat; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; @@ -7,10 +7,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.web.behavior.TooltipBehavior; - import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig; import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement; +import io.onedev.server.web.behavior.TooltipBehavior; @SuppressWarnings("serial") public class DiffStatBar extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java b/web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java index 571f419000..1a24322af0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/diffstat/DiffStatBarResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.diffstat; +package io.onedev.server.web.component.diff.diffstat; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/diffstat/diff-stat-bar.css b/web/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/diffstat/diff-stat-bar.css rename to web/src/main/java/io/onedev/server/web/component/diff/diffstat/diff-stat-bar.css diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/difftitle/BlobDiffTitle.html b/web/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/difftitle/BlobDiffTitle.html rename to web/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/difftitle/BlobDiffTitle.java b/web/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/component/diff/difftitle/BlobDiffTitle.java rename to web/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java index 3907bc7949..7b43a09d17 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/difftitle/BlobDiffTitle.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.difftitle; +package io.onedev.server.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.turbodev.server.git.BlobChange; +import io.onedev.server.git.BlobChange; @SuppressWarnings("serial") public class BlobDiffTitle extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/difftitle/DiffTitleResourceReference.java b/web/src/main/java/io/onedev/server/web/component/diff/difftitle/DiffTitleResourceReference.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/diff/difftitle/DiffTitleResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/diff/difftitle/DiffTitleResourceReference.java index da8048e24c..22e6a8963e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/difftitle/DiffTitleResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/difftitle/DiffTitleResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.difftitle; +package io.onedev.server.web.component.diff.difftitle; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/difftitle/diff-title.css b/web/src/main/java/io/onedev/server/web/component/diff/difftitle/diff-title.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/difftitle/diff-title.css rename to web/src/main/java/io/onedev/server/web/component/diff/difftitle/diff-title.css diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/BlobCommentSupport.java b/web/src/main/java/io/onedev/server/web/component/diff/revision/BlobCommentSupport.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/BlobCommentSupport.java rename to web/src/main/java/io/onedev/server/web/component/diff/revision/BlobCommentSupport.java index db4815e645..408af15f5c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/BlobCommentSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/revision/BlobCommentSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.revision; +package io.onedev.server.web.component.diff.revision; import java.io.Serializable; import java.util.Collection; @@ -8,8 +8,8 @@ import javax.annotation.Nullable; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.support.MarkPos; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.support.MarkPos; public interface BlobCommentSupport extends Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/CommentSupport.java b/web/src/main/java/io/onedev/server/web/component/diff/revision/CommentSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/CommentSupport.java rename to web/src/main/java/io/onedev/server/web/component/diff/revision/CommentSupport.java index 77df8e7449..d2046768e4 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/CommentSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/revision/CommentSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.revision; +package io.onedev.server.web.component.diff.revision; import java.io.Serializable; @@ -6,8 +6,8 @@ import javax.annotation.Nullable; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.support.MarkPos; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.support.MarkPos; public interface CommentSupport extends Serializable { diff --git a/web/src/main/java/io/onedev/server/web/component/diff/revision/DiffViewMode.java b/web/src/main/java/io/onedev/server/web/component/diff/revision/DiffViewMode.java new file mode 100644 index 0000000000..a73a1623cc --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/component/diff/revision/DiffViewMode.java @@ -0,0 +1,5 @@ +package io.onedev.server.web.component.diff.revision; + +public enum DiffViewMode { + UNIFIED, SPLIT +} diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffPanel.html b/web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffPanel.html rename to web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffPanel.java b/web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffPanel.java rename to web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java index 00960578aa..8bbbb7a17a 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.revision; +package io.onedev.server.web.component.diff.revision; import java.util.ArrayList; import java.util.Collection; @@ -54,52 +54,52 @@ import org.eclipse.jgit.lib.AnyObjectId; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.jsymbol.util.NoAntiCacheImage; -import com.turbodev.utils.PathComparator; -import com.turbodev.utils.Range; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.stringmatch.WildcardUtils; import com.google.common.base.Objects; import com.google.common.collect.Lists; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.model.support.ProjectAndRevision; -import com.turbodev.server.search.IndexManager; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.diff.DiffUtils; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.inputassist.InputAssistBehavior; -import com.turbodev.server.web.component.comment.CodeCommentPanel; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.diff.blob.BlobDiffPanel; -import com.turbodev.server.web.component.diff.blob.SourceAware; -import com.turbodev.server.web.component.diff.diffstat.DiffStatBar; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.menu.MenuItem; -import com.turbodev.server.web.component.menu.MenuLink; -import com.turbodev.server.web.component.revisionpicker.RevisionSelector; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.util.SuggestionUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.websocket.PageDataChanged; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.jsymbol.util.NoAntiCacheImage; +import io.onedev.server.OneDev; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobChange; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.model.support.ProjectAndRevision; +import io.onedev.server.search.IndexManager; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.diff.DiffUtils; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.inputassist.InputAssistBehavior; +import io.onedev.server.web.component.comment.CodeCommentPanel; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.diff.blob.BlobDiffPanel; +import io.onedev.server.web.component.diff.blob.SourceAware; +import io.onedev.server.web.component.diff.diffstat.DiffStatBar; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.menu.MenuItem; +import io.onedev.server.web.component.menu.MenuLink; +import io.onedev.server.web.component.revisionpicker.RevisionSelector; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.util.SuggestionUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.utils.PathComparator; +import io.onedev.utils.Range; +import io.onedev.utils.StringUtils; +import io.onedev.utils.stringmatch.WildcardUtils; /** * Make sure to add only one revision diff panel on a page @@ -110,7 +110,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel @SuppressWarnings("serial") public class RevisionDiffPanel extends Panel { - private static final String COOKIE_VIEW_MODE = "turbodev.server.diff.viewmode"; + private static final String COOKIE_VIEW_MODE = "onedev.server.diff.viewmode"; private static final String BODY_ID = "body"; @@ -300,7 +300,7 @@ public class RevisionDiffPanel extends Panel { }); } - for (Future future: TurboDev.getInstance(ForkJoinPool.class).invokeAll(tasks)) { + for (Future future: OneDev.getInstance(ForkJoinPool.class).invokeAll(tasks)) { try { // call get in order to throw exception if there is any during task execution future.get(); @@ -365,7 +365,7 @@ public class RevisionDiffPanel extends Panel { protected Collection load() { Collection comments = new ArrayList<>(); if (commentSupport != null) { - CodeCommentManager codeCommentManager = TurboDev.getInstance(CodeCommentManager.class); + CodeCommentManager codeCommentManager = OneDev.getInstance(CodeCommentManager.class); PullRequest request = requestModel.getObject(); for(CodeComment comment: codeCommentManager.findAll(projectModel.getObject(), getOldCommitId(), getNewCommitId())) { @@ -427,7 +427,7 @@ public class RevisionDiffPanel extends Panel { SourceAware sourceAware = getSourceAware(prevBlameFile); sourceAware.onUnblame(target); } - target.appendJavaScript("turbodev.server.revisionDiff.reposition();"); + target.appendJavaScript("onedev.server.revisionDiff.reposition();"); } }; @@ -472,7 +472,7 @@ public class RevisionDiffPanel extends Panel { super.onConfigure(); Project project = projectModel.getObject(); - IndexManager indexManager = TurboDev.getInstance(IndexManager.class); + IndexManager indexManager = OneDev.getInstance(IndexManager.class); ObjectId oldCommit = getOldCommitId(); ObjectId newCommit = getNewCommitId(); boolean oldCommitIndexed = oldCommit.equals(ObjectId.zeroId()) @@ -498,7 +498,7 @@ public class RevisionDiffPanel extends Panel { public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript("turbodev.server.revisionDiff.onDomReady();")); + response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.onDomReady();")); } }; @@ -885,7 +885,7 @@ public class RevisionDiffPanel extends Panel { ((CommentSupport)commentSupport).onMark(target, null); } - target.appendJavaScript("turbodev.server.revisionDiff.reposition();"); + target.appendJavaScript("onedev.server.revisionDiff.reposition();"); } }); @@ -910,7 +910,7 @@ public class RevisionDiffPanel extends Panel { comment.setContent(contentInput.getModelObject()); comment.setCompareContext(getCompareContext(comment.getMarkPos().getCommit())); - TurboDev.getInstance(CodeCommentManager.class).save(comment, requestModel.getObject()); + OneDev.getInstance(CodeCommentManager.class).save(comment, requestModel.getObject()); CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) { @@ -945,7 +945,7 @@ public class RevisionDiffPanel extends Panel { ((CommentSupport)commentSupport).onCommentOpened(target, comment); target.appendJavaScript(String.format("" - + "turbodev.server.revisionDiff.reposition();" + + "onedev.server.revisionDiff.reposition();" + "localStorage.removeItem('%s');", autosaveKey)); } @@ -972,7 +972,7 @@ public class RevisionDiffPanel extends Panel { } ((CommentSupport)commentSupport).onAddComment(target, markPos); String script = String.format("" - + "turbodev.server.revisionDiff.reposition(); " + + "onedev.server.revisionDiff.reposition(); " + "setTimeout(function() {" + " var $textarea = $('#%s textarea');" + " $textarea.caret($textarea.val().length);" @@ -1077,7 +1077,7 @@ public class RevisionDiffPanel extends Panel { clearComment(target); commentSupport.onCommentOpened(target, null); } - target.appendJavaScript("turbodev.server.revisionDiff.reposition();"); + target.appendJavaScript("onedev.server.revisionDiff.reposition();"); } private @Nullable IModel getBlobBlameModel(BlobChange change) { @@ -1113,7 +1113,7 @@ public class RevisionDiffPanel extends Panel { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript("turbodev.server.revisionDiff.initComment();")); + response.render(OnDomReadyHeaderItem.forScript("onedev.server.revisionDiff.initComment();")); } }; @@ -1227,7 +1227,7 @@ public class RevisionDiffPanel extends Panel { sourceAware.onCommentClosed(target, comment); commentSupport.onCommentOpened(target, null); } - target.appendJavaScript("turbodev.server.revisionDiff.reposition();"); + target.appendJavaScript("onedev.server.revisionDiff.reposition();"); } }); @@ -1348,7 +1348,7 @@ public class RevisionDiffPanel extends Panel { if (sourceAware != null) sourceAware.onCommentDeleted(target, comment); ((CommentSupport)commentSupport).onCommentOpened(target, null); - target.appendJavaScript("turbodev.server.revisionDiff.reposition();"); + target.appendJavaScript("onedev.server.revisionDiff.reposition();"); MarkPos mark = getMark(); if (mark != null) { sourceAware = getSourceAware(mark.getPath()); diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.java b/web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffResourceReference.java similarity index 72% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffResourceReference.java index df82200b85..edfe35e147 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/RevisionDiffResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.diff.revision; +package io.onedev.server.web.component.diff.revision; import java.util.List; @@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class RevisionDiffResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/indexing.gif b/web/src/main/java/io/onedev/server/web/component/diff/revision/indexing.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/indexing.gif rename to web/src/main/java/io/onedev/server/web/component/diff/revision/indexing.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.css b/web/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.css rename to web/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.css diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js b/web/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js rename to web/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js index 81f142dc0d..e438ba38e2 100644 --- a/web/src/main/java/com/turbodev/server/web/component/diff/revision/revision-diff.js +++ b/web/src/main/java/io/onedev/server/web/component/diff/revision/revision-diff.js @@ -1,4 +1,4 @@ -turbodev.server.revisionDiff = { +onedev.server.revisionDiff = { onDomReady: function() { var cookieName = "revisionDiff.showDiffStats"; var $body = $(".revision-diff>.body"); @@ -14,23 +14,23 @@ turbodev.server.revisionDiff = { $diffStatsToggle.addClass("expanded"); Cookies.set(cookieName, "yes", {expires: Infinity}); } - turbodev.server.revisionDiff.reposition(); + onedev.server.revisionDiff.reposition(); }); var $image = $body.find("img"); if ($image.length == 0) { - turbodev.server.revisionDiff.reposition(); + onedev.server.revisionDiff.reposition(); } else { var loadedImages = 0; $image.on("load", function() { loadedImages++; if (loadedImages == $image.length) { - turbodev.server.revisionDiff.reposition(); + onedev.server.revisionDiff.reposition(); } }); } - turbodev.server.revisionDiff.reposition(); + onedev.server.revisionDiff.reposition(); if (window.location.hash) { var $anchor = $(window.location.hash); if ($anchor.length != 0) { @@ -119,5 +119,5 @@ turbodev.server.revisionDiff = { } }; $(function() { - $(window).on("scroll resize", turbodev.server.revisionDiff.reposition); + $(window).on("scroll resize", onedev.server.revisionDiff.reposition); }); diff --git a/web/src/main/java/com/turbodev/server/web/component/diff/revision/vgrabber.png b/web/src/main/java/io/onedev/server/web/component/diff/revision/vgrabber.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/diff/revision/vgrabber.png rename to web/src/main/java/io/onedev/server/web/component/diff/revision/vgrabber.png diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.html b/web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.html rename to web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.html diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.java b/web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.java rename to web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java index d8265c8112..5365c00ce9 100644 --- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneField.java +++ b/web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneField.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.dropzonefield; +package io.onedev.server.web.component.dropzonefield; import java.util.ArrayList; import java.util.Collection; @@ -24,7 +24,7 @@ import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.util.lang.Bytes; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; @SuppressWarnings("serial") public class DropzoneField extends FormComponentPanel> { @@ -133,7 +133,7 @@ public class DropzoneField extends FormComponentPanel> { response.render(JavaScriptHeaderItem.forReference(new DropzoneFieldResourceReference())); String script = String.format( - "turbodev.server.dropzone.onDomReady('%s', '%s', %s, %s, %s, %d);", + "onedev.server.dropzone.onDomReady('%s', '%s', %s, %s, %s, %d);", getMarkupId(), uploadBehavior.getCallbackUrl(), deleteBehavior.getCallbackFunction(CallbackParameter.explicit("name")), diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java b/web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java index 7a1a87ec0c..adc1ebd363 100644 --- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/dropzonefield/DropzoneFieldResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.dropzonefield; +package io.onedev.server.web.component.dropzonefield; import java.util.List; @@ -6,9 +6,9 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.dropzone.DropzoneResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.dropzone.DropzoneResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; @SuppressWarnings("serial") public class DropzoneFieldResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.css b/web/src/main/java/io/onedev/server/web/component/dropzonefield/dropzone-field.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.css rename to web/src/main/java/io/onedev/server/web/component/dropzonefield/dropzone-field.css diff --git a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.js b/web/src/main/java/io/onedev/server/web/component/dropzonefield/dropzone-field.js similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.js rename to web/src/main/java/io/onedev/server/web/component/dropzonefield/dropzone-field.js index b5d080d5b2..5a4a6ec7dc 100644 --- a/web/src/main/java/com/turbodev/server/web/component/dropzonefield/dropzone-field.js +++ b/web/src/main/java/io/onedev/server/web/component/dropzonefield/dropzone-field.js @@ -1,4 +1,4 @@ -turbodev.server.dropzone = { +onedev.server.dropzone = { onDomReady: function(containerId, uploadUrl, deleteCallback, acceptedFiles, maxFiles, maxFilesize) { var input = document.querySelector("#" + containerId + ">.dropzone"); @@ -10,7 +10,7 @@ turbodev.server.dropzone = { maxFilesize: maxFilesize, dictDefaultMessage: "Drop files here or click to upload", success: function() { - turbodev.server.form.markDirty($(input).closest("form")); + onedev.server.form.markDirty($(input).closest("form")); }, removedfile: function(file) { deleteCallback(file.name); diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/AlignPlacement.java b/web/src/main/java/io/onedev/server/web/component/floating/AlignPlacement.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/floating/AlignPlacement.java rename to web/src/main/java/io/onedev/server/web/component/floating/AlignPlacement.java index edc90dbe2e..6b4b69759d 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/AlignPlacement.java +++ b/web/src/main/java/io/onedev/server/web/component/floating/AlignPlacement.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.floating; +package io.onedev.server.web.component.floating; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/AlignTarget.java b/web/src/main/java/io/onedev/server/web/component/floating/AlignTarget.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/component/floating/AlignTarget.java rename to web/src/main/java/io/onedev/server/web/component/floating/AlignTarget.java index e1e35fef2d..ff887f5f57 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/AlignTarget.java +++ b/web/src/main/java/io/onedev/server/web/component/floating/AlignTarget.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.floating; +package io.onedev.server.web.component.floating; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/ComponentTarget.java b/web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/floating/ComponentTarget.java rename to web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.java index 8de2ad598a..810c148488 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/ComponentTarget.java +++ b/web/src/main/java/io/onedev/server/web/component/floating/ComponentTarget.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.floating; +package io.onedev.server.web.component.floating; import org.apache.wicket.Component; diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/FloatingPanel.html b/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/floating/FloatingPanel.html rename to web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/FloatingPanel.java b/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/floating/FloatingPanel.java rename to web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java index c7bc07ee58..0c466df73e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/FloatingPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/floating/FloatingPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.floating; +package io.onedev.server.web.component.floating; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -9,8 +9,8 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public abstract class FloatingPanel extends Panel { @@ -53,7 +53,7 @@ public abstract class FloatingPanel extends Panel { response.render(JavaScriptHeaderItem.forReference(new FloatingResourceReference())); - String script = String.format("turbodev.server.floating.init('%s', {target:%s, placement:%s}, %s);", + String script = String.format("onedev.server.floating.init('%s', {target:%s, placement:%s}, %s);", getMarkupId(true), alignTarget, placement, getCallbackFunction()); response.render(OnDomReadyHeaderItem.forScript(script)); } @@ -73,7 +73,7 @@ public abstract class FloatingPanel extends Panel { public final void close() { AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); if (target != null) { - String script = String.format("turbodev.server.floating.close($('#%s'), false);", getMarkupId(true)); + String script = String.format("onedev.server.floating.close($('#%s'), false);", getMarkupId(true)); target.appendJavaScript(script); } if (getParent() != null) diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/FloatingResourceReference.java b/web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/floating/FloatingResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java index 3cafe9359a..9a90a5dcaf 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/FloatingResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/floating/FloatingResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.floating; +package io.onedev.server.web.component.floating; 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.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class FloatingResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/RectTarget.java b/web/src/main/java/io/onedev/server/web/component/floating/RectTarget.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/floating/RectTarget.java rename to web/src/main/java/io/onedev/server/web/component/floating/RectTarget.java index 691750e7ed..483a5116ce 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/RectTarget.java +++ b/web/src/main/java/io/onedev/server/web/component/floating/RectTarget.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.floating; +package io.onedev.server.web.component.floating; public class RectTarget implements AlignTarget { diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/floating.css b/web/src/main/java/io/onedev/server/web/component/floating/floating.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/floating/floating.css rename to web/src/main/java/io/onedev/server/web/component/floating/floating.css diff --git a/web/src/main/java/com/turbodev/server/web/component/floating/floating.js b/web/src/main/java/io/onedev/server/web/component/floating/floating.js similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/floating/floating.js rename to web/src/main/java/io/onedev/server/web/component/floating/floating.js index 3bbe3eef55..21f2ac4edb 100644 --- a/web/src/main/java/com/turbodev/server/web/component/floating/floating.js +++ b/web/src/main/java/io/onedev/server/web/component/floating/floating.js @@ -1,4 +1,4 @@ -turbodev.server.floating = { +onedev.server.floating = { init: function(floatingId, alignment, closeCallback) { var $floating = $("#" + floatingId); $floating.data("closeCallback", closeCallback); @@ -21,14 +21,14 @@ turbodev.server.floating = { if (!$floating.is(e.target) && $floating.has(e.target).length === 0 && !contains) { var $trigger = $floating.data("trigger"); if (!$trigger || !$trigger.is(e.target) && $trigger.has(e.target).length === 0) - turbodev.server.floating.close($floating, true); + onedev.server.floating.close($floating, true); } }); $(document).on("mouseup touchstart", $floating.data("mouseUpOrTouchStart")); $floating.data("keydown", function(e) { if (e.keyCode == 27 && $(".select2-drop:visible").length == 0) { - turbodev.server.floating.close($floating, true); + onedev.server.floating.close($floating, true); } }); diff --git a/web/src/main/java/com/turbodev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java index 57d09ed5ca..b9a2821cc7 100644 --- a/web/src/main/java/com/turbodev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/AbstractGroupChoiceProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.groupchoice; +package io.onedev.server.web.component.groupchoice; import java.util.Collection; import java.util.List; @@ -7,10 +7,11 @@ import org.json.JSONException; import org.json.JSONWriter; import com.google.common.collect.Lists; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.web.component.select2.ChoiceProvider; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.web.component.select2.ChoiceProvider; public abstract class AbstractGroupChoiceProvider extends ChoiceProvider { @@ -24,7 +25,7 @@ public abstract class AbstractGroupChoiceProvider extends ChoiceProvider toChoices(Collection ids) { List groups = Lists.newArrayList(); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); for (String each : ids) { Long id = Long.valueOf(each); groups.add(cacheManager.getGroup(id)); diff --git a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java similarity index 59% rename from web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java index b0d50b7746..24f7d6202b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceProvider.java @@ -1,17 +1,17 @@ -package com.turbodev.server.web.component.groupchoice; +package io.onedev.server.web.component.groupchoice; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; public class GroupChoiceProvider extends AbstractGroupChoiceProvider { @@ -19,7 +19,7 @@ public class GroupChoiceProvider extends AbstractGroupChoiceProvider { @Override public void query(String term, int page, Response response) { - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); List choices = new ArrayList(cacheManager.getGroups().values()); choices.sort(Comparator.comparing(GroupFacade::getName)); diff --git a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupChoiceResourceReference.java b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupChoiceResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.java index 113bc93859..62b54bbb4c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupChoiceResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupChoiceResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.groupchoice; +package io.onedev.server.web.component.groupchoice; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class GroupChoiceResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupMultiChoice.java b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java similarity index 63% rename from web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupMultiChoice.java rename to web/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java index 6308348204..516d246681 100644 --- a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupMultiChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupMultiChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.groupchoice; +package io.onedev.server.web.component.groupchoice; 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.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.web.component.select2.Select2MultiChoice; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.web.component.select2.Select2MultiChoice; @SuppressWarnings("serial") public class GroupMultiChoice extends Select2MultiChoice { @@ -21,9 +21,9 @@ public class GroupMultiChoice extends Select2MultiChoice { protected void onInitialize() { super.onInitialize(); getSettings().setPlaceholder("Choose groups ..."); - getSettings().setFormatResult("turbodev.server.groupChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.groupChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.groupChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup"); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupSingleChoice.java b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupSingleChoice.java rename to web/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java index 8116ac23c5..3ec6daa96d 100644 --- a/web/src/main/java/com/turbodev/server/web/component/groupchoice/GroupSingleChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/GroupSingleChoice.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.component.groupchoice; +package io.onedev.server.web.component.groupchoice; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.model.IModel; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.web.component.select2.Select2Choice; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.web.component.select2.Select2Choice; @SuppressWarnings("serial") public class GroupSingleChoice extends Select2Choice { @@ -19,9 +19,9 @@ public class GroupSingleChoice extends Select2Choice { protected void onInitialize() { super.onInitialize(); getSettings().setPlaceholder("Choose a group ..."); - getSettings().setFormatResult("turbodev.server.groupChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.groupChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.groupChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup"); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/component/groupchoice/group-choice.js b/web/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js similarity index 80% rename from web/src/main/java/com/turbodev/server/web/component/groupchoice/group-choice.js rename to web/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js index 09f0f11970..c46cb7b1e8 100644 --- a/web/src/main/java/com/turbodev/server/web/component/groupchoice/group-choice.js +++ b/web/src/main/java/io/onedev/server/web/component/groupchoice/group-choice.js @@ -1,4 +1,4 @@ -turbodev.server.groupChoiceFormatter = { +onedev.server.groupChoiceFormatter = { formatSelection: function(group) { return group.name; }, diff --git a/web/src/main/java/com/turbodev/server/web/component/link/ArchiveMenuLink.java b/web/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/component/link/ArchiveMenuLink.java rename to web/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.java index ce31dba6f5..56db25ef09 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/ArchiveMenuLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/ArchiveMenuLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import java.util.ArrayList; import java.util.List; @@ -7,12 +7,12 @@ import org.apache.wicket.markup.html.link.AbstractLink; import org.apache.wicket.markup.html.link.ResourceLink; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.menu.MenuItem; -import com.turbodev.server.web.component.menu.MenuLink; -import com.turbodev.server.web.util.resource.ArchiveResource; -import com.turbodev.server.web.util.resource.ArchiveResourceReference; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.menu.MenuItem; +import io.onedev.server.web.component.menu.MenuLink; +import io.onedev.server.web.util.resource.ArchiveResource; +import io.onedev.server.web.util.resource.ArchiveResourceReference; @SuppressWarnings("serial") public abstract class ArchiveMenuLink extends MenuLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/link/BranchLink.java b/web/src/main/java/io/onedev/server/web/component/link/BranchLink.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/link/BranchLink.java rename to web/src/main/java/io/onedev/server/web/component/link/BranchLink.java index 5ea8f688d1..75ab9631ed 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/BranchLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/BranchLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import javax.annotation.Nullable; @@ -8,11 +8,11 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.FileMode; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; @SuppressWarnings("serial") public class BranchLink extends ViewStateAwarePageLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/link/DropdownLink.java b/web/src/main/java/io/onedev/server/web/component/link/DropdownLink.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/component/link/DropdownLink.java rename to web/src/main/java/io/onedev/server/web/component/link/DropdownLink.java index d61bd6b468..6ccab488f6 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/DropdownLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/DropdownLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -10,11 +10,11 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.component.floating.AlignPlacement; -import com.turbodev.server.web.component.floating.AlignTarget; -import com.turbodev.server.web.component.floating.ComponentTarget; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.floating.RectTarget; +import io.onedev.server.web.component.floating.AlignPlacement; +import io.onedev.server.web.component.floating.AlignTarget; +import io.onedev.server.web.component.floating.ComponentTarget; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.floating.RectTarget; @SuppressWarnings("serial") public abstract class DropdownLink extends AjaxLink { @@ -124,7 +124,7 @@ public abstract class DropdownLink extends AjaxLink { public String getCloseScript() { if (dropdown != null) { - return String.format("turbodev.server.floating.close($('#%s'), true);", dropdown.getMarkupId()); + return String.format("onedev.server.floating.close($('#%s'), true);", dropdown.getMarkupId()); } else { return ""; } diff --git a/web/src/main/java/com/turbodev/server/web/component/link/EmailLink.java b/web/src/main/java/io/onedev/server/web/component/link/EmailLink.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/link/EmailLink.java rename to web/src/main/java/io/onedev/server/web/component/link/EmailLink.java index 8e80a14deb..accc8cd6a8 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/EmailLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/EmailLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.ComponentTag; diff --git a/web/src/main/java/com/turbodev/server/web/component/link/LabelLink.java b/web/src/main/java/io/onedev/server/web/component/link/LabelLink.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/link/LabelLink.java rename to web/src/main/java/io/onedev/server/web/component/link/LabelLink.java index 20a4f57028..f00c7111b6 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/LabelLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/LabelLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.IModel; diff --git a/web/src/main/java/com/turbodev/server/web/component/link/PreventDefaultAjaxLink.java b/web/src/main/java/io/onedev/server/web/component/link/PreventDefaultAjaxLink.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/link/PreventDefaultAjaxLink.java rename to web/src/main/java/io/onedev/server/web/component/link/PreventDefaultAjaxLink.java index 4a4c950428..23ceef418d 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/PreventDefaultAjaxLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/PreventDefaultAjaxLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.ajax.markup.html.AjaxLink; diff --git a/web/src/main/java/com/turbodev/server/web/component/link/UserLink.java b/web/src/main/java/io/onedev/server/web/component/link/UserLink.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/component/link/UserLink.java rename to web/src/main/java/io/onedev/server/web/component/link/UserLink.java index d0f6ef0239..e19e428c1c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/UserLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/UserLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import javax.annotation.Nullable; @@ -8,11 +8,11 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.page.user.UserPage; -import com.turbodev.server.web.page.user.UserProfilePage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.web.page.user.UserPage; +import io.onedev.server.web.page.user.UserProfilePage; @SuppressWarnings("serial") public class UserLink extends ViewStateAwarePageLink { @@ -26,7 +26,7 @@ public class UserLink extends ViewStateAwarePageLink { if (user == null) { params = new PageParameters(); - name = TurboDev.NAME; + name = OneDev.NAME; } else if (user.getId() == null) { params = new PageParameters(); name = user.getDisplayName(); @@ -38,7 +38,7 @@ public class UserLink extends ViewStateAwarePageLink { public UserLink(String id, PersonIdent person) { super(id, UserProfilePage.class); - User user = TurboDev.getInstance(UserManager.class).find(person); + User user = OneDev.getInstance(UserManager.class).find(person); if (user != null) { params = UserPage.paramsOf(user); name = user.getDisplayName(); diff --git a/web/src/main/java/com/turbodev/server/web/component/link/ViewStateAwareAjaxLink.java b/web/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/link/ViewStateAwareAjaxLink.java rename to web/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.java index bac0bd1b4a..7546c0d6fe 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/ViewStateAwareAjaxLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/ViewStateAwareAjaxLink.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.util.ajaxlistener.TrackViewStateListener; +import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener; @SuppressWarnings("serial") public abstract class ViewStateAwareAjaxLink extends PreventDefaultAjaxLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/link/ViewStateAwarePageLink.java b/web/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/link/ViewStateAwarePageLink.java rename to web/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java index 67f86d5c42..7cd35eaf83 100644 --- a/web/src/main/java/com/turbodev/server/web/component/link/ViewStateAwarePageLink.java +++ b/web/src/main/java/io/onedev/server/web/component/link/ViewStateAwarePageLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.link; +package io.onedev.server.web.component.link; import org.apache.wicket.Page; import org.apache.wicket.markup.html.link.BookmarkablePageLink; @@ -25,7 +25,7 @@ public class ViewStateAwarePageLink extends BookmarkablePageLink { @Override protected CharSequence getOnClickScript(CharSequence url) { - return "turbodev.server.viewState.getFromViewAndSetToHistory();"; + return "onedev.server.viewState.getFromViewAndSetToHistory();"; } } diff --git a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicator.html b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicator.html rename to web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.html diff --git a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicator.java b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicator.java rename to web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.java index b7e12694d4..de9c7304ed 100644 --- a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicator.java +++ b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.loadingindicator; +package io.onedev.server.web.component.loadingindicator; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; diff --git a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java index 85926c40ea..22eabc7ece 100644 --- a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/loadingindicator/LoadingIndicatorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.loadingindicator; +package io.onedev.server.web.component.loadingindicator; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/component/loadingindicator/ajax-indicator.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/loadingindicator/ajax-indicator.gif rename to web/src/main/java/io/onedev/server/web/component/loadingindicator/ajax-indicator.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/loadingindicator/loading-indicator.css b/web/src/main/java/io/onedev/server/web/component/loadingindicator/loading-indicator.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/loadingindicator/loading-indicator.css rename to web/src/main/java/io/onedev/server/web/component/loadingindicator/loading-indicator.css diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/AttachmentSupport.java b/web/src/main/java/io/onedev/server/web/component/markdown/AttachmentSupport.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/component/markdown/AttachmentSupport.java rename to web/src/main/java/io/onedev/server/web/component/markdown/AttachmentSupport.java index 3eeeac478b..5324b2029c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/AttachmentSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/AttachmentSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.io.InputStream; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/AttachmentUploadServlet.java b/web/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/markdown/AttachmentUploadServlet.java rename to web/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java index 9df9aecb02..f8908ae725 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/AttachmentUploadServlet.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/AttachmentUploadServlet.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.io.IOException; import java.net.URLDecoder; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/ContentVersionSupport.java b/web/src/main/java/io/onedev/server/web/component/markdown/ContentVersionSupport.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/component/markdown/ContentVersionSupport.java rename to web/src/main/java/io/onedev/server/web/component/markdown/ContentVersionSupport.java index 5f5a9fec47..6ab9526653 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/ContentVersionSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/ContentVersionSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.html b/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.html rename to web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.java b/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.java rename to web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java index 066a65558a..389db34dc0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/InsertUrlPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.io.File; import java.io.IOException; @@ -42,21 +42,21 @@ import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; import com.google.common.base.Preconditions; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.BlobIdentFilter; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.blobpicker.BlobPicker; -import com.turbodev.server.web.component.dropzonefield.DropzoneField; -import com.turbodev.server.web.component.tabbable.AjaxActionTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobUploadException; -import com.turbodev.utils.PathUtils; -import com.turbodev.utils.StringUtils; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.BlobIdentFilter; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.blobpicker.BlobPicker; +import io.onedev.server.web.component.dropzonefield.DropzoneField; +import io.onedev.server.web.component.tabbable.AjaxActionTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobUploadException; +import io.onedev.utils.PathUtils; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") abstract class InsertUrlPanel extends Panel { @@ -103,7 +103,7 @@ abstract class InsertUrlPanel extends Panel { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - String script = String.format("turbodev.server.markdown.onInputUrlDomReady('%s');", getMarkupId()); + String script = String.format("onedev.server.markdown.onInputUrlDomReady('%s');", getMarkupId()); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.html b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.html rename to web/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.java b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.java rename to web/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java index 95393a2b9d..3b35ec3d8a 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownEditor.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -44,16 +44,17 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.component.markdown.emoji.EmojiOnes; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.util.avatar.AvatarManager; + +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.component.markdown.emoji.EmojiOnes; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.util.avatar.AvatarManager; @SuppressWarnings("serial") public class MarkdownEditor extends FormComponentPanel { @@ -121,7 +122,7 @@ public class MarkdownEditor extends FormComponentPanel { } protected String renderMarkdown(String markdown) { - MarkdownManager markdownManager = TurboDev.getInstance(MarkdownManager.class); + MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class); String rendered = markdownManager.render(markdown); return markdownManager.process(rendered, blobRenderContext); } @@ -162,7 +163,7 @@ public class MarkdownEditor extends FormComponentPanel { public void renderHead(IHeaderResponse response) { super.renderHead(response); String script = String.format( - "turbodev.server.markdown.initRendered($('#%s>.body>.preview>.markdown-rendered'));", + "onedev.server.markdown.initRendered($('#%s>.body>.preview>.markdown-rendered'));", container.getMarkupId()); response.render(OnDomReadyHeaderItem.forScript(script)); } @@ -193,7 +194,7 @@ public class MarkdownEditor extends FormComponentPanel { case "render": String markdown = params.getParameterValue("param1").toString(); String rendered = renderInput(markdown); - String script = String.format("turbodev.server.markdown.onRendered('%s', '%s');", + String script = String.format("onedev.server.markdown.onRendered('%s', '%s');", container.getMarkupId(), JavaScriptEscape.escapeJavaScript(rendered)); target.appendJavaScript(script); break; @@ -252,13 +253,13 @@ public class MarkdownEditor extends FormComponentPanel { throw new RuntimeException(e); } - script = String.format("turbodev.server.markdown.onEmojisLoaded('%s', %s);", container.getMarkupId(), json); + script = String.format("onedev.server.markdown.onEmojisLoaded('%s', %s);", container.getMarkupId(), json); target.appendJavaScript(script); break; case "userQuery": String userQuery = params.getParameterValue("param1").toOptionalString(); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); List> userList = new ArrayList<>(); for (UserFacade user: getUserMentionSupport().findUsers(userQuery, ATWHO_LIMIT)) { Map userMap = new HashMap<>(); @@ -278,7 +279,7 @@ public class MarkdownEditor extends FormComponentPanel { } try { - json = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(userList); + json = OneDev.getInstance(ObjectMapper.class).writeValueAsString(userList); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -298,7 +299,7 @@ public class MarkdownEditor extends FormComponentPanel { } try { - json = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(requestList); + json = OneDev.getInstance(ObjectMapper.class).writeValueAsString(requestList); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -383,7 +384,7 @@ public class MarkdownEditor extends FormComponentPanel { else autosaveKey = "undefined"; - String script = String.format("turbodev.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %s);", + String script = String.format("onedev.server.markdown.onDomReady('%s', %s, %d, %s, %d, %b, %b, %s);", container.getMarkupId(), callback, ATWHO_LIMIT, @@ -394,13 +395,13 @@ public class MarkdownEditor extends FormComponentPanel { autosaveKey); response.render(OnDomReadyHeaderItem.forScript(script)); - script = String.format("turbodev.server.markdown.onWindowLoad('%s');", container.getMarkupId()); + script = String.format("onedev.server.markdown.onWindowLoad('%s');", container.getMarkupId()); response.render(OnLoadHeaderItem.forScript(script)); } public void insertUrl(AjaxRequestTarget target, boolean isImage, String url, String name, @Nullable String replaceMessage) { - String script = String.format("turbodev.server.markdown.insertUrl('%s', %s, '%s', '%s', %s);", + String script = String.format("onedev.server.markdown.insertUrl('%s', %s, '%s', '%s', %s);", container.getMarkupId(), isImage, StringEscapeUtils.escapeEcmaScript(url), StringEscapeUtils.escapeEcmaScript(name), replaceMessage!=null?"'"+replaceMessage+"'":"undefined"); diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java similarity index 63% rename from web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java index 761ace117c..cea7c405af 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.util.List; @@ -6,16 +6,16 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.atwho.AtWhoResourceReference; -import com.turbodev.server.web.asset.caret.CaretResourceReference; -import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference; -import com.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.atwho.AtWhoResourceReference; +import io.onedev.server.web.asset.caret.CaretResourceReference; +import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.asset.textareacaretposition.TextareaCaretPositionResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; @SuppressWarnings("serial") public class MarkdownResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownViewer.html b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownViewer.html rename to web/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownViewer.java b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownViewer.java rename to web/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java index 3f275d852f..8008d8fe3b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/MarkdownViewer.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -16,12 +16,11 @@ import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.cycle.RequestCycle; import org.hibernate.StaleStateException; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public class MarkdownViewer extends GenericPanel { @@ -110,7 +109,7 @@ public class MarkdownViewer extends GenericPanel { explicit(SourcePositionTrackExtension.DATA_START_ATTRIBUTE), explicit(TASK_CHECKED)); - String script = String.format("turbodev.server.markdown.onViewerDomReady('%s', %s, '%s');", + String script = String.format("onedev.server.markdown.onViewerDomReady('%s', %s, '%s');", getMarkupId(), contentVersionSupport!=null?callback:"undefined", SourcePositionTrackExtension.DATA_START_ATTRIBUTE); diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/PullRequestReferenceSupport.java b/web/src/main/java/io/onedev/server/web/component/markdown/PullRequestReferenceSupport.java similarity index 58% rename from web/src/main/java/com/turbodev/server/web/component/markdown/PullRequestReferenceSupport.java rename to web/src/main/java/io/onedev/server/web/component/markdown/PullRequestReferenceSupport.java index 51af9b1b49..81f1d82a9b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/PullRequestReferenceSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/PullRequestReferenceSupport.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.util.List; -import com.turbodev.server.model.PullRequest; +import io.onedev.server.model.PullRequest; public interface PullRequestReferenceSupport { diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/SourcePositionTrackExtension.java b/web/src/main/java/io/onedev/server/web/component/markdown/SourcePositionTrackExtension.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/markdown/SourcePositionTrackExtension.java rename to web/src/main/java/io/onedev/server/web/component/markdown/SourcePositionTrackExtension.java index dafae6fee3..44f727f93b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/SourcePositionTrackExtension.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/SourcePositionTrackExtension.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import com.vladsch.flexmark.ast.Block; import com.vladsch.flexmark.ast.Node; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/UserMentionSupport.java b/web/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.java similarity index 54% rename from web/src/main/java/com/turbodev/server/web/component/markdown/UserMentionSupport.java rename to web/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.java index 06a1a0cef9..bf404f4ab2 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/UserMentionSupport.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/UserMentionSupport.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.component.markdown; +package io.onedev.server.web.component.markdown; import java.util.List; -import com.turbodev.server.util.facade.UserFacade; +import io.onedev.server.util.facade.UserFacade; public interface UserMentionSupport { diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java index 43c2fc82b0..0b7fe04df3 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiDelimiterProcessor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown.emoji; +package io.onedev.server.web.component.markdown.emoji; import com.vladsch.flexmark.ast.Node; import com.vladsch.flexmark.internal.Delimiter; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiExtension.java b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiExtension.java rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.java index 68dd93f89a..3564d05913 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiExtension.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiExtension.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown.emoji; +package io.onedev.server.web.component.markdown.emoji; import com.vladsch.flexmark.html.HtmlRenderer; import com.vladsch.flexmark.parser.Parser; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiNode.java b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNode.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiNode.java rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNode.java index 002829924b..f6f85f9dff 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiNode.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNode.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown.emoji; +package io.onedev.server.web.component.markdown.emoji; import com.vladsch.flexmark.ast.CustomNode; import com.vladsch.flexmark.ast.DelimitedNode; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiNodeRenderer.java b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiNodeRenderer.java rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java index e994ae4643..7a882b74d0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiNodeRenderer.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiNodeRenderer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown.emoji; +package io.onedev.server.web.component.markdown.emoji; import com.vladsch.flexmark.html.CustomNodeRenderer; import com.vladsch.flexmark.html.HtmlWriter; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiOnes.java b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiOnes.java rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java index 96e8d9f157..25fb852871 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/EmojiOnes.java +++ b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/EmojiOnes.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.markdown.emoji; +package io.onedev.server.web.component.markdown.emoji; import java.io.IOException; import java.io.InputStream; diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/emoji.json b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/emoji.json similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/emoji.json rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/emoji.json diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0023-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0023-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0023-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0023-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0030-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0030-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0030-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0030-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0031-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0031-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0031-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0031-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0032-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0032-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0032-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0032-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0033-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0033-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0033-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0033-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0034-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0034-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0034-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0034-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0035-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0035-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0035-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0035-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0036-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0036-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0036-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0036-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0037-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0037-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0037-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0037-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0038-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0038-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0038-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0038-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0039-20E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0039-20E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/0039-20E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/0039-20E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/00A9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/00A9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/00A9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/00A9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/00AE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/00AE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/00AE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/00AE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F004.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F004.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F004.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F004.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F0CF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F0CF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F0CF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F0CF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F170.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F170.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F170.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F170.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F171.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F171.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F171.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F171.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F17E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F17E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F17E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F17E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F17F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F17F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F17F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F17F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F18E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F18E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F18E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F18E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F191.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F191.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F191.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F191.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F192.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F192.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F192.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F192.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F193.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F193.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F193.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F193.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F194.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F194.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F194.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F194.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F195.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F195.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F195.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F195.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F196.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F196.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F196.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F196.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F197.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F197.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F197.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F197.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F198.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F198.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F198.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F198.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F199.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F199.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F199.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F199.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F19A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F19A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F19A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F19A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E6-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E6-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1E7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1E7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1E7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1E7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1EF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1EF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E7-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E7-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E8-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E8-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1EF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1EF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1EF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1EF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1E9-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1E9-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EA-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EA-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1EF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1EF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1EF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1EF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EB-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EB-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1E7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1E7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1E7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1E7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EC-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EC-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1ED-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1ED-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EE-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EE-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1F5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1F5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1EF-1F1F5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1EF-1F1F5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F0-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F0-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1E7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1E7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1E7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1E7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F1-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F1-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F2-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F2-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F3-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F3-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F4-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F4-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F4-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F4-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F5-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F5-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F6-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F6-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F6-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F6-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F7-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F7-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F8-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F8-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1EF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1EF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1EF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1EF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1F9-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1F9-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FA-1F1FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FA-1F1FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FB-1F1FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FB-1F1FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FC-1F1EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FC-1F1EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FC-1F1EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FC-1F1EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FC-1F1F8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FC-1F1F8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FC-1F1F8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FC-1F1F8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FD-1F1F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FD-1F1F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FD-1F1F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FD-1F1F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FE-1F1EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FE-1F1EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FE-1F1EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FE-1F1EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FF-1F1E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FF-1F1E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FF-1F1E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FF-1F1E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FF-1F1F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FF-1F1F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FF-1F1F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FF-1F1F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FF-1F1FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FF-1F1FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F1FF-1F1FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F1FF-1F1FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F201.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F201.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F201.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F201.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F202.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F202.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F202.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F202.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F21A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F21A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F21A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F21A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F22F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F22F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F22F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F22F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F232.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F232.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F232.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F232.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F233.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F233.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F233.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F233.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F234.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F234.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F234.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F234.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F235.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F235.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F235.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F235.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F236.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F236.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F236.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F236.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F237.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F237.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F237.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F237.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F238.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F238.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F238.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F238.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F239.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F239.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F239.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F239.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F23A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F23A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F23A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F23A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F250.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F250.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F250.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F250.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F251.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F251.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F251.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F251.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F300.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F300.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F300.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F300.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F301.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F301.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F301.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F301.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F302.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F302.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F302.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F302.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F303.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F303.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F303.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F303.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F304.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F304.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F304.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F304.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F305.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F305.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F305.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F305.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F306.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F306.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F306.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F306.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F307.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F307.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F307.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F307.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F308.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F308.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F308.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F308.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F309.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F309.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F309.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F309.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F30F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F30F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F310.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F310.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F310.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F310.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F311.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F311.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F311.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F311.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F312.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F312.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F312.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F312.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F313.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F313.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F313.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F313.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F314.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F314.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F314.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F314.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F315.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F315.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F315.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F315.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F316.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F316.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F316.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F316.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F317.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F317.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F317.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F317.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F318.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F318.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F318.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F318.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F319.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F319.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F319.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F319.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F31F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F31F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F320.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F320.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F320.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F320.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F330.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F330.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F330.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F330.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F331.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F331.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F331.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F331.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F332.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F332.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F332.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F332.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F333.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F333.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F333.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F333.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F334.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F334.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F334.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F334.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F335.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F335.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F335.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F335.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F337.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F337.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F337.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F337.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F338.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F338.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F338.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F338.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F339.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F339.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F339.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F339.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F33F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F33F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F340.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F340.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F340.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F340.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F341.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F341.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F341.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F341.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F342.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F342.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F342.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F342.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F343.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F343.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F343.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F343.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F344.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F344.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F344.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F344.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F345.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F345.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F345.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F345.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F346.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F346.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F346.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F346.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F347.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F347.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F347.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F347.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F348.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F348.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F348.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F348.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F349.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F349.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F349.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F349.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F34F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F34F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F350.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F350.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F350.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F350.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F351.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F351.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F351.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F351.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F352.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F352.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F352.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F352.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F353.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F353.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F353.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F353.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F354.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F354.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F354.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F354.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F355.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F355.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F355.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F355.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F356.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F356.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F356.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F356.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F357.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F357.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F357.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F357.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F358.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F358.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F358.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F358.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F359.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F359.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F359.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F359.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F35F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F35F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F360.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F360.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F360.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F360.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F361.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F361.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F361.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F361.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F362.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F362.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F362.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F362.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F363.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F363.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F363.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F363.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F364.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F364.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F364.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F364.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F365.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F365.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F365.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F365.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F366.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F366.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F366.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F366.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F367.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F367.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F367.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F367.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F368.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F368.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F368.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F368.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F369.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F369.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F369.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F369.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F36F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F36F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F370.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F370.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F370.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F370.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F371.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F371.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F371.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F371.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F372.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F372.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F372.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F372.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F373.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F373.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F373.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F373.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F374.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F374.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F374.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F374.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F375.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F375.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F375.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F375.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F376.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F376.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F376.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F376.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F377.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F377.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F377.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F377.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F378.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F378.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F378.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F378.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F379.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F379.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F379.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F379.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F37A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F37A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F37A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F37A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F37B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F37B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F37B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F37B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F37C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F37C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F37C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F37C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F380.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F380.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F380.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F380.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F381.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F381.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F381.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F381.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F382.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F382.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F382.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F382.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F383.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F383.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F383.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F383.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F384.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F384.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F384.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F384.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F385.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F385.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F385.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F385.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F386.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F386.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F386.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F386.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F387.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F387.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F387.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F387.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F388.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F388.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F388.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F388.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F389.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F389.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F389.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F389.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F38F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F38F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F390.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F390.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F390.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F390.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F391.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F391.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F391.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F391.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F392.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F392.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F392.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F392.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F393.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F393.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F393.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F393.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3A9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3A9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3AF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3AF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3B9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3B9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3BF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3BF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3C9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3C9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3CA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3CA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3CA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3CA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3EF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3EF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F3F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F3F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F400.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F400.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F400.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F400.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F401.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F401.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F401.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F401.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F402.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F402.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F402.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F402.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F403.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F403.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F403.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F403.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F404.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F404.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F404.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F404.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F405.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F405.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F405.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F405.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F406.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F406.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F406.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F406.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F407.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F407.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F407.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F407.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F408.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F408.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F408.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F408.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F409.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F409.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F409.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F409.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F40F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F40F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F410.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F410.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F410.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F410.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F411.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F411.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F411.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F411.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F412.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F412.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F412.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F412.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F413.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F413.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F413.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F413.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F414.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F414.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F414.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F414.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F415.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F415.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F415.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F415.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F416.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F416.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F416.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F416.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F417.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F417.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F417.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F417.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F418.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F418.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F418.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F418.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F419.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F419.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F419.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F419.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F41F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F41F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F420.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F420.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F420.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F420.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F421.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F421.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F421.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F421.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F422.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F422.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F422.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F422.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F423.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F423.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F423.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F423.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F424.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F424.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F424.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F424.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F425.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F425.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F425.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F425.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F426.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F426.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F426.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F426.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F427.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F427.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F427.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F427.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F428.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F428.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F428.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F428.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F429.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F429.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F429.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F429.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F42F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F42F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F430.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F430.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F430.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F430.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F431.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F431.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F431.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F431.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F432.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F432.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F432.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F432.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F433.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F433.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F433.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F433.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F434.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F434.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F434.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F434.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F435.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F435.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F435.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F435.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F436.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F436.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F436.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F436.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F437.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F437.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F437.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F437.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F438.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F438.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F438.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F438.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F439.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F439.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F439.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F439.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F43E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F43E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F440.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F440.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F440.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F440.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F442.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F442.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F442.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F442.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F443.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F443.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F443.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F443.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F444.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F444.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F444.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F444.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F445.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F445.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F445.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F445.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F446.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F446.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F446.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F446.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F447.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F447.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F447.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F447.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F448.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F448.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F448.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F448.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F449.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F449.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F449.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F449.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F44F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F44F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F450.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F450.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F450.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F450.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F451.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F451.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F451.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F451.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F452.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F452.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F452.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F452.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F453.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F453.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F453.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F453.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F454.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F454.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F454.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F454.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F455.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F455.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F455.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F455.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F456.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F456.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F456.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F456.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F457.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F457.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F457.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F457.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F458.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F458.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F458.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F458.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F459.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F459.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F459.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F459.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F45F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F45F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F460.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F460.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F460.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F460.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F461.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F461.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F461.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F461.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F462.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F462.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F462.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F462.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F463.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F463.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F463.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F463.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F464.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F464.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F464.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F464.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F465.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F465.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F465.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F465.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F466.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F466.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F466.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F466.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F467.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F467.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F467.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F467.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F468.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F468.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F468.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F468.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F469.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F469.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F469.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F469.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F46F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F46F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F470.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F470.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F470.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F470.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F471.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F471.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F471.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F471.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F472.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F472.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F472.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F472.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F473.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F473.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F473.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F473.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F474.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F474.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F474.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F474.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F475.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F475.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F475.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F475.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F476.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F476.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F476.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F476.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F477.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F477.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F477.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F477.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F478.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F478.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F478.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F478.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F479.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F479.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F479.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F479.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F47F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F47F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F480.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F480.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F480.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F480.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F481.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F481.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F481.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F481.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F482.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F482.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F482.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F482.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F483.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F483.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F483.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F483.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F484.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F484.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F484.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F484.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F485.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F485.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F485.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F485.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F486.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F486.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F486.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F486.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F487.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F487.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F487.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F487.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F488.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F488.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F488.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F488.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F489.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F489.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F489.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F489.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F48F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F48F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F490.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F490.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F490.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F490.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F491.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F491.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F491.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F491.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F492.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F492.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F492.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F492.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F493.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F493.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F493.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F493.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F494.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F494.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F494.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F494.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F495.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F495.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F495.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F495.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F496.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F496.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F496.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F496.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F497.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F497.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F497.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F497.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F498.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F498.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F498.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F498.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F499.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F499.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F499.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F499.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F49F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F49F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4A9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4A9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4AF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4AF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4B9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4B9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4BF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4BF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4C9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4C9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4CF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4CF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4D9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4D9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4DF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4DF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4ED.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4ED.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4ED.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4ED.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4EF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4EF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4F9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4F9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F4FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F4FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F500.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F500.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F500.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F500.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F501.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F501.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F501.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F501.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F502.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F502.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F502.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F502.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F503.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F503.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F503.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F503.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F504.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F504.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F504.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F504.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F505.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F505.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F505.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F505.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F506.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F506.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F506.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F506.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F507.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F507.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F507.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F507.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F508.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F508.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F508.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F508.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F509.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F509.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F509.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F509.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F50F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F50F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F510.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F510.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F510.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F510.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F511.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F511.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F511.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F511.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F512.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F512.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F512.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F512.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F513.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F513.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F513.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F513.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F514.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F514.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F514.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F514.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F515.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F515.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F515.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F515.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F516.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F516.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F516.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F516.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F517.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F517.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F517.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F517.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F518.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F518.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F518.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F518.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F519.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F519.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F519.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F519.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F51F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F51F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F520.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F520.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F520.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F520.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F521.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F521.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F521.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F521.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F522.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F522.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F522.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F522.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F523.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F523.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F523.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F523.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F524.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F524.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F524.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F524.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F525.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F525.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F525.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F525.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F526.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F526.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F526.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F526.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F527.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F527.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F527.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F527.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F528.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F528.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F528.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F528.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F529.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F529.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F529.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F529.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F52F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F52F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F530.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F530.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F530.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F530.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F531.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F531.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F531.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F531.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F532.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F532.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F532.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F532.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F533.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F533.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F533.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F533.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F534.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F534.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F534.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F534.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F535.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F535.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F535.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F535.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F536.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F536.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F536.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F536.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F537.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F537.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F537.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F537.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F538.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F538.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F538.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F538.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F539.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F539.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F539.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F539.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F53D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F53D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F550.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F550.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F550.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F550.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F551.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F551.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F551.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F551.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F552.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F552.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F552.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F552.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F553.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F553.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F553.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F553.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F554.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F554.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F554.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F554.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F555.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F555.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F555.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F555.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F556.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F556.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F556.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F556.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F557.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F557.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F557.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F557.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F558.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F558.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F558.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F558.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F559.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F559.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F559.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F559.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F55F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F55F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F560.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F560.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F560.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F560.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F561.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F561.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F561.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F561.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F562.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F562.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F562.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F562.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F563.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F563.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F563.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F563.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F564.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F564.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F564.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F564.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F565.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F565.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F565.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F565.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F566.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F566.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F566.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F566.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F567.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F567.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F567.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F567.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F5FF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F5FF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F600.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F600.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F600.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F600.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F601.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F601.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F601.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F601.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F602.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F602.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F602.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F602.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F603.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F603.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F603.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F603.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F604.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F604.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F604.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F604.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F605.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F605.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F605.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F605.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F606.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F606.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F606.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F606.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F607.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F607.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F607.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F607.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F608.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F608.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F608.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F608.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F609.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F609.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F609.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F609.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F60F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F60F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F610.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F610.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F610.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F610.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F611.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F611.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F611.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F611.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F612.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F612.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F612.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F612.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F613.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F613.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F613.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F613.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F614.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F614.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F614.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F614.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F615.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F615.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F615.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F615.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F616.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F616.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F616.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F616.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F617.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F617.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F617.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F617.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F618.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F618.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F618.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F618.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F619.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F619.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F619.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F619.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F61F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F61F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F620.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F620.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F620.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F620.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F621.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F621.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F621.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F621.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F622.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F622.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F622.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F622.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F623.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F623.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F623.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F623.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F624.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F624.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F624.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F624.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F625.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F625.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F625.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F625.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F626.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F626.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F626.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F626.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F627.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F627.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F627.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F627.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F628.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F628.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F628.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F628.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F629.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F629.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F629.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F629.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F62F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F62F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F630.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F630.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F630.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F630.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F631.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F631.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F631.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F631.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F632.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F632.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F632.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F632.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F633.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F633.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F633.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F633.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F634.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F634.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F634.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F634.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F635.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F635.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F635.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F635.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F636.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F636.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F636.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F636.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F637.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F637.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F637.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F637.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F638.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F638.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F638.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F638.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F639.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F639.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F639.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F639.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F63F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F63F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F640.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F640.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F640.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F640.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F645.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F645.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F645.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F645.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F646.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F646.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F646.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F646.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F647.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F647.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F647.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F647.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F648.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F648.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F648.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F648.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F649.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F649.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F649.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F649.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F64F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F64F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F680.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F680.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F680.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F680.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F681.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F681.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F681.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F681.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F682.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F682.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F682.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F682.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F683.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F683.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F683.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F683.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F684.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F684.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F684.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F684.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F685.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F685.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F685.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F685.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F686.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F686.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F686.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F686.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F687.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F687.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F687.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F687.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F688.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F688.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F688.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F688.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F689.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F689.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F689.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F689.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F68F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F68F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F690.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F690.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F690.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F690.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F691.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F691.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F691.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F691.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F692.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F692.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F692.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F692.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F693.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F693.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F693.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F693.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F694.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F694.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F694.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F694.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F695.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F695.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F695.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F695.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F696.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F696.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F696.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F696.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F697.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F697.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F697.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F697.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F698.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F698.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F698.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F698.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F699.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F699.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F699.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F699.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F69F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F69F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6A9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6A9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6AF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6AF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B7.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B7.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B7.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B7.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B8.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B8.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B8.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B8.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6B9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6B9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6BF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6BF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/1F6C5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/1F6C5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/203C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/203C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/203C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/203C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2049.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2049.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2049.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2049.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2122.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2122.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2122.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2122.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2139.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2139.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2139.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2139.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2194.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2194.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2194.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2194.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2195.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2195.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2195.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2195.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2196.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2196.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2196.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2196.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2197.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2197.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2197.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2197.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2198.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2198.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2198.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2198.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2199.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2199.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2199.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2199.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/21A9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/21A9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/21A9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/21A9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/21AA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/21AA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/21AA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/21AA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/231A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/231A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/231A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/231A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/231B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/231B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/231B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/231B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23E9.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23E9.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23E9.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23E9.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23EB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23EB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23EB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23EB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23EC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23EC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23EC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23EC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23F0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23F0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23F0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23F0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/23F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/23F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/24C2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/24C2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/24C2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/24C2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25AA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25AA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25AA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25AA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25AB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25AB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25AB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25AB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25B6.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25B6.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25B6.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25B6.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25C0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25C0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25C0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25C0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FC.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FC.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FC.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FC.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/25FE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/25FE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2600.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2600.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2600.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2600.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2601.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2601.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2601.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2601.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/260E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/260E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/260E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/260E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2611.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2611.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2611.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2611.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2614.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2614.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2614.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2614.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2615.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2615.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2615.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2615.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/261D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/261D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/261D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/261D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/263A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/263A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/263A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/263A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2648.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2648.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2648.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2648.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2649.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2649.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2649.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2649.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/264F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/264F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2650.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2650.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2650.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2650.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2651.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2651.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2651.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2651.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2652.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2652.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2652.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2652.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2653.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2653.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2653.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2653.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2660.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2660.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2660.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2660.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2663.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2663.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2663.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2663.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2665.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2665.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2665.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2665.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2666.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2666.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2666.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2666.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2668.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2668.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2668.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2668.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/267B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/267B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/267B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/267B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/267F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/267F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/267F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/267F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2693.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2693.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2693.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2693.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26A0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26A0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26A0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26A0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26A1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26A1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26A1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26A1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26AA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26AA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26AA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26AA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26AB.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26AB.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26AB.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26AB.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26BD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26BD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26BD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26BD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26BE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26BE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26BE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26BE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26C4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26C4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26C4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26C4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26C5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26C5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26C5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26C5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26CE.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26CE.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26CE.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26CE.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26D4.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26D4.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26D4.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26D4.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26EA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26EA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26EA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26EA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26F2.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26F2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26F2.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26F2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26F3.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26F3.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26F3.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26F3.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26F5.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26F5.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26F5.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26F5.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26FA.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26FA.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26FA.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26FA.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26FD.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26FD.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/26FD.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/26FD.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2702.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2702.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2702.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2702.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2705.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2705.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2705.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2705.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2708.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2708.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2708.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2708.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2709.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2709.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2709.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2709.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270A.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270A.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270A.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270A.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270F.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270F.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/270F.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/270F.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2712.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2712.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2712.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2712.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2714.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2714.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2714.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2714.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2716.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2716.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2716.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2716.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2728.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2728.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2728.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2728.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2733.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2733.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2733.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2733.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2734.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2734.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2734.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2734.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2744.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2744.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2744.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2744.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2747.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2747.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2747.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2747.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/274C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/274C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/274C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/274C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/274E.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/274E.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/274E.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/274E.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2753.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2753.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2753.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2753.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2754.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2754.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2754.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2754.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2755.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2755.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2755.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2755.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2757.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2757.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2757.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2757.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2764.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2764.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2764.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2764.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2795.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2795.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2795.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2795.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2796.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2796.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2796.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2796.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2797.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2797.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2797.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2797.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/27A1.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/27A1.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/27A1.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/27A1.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/27B0.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/27B0.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/27B0.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/27B0.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/27BF.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/27BF.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/27BF.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/27BF.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2934.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2934.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2934.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2934.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2935.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2935.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2935.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2935.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B05.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B05.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B05.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B05.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B06.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B06.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B06.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B06.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B07.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B07.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B07.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B07.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B1B.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B1B.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B1B.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B1B.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B1C.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B1C.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B1C.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B1C.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B50.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B50.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B50.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B50.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B55.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B55.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/2B55.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/2B55.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/3030.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/3030.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/3030.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/3030.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/303D.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/303D.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/303D.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/303D.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/3297.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/3297.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/3297.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/3297.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/3299.png b/web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/3299.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/emoji/icon/3299.png rename to web/src/main/java/io/onedev/server/web/component/markdown/emoji/icon/3299.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/hgrabber.png b/web/src/main/java/io/onedev/server/web/component/markdown/hgrabber.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/hgrabber.png rename to web/src/main/java/io/onedev/server/web/component/markdown/hgrabber.png diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/markdown/markdown.css rename to web/src/main/java/io/onedev/server/web/component/markdown/markdown.css diff --git a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.js similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js rename to web/src/main/java/io/onedev/server/web/component/markdown/markdown.js index f4903e568b..50af2581e7 100644 --- a/web/src/main/java/com/turbodev/server/web/component/markdown/markdown.js +++ b/web/src/main/java/io/onedev/server/web/component/markdown/markdown.js @@ -1,4 +1,4 @@ -turbodev.server.markdown = { +onedev.server.markdown = { getCookiePrefix: function($container) { if ($container.hasClass("compact-mode")) return "markdownEditor.compactMode"; @@ -65,7 +65,7 @@ turbodev.server.markdown = { $previewLink.removeClass("active"); $splitLink.removeClass("active"); onLayoutChange(); - Cookies.set(turbodev.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity}); + Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".split", false, {expires: Infinity}); }); $previewLink.click(function() { $container.removeClass("edit-mode").removeClass("split-mode").addClass("preview-mode"); @@ -102,7 +102,7 @@ turbodev.server.markdown = { $splitLink.addClass("active"); onLayoutChange(); callback("render", $input.val()); - Cookies.set(turbodev.server.markdown.getCookiePrefix($container)+".split", true, {expires: Infinity}); + Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".split", true, {expires: Infinity}); }); function onLayoutChange() { @@ -119,7 +119,7 @@ turbodev.server.markdown = { * in case an ajax call is ongoing we postpone the render * as the ongoing call may alter the component layout */ - if (turbodev.server.ajaxRequests.count != 0) { + if (onedev.server.ajaxRequests.count != 0) { setTimeout(render, 10); } else if ($preview.is(":visible")) { callback("render", $input.val()); @@ -138,13 +138,13 @@ turbodev.server.markdown = { $input.doneEvents("keydown", function(e) { if (e.keyCode>=33 && e.keyCode<=40 && $preview.is(":visible")) { // Only sync preview scroll when we moved cursor - turbodev.server.markdown.syncPreviewScroll(containerId); + onedev.server.markdown.syncPreviewScroll(containerId); } }, 500); $input.doneEvents("click focus", function(e) { if ($preview.is(":visible")) { - turbodev.server.markdown.syncPreviewScroll(containerId); + onedev.server.markdown.syncPreviewScroll(containerId); } }, 500); @@ -261,7 +261,7 @@ turbodev.server.markdown = { $input.scrollTop(caretBottom - $input.height()); } - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); } }); @@ -274,7 +274,7 @@ turbodev.server.markdown = { * change the directory structure of the file being edited as well, hence * affect the relative path rendering */ - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $edit.resizable({ @@ -289,10 +289,10 @@ turbodev.server.markdown = { } }, stop: function(e, ui) { - Cookies.set(turbodev.server.markdown.getCookiePrefix($container)+".inputHeight", + Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".inputHeight", $input.outerHeight(), {expires: Infinity}); if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) { - Cookies.set(turbodev.server.markdown.getCookiePrefix($container)+".renderedHeight", + Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".renderedHeight", $rendered.outerHeight(), {expires: Infinity}); } } @@ -309,10 +309,10 @@ turbodev.server.markdown = { } }, stop: function(e, ui) { - Cookies.set(turbodev.server.markdown.getCookiePrefix($container)+".renderedHeight", + Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".renderedHeight", $rendered.outerHeight(), {expires: Infinity}); if ($container.hasClass("normal-mode") && $container.hasClass("split-mode")) { - Cookies.set(turbodev.server.markdown.getCookiePrefix($container)+".inputHeight", + Cookies.set(onedev.server.markdown.getCookiePrefix($container)+".inputHeight", $input.outerHeight(), {expires: Infinity}); } } @@ -320,12 +320,12 @@ turbodev.server.markdown = { $warning.on("closed.bs.alert", function () { if (!$resizeHandles.is(":visible")) - turbodev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); + onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); }) $container.on("autofit", function(e, width, height) { $resizeHandles.hide(); - turbodev.server.markdown.autofit(containerId, width, height); + onedev.server.markdown.autofit(containerId, width, height); }); $head.find(".do-bold").click(function() { @@ -336,7 +336,7 @@ turbodev.server.markdown = { $input.range("**strong text**").range(selected.start+2, selected.end+2+"strong text".length); } $input.focus(); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-italic").click(function() { @@ -347,7 +347,7 @@ turbodev.server.markdown = { $input.range("_emphasized text_").range(selected.start+1, selected.end+1+"emphasized text".length); } $input.focus(); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-header").click(function() { @@ -358,7 +358,7 @@ turbodev.server.markdown = { $input.range("### heading text").range(selected.start+4, selected.end+4+"heading text".length); } $input.focus(); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-list, .do-orderlist, .do-tasklist").click(function() { @@ -388,7 +388,7 @@ turbodev.server.markdown = { $input.range(leading + text).range(selected.start+leading.length+1, selected.start+leading.length+1+text.length); } $input.focus(); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-code").click(function() { @@ -400,7 +400,7 @@ turbodev.server.markdown = { $input.range("\n```" + langHint + "\ncode text here\n```\n").range(selected.start+4, selected.start+4+langHint.length); } $input.focus(); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-quote").click(function() { @@ -410,7 +410,7 @@ turbodev.server.markdown = { else $input.range("> quote here").range(selected.start+2, selected.start+2+"quote here".length); $input.focus(); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-emoji").click(function() { @@ -422,14 +422,14 @@ turbodev.server.markdown = { $emojis.toggle(); $head.find(".do-emoji").toggleClass("active"); if (!$resizeHandles.is(":visible")) - turbodev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); + onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); }); $head.find(".do-help").click(function() { $(this).toggleClass("active"); $help.toggle(); if (!$resizeHandles.is(":visible")) - turbodev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); + onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); }); function getReplacement() { @@ -459,7 +459,7 @@ turbodev.server.markdown = { if ($resizeHandles.is(":visible")) { $container.css("width", "inherit").css("height", "inherit"); - turbodev.server.markdown.restoreSizeFromCookie($container); + onedev.server.markdown.restoreSizeFromCookie($container); } else { $(window).resize(); } @@ -486,7 +486,7 @@ turbodev.server.markdown = { $(window).resize(function() { if ($container.hasClass("fullscreen")) { - turbodev.server.markdown.autofit(containerId, $(window).width(), $(window).height()); + onedev.server.markdown.autofit(containerId, $(window).width(), $(window).height()); } }); @@ -511,7 +511,7 @@ turbodev.server.markdown = { $input.caret(" " + atChar); } $input.atwho("run"); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); $head.find(".do-image, .do-link").click(function() { @@ -629,7 +629,7 @@ turbodev.server.markdown = { function uploadFile(file) { if (file.size> attachmentMaxSize) { var message = "!!Upload should be less than " + Math.round(attachmentMaxSize/1024/1024) + " Mb!!"; - turbodev.server.markdown.updateUploadMessage($input, message); + onedev.server.markdown.updateUploadMessage($input, message); } else { var xhr = new XMLHttpRequest(); var val = $input.val(); @@ -651,12 +651,12 @@ turbodev.server.markdown = { if (xhr.status == 200) { callback("insertUrl", xhr.responseText, xhr.replaceMessage); } else { - turbodev.server.markdown.updateUploadMessage($input, + onedev.server.markdown.updateUploadMessage($input, "!!" + xhr.responseText + "!!", xhr.replaceMessage); } }; xhr.onerror = function() { - turbodev.server.markdown.updateUploadMessage($input, + onedev.server.markdown.updateUploadMessage($input, "!!Unable to connect to server!!", xhr.replaceMessage); }; xhr.open("POST", "/attachment_upload", true); @@ -745,14 +745,14 @@ turbodev.server.markdown = { var $preview = $body.children(".preview"); var $rendered = $preview.children(".markdown-rendered"); - var inputHeight = Cookies.get(turbodev.server.markdown.getCookiePrefix($container)+".inputHeight"); + var inputHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".inputHeight"); if (inputHeight) { $input.outerHeight(parseInt(inputHeight)); } else { $input.outerHeight(100); } $edit.outerHeight($input.outerHeight()); - var renderedHeight = Cookies.get(turbodev.server.markdown.getCookiePrefix($container)+".renderedHeight"); + var renderedHeight = Cookies.get(onedev.server.markdown.getCookiePrefix($container)+".renderedHeight"); if (renderedHeight) { $rendered.outerHeight(parseInt(renderedHeight)); } else { @@ -770,19 +770,19 @@ turbodev.server.markdown = { var $resizeHandles = $container.find(".ui-resizable-handle"); if ($resizeHandles.is(":visible")) { - turbodev.server.markdown.restoreSizeFromCookie($container); + onedev.server.markdown.restoreSizeFromCookie($container); } var autosaveKey = $container.data("autosaveKey"); if (autosaveKey) { - turbodev.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey); + onedev.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey); var autosaveValue = localStorage.getItem(autosaveKey); if (autosaveValue) { $input.val(autosaveValue); $warning.show(); if (!$resizeHandles.is(":visible")) - turbodev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); + onedev.server.markdown.fireInputEvent($input); } } }, @@ -801,7 +801,7 @@ turbodev.server.markdown = { }); $rendered.html(html); - turbodev.server.markdown.initRendered($rendered); + onedev.server.markdown.initRendered($rendered); // Avoid loading existing image $rendered.find("img").each(function() { @@ -816,15 +816,15 @@ turbodev.server.markdown = { } }); - turbodev.server.markdown.syncPreviewScroll(containerId); + onedev.server.markdown.syncPreviewScroll(containerId); $rendered.find("img").on("load", function() { - turbodev.server.markdown.syncPreviewScroll(containerId); + onedev.server.markdown.syncPreviewScroll(containerId); }); }, initRendered: function($rendered) { - turbodev.server.highlight($rendered); + onedev.server.highlight($rendered); $rendered.find("span.header-anchor").parent().addClass("header-anchor"); $rendered.find("a.header-anchor").each(function() { @@ -833,7 +833,7 @@ turbodev.server.markdown = { }); $rendered.find("a").click(function() { - turbodev.server.viewState.getFromViewAndSetToHistory(); + onedev.server.viewState.getFromViewAndSetToHistory(); }); $rendered.find("img").each(function() { @@ -887,7 +887,7 @@ turbodev.server.markdown = { }); } - turbodev.server.markdown.initRendered($container.find(".markdown-rendered")); + onedev.server.markdown.initRendered($container.find(".markdown-rendered")); }, onEmojisLoaded: function(containerId, emojis) { var $container = $("#" + containerId); @@ -911,10 +911,10 @@ turbodev.server.markdown = { return; $input.caret(":" + $(this).attr("title") + ": "); - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }); if (!$resizeHandles.is(":visible")) - turbodev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); + onedev.server.markdown.autofit(containerId, $container.outerWidth(), $container.outerHeight()); }, insertUrl: function(containerId, isImage, url, name, replaceMessage) { var $head = $("#" + containerId + ">.head"); @@ -932,14 +932,14 @@ turbodev.server.markdown = { if (isImage) message = "!" + message; - turbodev.server.markdown.updateUploadMessage($input, message, replaceMessage); + onedev.server.markdown.updateUploadMessage($input, message, replaceMessage); if (!name) { var offset = isImage?2:1; $input.range($input.caret()-message.length+offset, $input.caret()-message.length+defaultDescription.length+offset); } - turbodev.server.markdown.fireInputEvent($input); + onedev.server.markdown.fireInputEvent($input); }, updateUploadMessage: function($input, message, replaceMessage) { var isError = message.indexOf("!!") == 0; @@ -973,7 +973,7 @@ turbodev.server.markdown = { var $url = $container.find(".url"); var $text = $container.find(".text"); $url.on("input", function() { - $text.attr("placeholder", turbodev.server.util.describeUrl($url.val())); + $text.attr("placeholder", onedev.server.util.describeUrl($url.val())); }); } diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.java b/web/src/main/java/io/onedev/server/web/component/menu/MenuItem.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.java rename to web/src/main/java/io/onedev/server/web/component/menu/MenuItem.java index f41687d1a5..7966768a1c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/menu/MenuItem.java +++ b/web/src/main/java/io/onedev/server/web/component/menu/MenuItem.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.menu; +package io.onedev.server.web.component.menu; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/MenuLink.java b/web/src/main/java/io/onedev/server/web/component/menu/MenuLink.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/menu/MenuLink.java rename to web/src/main/java/io/onedev/server/web/component/menu/MenuLink.java index 19b6e02ff3..4f04e8c16a 100644 --- a/web/src/main/java/com/turbodev/server/web/component/menu/MenuLink.java +++ b/web/src/main/java/io/onedev/server/web/component/menu/MenuLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.menu; +package io.onedev.server.web.component.menu; import java.util.List; @@ -7,9 +7,9 @@ import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; -import com.turbodev.server.web.component.floating.AlignPlacement; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.floating.AlignPlacement; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; @SuppressWarnings("serial") public abstract class MenuLink extends DropdownLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/MenuPanel.html b/web/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/menu/MenuPanel.html rename to web/src/main/java/io/onedev/server/web/component/menu/MenuPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/MenuPanel.java b/web/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/menu/MenuPanel.java rename to web/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java index 4ca073c738..4b330c8a11 100644 --- a/web/src/main/java/com/turbodev/server/web/component/menu/MenuPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/menu/MenuPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.menu; +package io.onedev.server.web.component.menu; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/MenuResourceReference.java b/web/src/main/java/io/onedev/server/web/component/menu/MenuResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/menu/MenuResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/menu/MenuResourceReference.java index 9cb9585127..437beb5756 100644 --- a/web/src/main/java/com/turbodev/server/web/component/menu/MenuResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/menu/MenuResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.menu; +package io.onedev.server.web.component.menu; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/menu/menu.css b/web/src/main/java/io/onedev/server/web/component/menu/menu.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/menu/menu.css rename to web/src/main/java/io/onedev/server/web/component/menu/menu.css diff --git a/web/src/main/java/com/turbodev/server/web/component/modal/ModalLink.java b/web/src/main/java/io/onedev/server/web/component/modal/ModalLink.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/modal/ModalLink.java rename to web/src/main/java/io/onedev/server/web/component/modal/ModalLink.java index 37d595f6d3..c069db70ab 100644 --- a/web/src/main/java/com/turbodev/server/web/component/modal/ModalLink.java +++ b/web/src/main/java/io/onedev/server/web/component/modal/ModalLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.modal; +package io.onedev.server.web.component.modal; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; diff --git a/web/src/main/java/com/turbodev/server/web/component/modal/ModalPanel.html b/web/src/main/java/io/onedev/server/web/component/modal/ModalPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/modal/ModalPanel.html rename to web/src/main/java/io/onedev/server/web/component/modal/ModalPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/modal/ModalPanel.java b/web/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/modal/ModalPanel.java rename to web/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java index 2aca351c89..30f38397e0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/modal/ModalPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.modal; +package io.onedev.server.web.component.modal; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -10,8 +10,8 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public abstract class ModalPanel extends Panel { @@ -65,7 +65,7 @@ public abstract class ModalPanel extends Panel { response.render(JavaScriptHeaderItem.forReference(new ModalResourceReference())); - String script = String.format("turbodev.server.modal.onDomReady('%s', %s);", + String script = String.format("onedev.server.modal.onDomReady('%s', %s);", getMarkupId(true), getCallbackFunction()); response.render(OnDomReadyHeaderItem.forScript(script)); } @@ -86,7 +86,7 @@ public abstract class ModalPanel extends Panel { AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class); if (target != null) { - String script = String.format("turbodev.server.modal.close($('#%s'), false);", getMarkupId(true)); + String script = String.format("onedev.server.modal.close($('#%s'), false);", getMarkupId(true)); target.appendJavaScript(script); } remove(); diff --git a/web/src/main/java/com/turbodev/server/web/component/modal/ModalResourceReference.java b/web/src/main/java/io/onedev/server/web/component/modal/ModalResourceReference.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/component/modal/ModalResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/modal/ModalResourceReference.java index cfdba869ce..6d592b0c09 100644 --- a/web/src/main/java/com/turbodev/server/web/component/modal/ModalResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/modal/ModalResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.modal; +package io.onedev.server.web.component.modal; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ModalResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/modal/modal.js b/web/src/main/java/io/onedev/server/web/component/modal/modal.js similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/modal/modal.js rename to web/src/main/java/io/onedev/server/web/component/modal/modal.js index ddb4b49715..00fc47c3e2 100644 --- a/web/src/main/java/com/turbodev/server/web/component/modal/modal.js +++ b/web/src/main/java/io/onedev/server/web/component/modal/modal.js @@ -1,4 +1,4 @@ -turbodev.server.modal = { +onedev.server.modal = { onDomReady: function(containerId, closeCallback) { var $modal = $("#" + containerId); $modal.data("closeCallback", closeCallback); @@ -9,7 +9,7 @@ turbodev.server.modal = { && $("body>.floating").length == 0 && $(".atwho-view:visible").length == 0 && $modal.nextAll(".modal").length == 0) { - turbodev.server.modal.close($modal, true); + onedev.server.modal.close($modal, true); } }); diff --git a/web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelector.html b/web/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelector.html rename to web/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.html diff --git a/web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelector.java b/web/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelector.java rename to web/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java index 5ede5163f0..8703859e02 100644 --- a/web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelector.java +++ b/web/src/main/java/io/onedev/server/web/component/pathselector/PathSelector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.pathselector; +package io.onedev.server.web.component.pathselector; import java.io.IOException; import java.util.ArrayList; @@ -28,11 +28,11 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.BlobIcon; -import com.turbodev.server.web.component.link.PreventDefaultAjaxLink; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.BlobIcon; +import io.onedev.server.web.component.link.PreventDefaultAjaxLink; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public abstract class PathSelector extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelectorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/pathselector/PathSelectorResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelectorResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/pathselector/PathSelectorResourceReference.java index 845161db2b..90e1a72180 100644 --- a/web/src/main/java/com/turbodev/server/web/component/pathselector/PathSelectorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/pathselector/PathSelectorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.pathselector; +package io.onedev.server.web.component.pathselector; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/pathselector/path-selector.css b/web/src/main/java/io/onedev/server/web/component/pathselector/path-selector.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/pathselector/path-selector.css rename to web/src/main/java/io/onedev/server/web/component/pathselector/path-selector.css diff --git a/web/src/main/java/com/turbodev/server/web/component/projectchoice/AbstractProjectChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/projectchoice/AbstractProjectChoiceProvider.java similarity index 71% rename from web/src/main/java/com/turbodev/server/web/component/projectchoice/AbstractProjectChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/projectchoice/AbstractProjectChoiceProvider.java index 175b56e0fd..b025b14921 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectchoice/AbstractProjectChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/projectchoice/AbstractProjectChoiceProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.projectchoice; +package io.onedev.server.web.component.projectchoice; import java.util.Collection; import java.util.List; @@ -8,10 +8,11 @@ import org.json.JSONException; import org.json.JSONWriter; import com.google.common.collect.Lists; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.web.component.select2.ChoiceProvider; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.web.component.select2.ChoiceProvider; @SuppressWarnings("serial") public abstract class AbstractProjectChoiceProvider extends ChoiceProvider { @@ -26,7 +27,7 @@ public abstract class AbstractProjectChoiceProvider extends ChoiceProvider toChoices(Collection ids) { List list = Lists.newArrayList(); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); for (String each : ids) { Long id = Long.valueOf(each); list.add(cacheManager.getProject(id)); diff --git a/web/src/main/java/com/turbodev/server/web/component/projectchoice/ProjectChoiceResourceReference.java b/web/src/main/java/io/onedev/server/web/component/projectchoice/ProjectChoiceResourceReference.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/component/projectchoice/ProjectChoiceResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/projectchoice/ProjectChoiceResourceReference.java index 2839f9e6cf..961553855f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectchoice/ProjectChoiceResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/projectchoice/ProjectChoiceResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.projectchoice; +package io.onedev.server.web.component.projectchoice; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ProjectChoiceResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/projectchoice/project-choice.js b/web/src/main/java/io/onedev/server/web/component/projectchoice/project-choice.js similarity index 80% rename from web/src/main/java/com/turbodev/server/web/component/projectchoice/project-choice.js rename to web/src/main/java/io/onedev/server/web/component/projectchoice/project-choice.js index 00188c762b..263caa482b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectchoice/project-choice.js +++ b/web/src/main/java/io/onedev/server/web/component/projectchoice/project-choice.js @@ -1,4 +1,4 @@ -turbodev.server.projectChoiceFormatter = { +onedev.server.projectChoiceFormatter = { formatSelection: function(project) { return project.name; }, diff --git a/web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListPanel.html b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListPanel.html rename to web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListPanel.java b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListPanel.java rename to web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java index 765ad15b50..8f17fadb57 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.projectlist; +package io.onedev.server.web.component.projectlist; import java.util.ArrayList; import java.util.Iterator; @@ -28,18 +28,18 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.revwalk.RevCommit; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.datatable.HistoryAwarePagingNavigator; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class ProjectListPanel extends Panel { @@ -67,7 +67,7 @@ public class ProjectListPanel extends Panel { public void populateItem(Item> cellItem, String componentId, IModel rowModel) { Fragment fragment = new Fragment(componentId, "projectFrag", ProjectListPanel.this); - Project project = TurboDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); + Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); Link link = new BookmarkablePageLink("link", ProjectBlobPage.class, ProjectBlobPage.paramsOf(project)); link.add(new Label("name", project.getName())); @@ -82,7 +82,7 @@ public class ProjectListPanel extends Panel { @Override public void populateItem(Item> cellItem, String componentId, IModel rowModel) { - Project project = TurboDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); + Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); RevCommit lastCommit = project.getLastCommit(); if (lastCommit != null) { Fragment fragment = new Fragment(componentId, "authorFrag", ProjectListPanel.this); @@ -101,7 +101,7 @@ public class ProjectListPanel extends Panel { @Override public void populateItem(Item> cellItem, String componentId, IModel rowModel) { - Project project = TurboDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); + Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); RevCommit lastCommit = project.getLastCommit(); if (lastCommit != null) { Fragment fragment = new Fragment(componentId, "commitMessageFrag", ProjectListPanel.this); @@ -122,7 +122,7 @@ public class ProjectListPanel extends Panel { @Override public void populateItem(Item> cellItem, String componentId, IModel rowModel) { - Project project = TurboDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); + Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject().getId()); RevCommit lastCommit = project.getLastCommit(); if (lastCommit != null) { cellItem.add(new Label(componentId, DateUtils.formatAge(lastCommit.getCommitterIdent().getWhen()))); diff --git a/web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListResourceReference.java b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListResourceReference.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListResourceReference.java index 9fdc32cac3..9b80a37d5f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectlist/ProjectListResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/projectlist/ProjectListResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.projectlist; +package io.onedev.server.web.component.projectlist; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class ProjectListResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/projectlist/project-list.css b/web/src/main/java/io/onedev/server/web/component/projectlist/project-list.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectlist/project-list.css rename to web/src/main/java/io/onedev/server/web/component/projectlist/project-list.css diff --git a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html rename to web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java rename to web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java index ba9d39d14a..6e857dc023 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegeselection/PrivilegeSelectionPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.projectprivilege.privilegeselection; +package io.onedev.server.web.component.projectprivilege.privilegeselection; import javax.annotation.Nullable; @@ -7,7 +7,7 @@ import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.security.ProjectPrivilege; +import io.onedev.server.security.ProjectPrivilege; @SuppressWarnings("serial") public abstract class PrivilegeSelectionPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java index f213ad6fca..ee729f3a45 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourceCssResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.projectprivilege.privilegesource; +package io.onedev.server.web.component.projectprivilege.privilegesource; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; @SuppressWarnings("serial") public class PrivilegeSourceCssResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html rename to web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java rename to web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java index e1735a0167..6e4f4d5680 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java +++ b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/PrivilegeSourcePanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.projectprivilege.privilegesource; +package io.onedev.server.web.component.projectprivilege.privilegesource; import java.util.ArrayList; import java.util.List; @@ -15,17 +15,17 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.GroupAuthorization; -import com.turbodev.server.model.Membership; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.web.page.group.GroupAuthorizationsPage; -import com.turbodev.server.web.page.group.GroupProfilePage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.GroupAuthorization; +import io.onedev.server.model.Membership; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.web.page.group.GroupAuthorizationsPage; +import io.onedev.server.web.page.group.GroupProfilePage; @SuppressWarnings("serial") public class PrivilegeSourcePanel extends Panel { @@ -44,7 +44,7 @@ public class PrivilegeSourcePanel extends Panel { @Override protected User load() { - return TurboDev.getInstance(UserManager.class).load(userId); + return OneDev.getInstance(UserManager.class).load(userId); } }; @@ -54,7 +54,7 @@ public class PrivilegeSourcePanel extends Panel { @Override protected Project load() { - return TurboDev.getInstance(ProjectManager.class).load(projectId); + return OneDev.getInstance(ProjectManager.class).load(projectId); } }; diff --git a/web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/privilege-source.css b/web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/privilege-source.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectprivilege/privilegesource/privilege-source.css rename to web/src/main/java/io/onedev/server/web/component/projectprivilege/privilegesource/privilege-source.css diff --git a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelector.html b/web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelector.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelector.html rename to web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelector.html diff --git a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelector.java b/web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelector.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelector.java rename to web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelector.java index c3ed48c73a..4657722800 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelector.java +++ b/web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.projectselector; +package io.onedev.server.web.component.projectselector; import java.util.Collection; import java.util.List; @@ -25,15 +25,15 @@ import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.InputChangeBehavior; -import com.turbodev.server.web.component.link.PreventDefaultAjaxLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.InputChangeBehavior; +import io.onedev.server.web.component.link.PreventDefaultAjaxLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public abstract class ProjectSelector extends Panel { @@ -99,14 +99,14 @@ public abstract class ProjectSelector extends Panel { protected void respond(AjaxRequestTarget target) { IRequestParameters params = RequestCycle.get().getRequest().getPostParameters(); Long id = params.getParameterValue("id").toLong(); - onSelect(target, TurboDev.getInstance(ProjectManager.class).load(id)); + onSelect(target, OneDev.getInstance(ProjectManager.class).load(id)); } @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); - String script = String.format("turbodev.server.projectSelector.init('%s', %s)", + String script = String.format("onedev.server.projectSelector.init('%s', %s)", searchField.getMarkupId(true), getCallbackFunction(CallbackParameter.explicit("id"))); response.render(OnDomReadyHeaderItem.forScript(script)); diff --git a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelectorResourceReference.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelectorResourceReference.java index 438fb4dfa3..765406ab58 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectselector/ProjectSelectorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/projectselector/ProjectSelectorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.projectselector; +package io.onedev.server.web.component.projectselector; 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.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ProjectSelectorResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/projectselector/project-selector.css b/web/src/main/java/io/onedev/server/web/component/projectselector/project-selector.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/projectselector/project-selector.css rename to web/src/main/java/io/onedev/server/web/component/projectselector/project-selector.css diff --git a/web/src/main/java/com/turbodev/server/web/component/projectselector/project-selector.js b/web/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/projectselector/project-selector.js rename to web/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js index 4ae733ba92..b8d359760e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/projectselector/project-selector.js +++ b/web/src/main/java/io/onedev/server/web/component/projectselector/project-selector.js @@ -1,4 +1,4 @@ -turbodev.server.projectSelector = { +onedev.server.projectSelector = { init: function(inputId, callback) { var $input = $("#" + inputId); diff --git a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerChoice.java b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerChoice.java similarity index 63% rename from web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerChoice.java rename to web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerChoice.java index 18466fc5d1..587545f8ce 100644 --- a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.requestreviewer; +package io.onedev.server.web.component.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.turbodev.server.TurboDev; -import com.turbodev.server.manager.ReviewInvitationManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.component.select2.SelectToAddChoice; -import com.turbodev.server.web.component.userchoice.UserChoiceResourceReference; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ReviewInvitationManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.component.select2.SelectToAddChoice; +import io.onedev.server.web.component.userchoice.UserChoiceResourceReference; @SuppressWarnings("serial") public abstract class ReviewerChoice extends SelectToAddChoice { @@ -32,9 +32,9 @@ public abstract class ReviewerChoice extends SelectToAddChoice { super.onInitialize(); getSettings().setPlaceholder("Select user to add as reviewer..."); - getSettings().setFormatResult("turbodev.server.userChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.userChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.userChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup"); } @Override @@ -64,7 +64,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice { if (invitation == null) { invitation = new ReviewInvitation(); invitation.setRequest(request); - invitation.setUser(TurboDev.getInstance(UserManager.class).load(user.getId())); + invitation.setUser(OneDev.getInstance(UserManager.class).load(user.getId())); request.getReviewInvitations().add(invitation); } invitation.setType(ReviewInvitation.Type.MANUAL); @@ -73,7 +73,7 @@ public abstract class ReviewerChoice extends SelectToAddChoice { request.clearQualityStatus(); if (!request.isNew()) - TurboDev.getInstance(ReviewInvitationManager.class).invite(invitation); + OneDev.getInstance(ReviewInvitationManager.class).invite(invitation); }; } diff --git a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListCssResourceReference.java b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListCssResourceReference.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListCssResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListCssResourceReference.java index 79c74a5ac2..86d1021112 100644 --- a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListCssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListCssResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.component.requestreviewer; +package io.onedev.server.web.component.requestreviewer; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class ReviewerListCssResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListPanel.html b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListPanel.html rename to web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListPanel.java b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListPanel.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListPanel.java rename to web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListPanel.java index afcc14bb51..919d1209cc 100644 --- a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerListPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerListPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.requestreviewer; +package io.onedev.server.web.component.requestreviewer; import java.util.ArrayList; import java.util.Collections; @@ -22,22 +22,22 @@ import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.manager.ReviewInvitationManager; -import com.turbodev.server.manager.ReviewManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.JsoupUtils; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.behavior.dropdown.DropdownHover; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.util.ajaxlistener.ConfirmListener; -import com.turbodev.server.web.websocket.PageDataChanged; +import io.onedev.server.OneDev; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.manager.ReviewInvitationManager; +import io.onedev.server.manager.ReviewManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.Review; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.JsoupUtils; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.behavior.dropdown.DropdownHover; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.util.ajaxlistener.ConfirmListener; +import io.onedev.server.web.websocket.PageDataChanged; @SuppressWarnings("serial") public class ReviewerListPanel extends GenericPanel { @@ -130,7 +130,7 @@ public class ReviewerListPanel extends GenericPanel { @Override protected Component newContent(String id) { - MarkdownManager markdownManager = TurboDev.getInstance(MarkdownManager.class); + MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class); String rendered = markdownManager.render(reviewNote); Label label = new Label(id, JsoupUtils.clean(rendered).body().html()); label.add(AttributeAppender.append("class", "review-note")); @@ -180,7 +180,7 @@ public class ReviewerListPanel extends GenericPanel { invitation.setType(ReviewInvitation.Type.EXCLUDE); removed = !request.getQualityCheckStatus().getAwaitingReviewers().contains(reviewer); } else { - removed = TurboDev.getInstance(ReviewInvitationManager.class).exclude(invitation); + removed = OneDev.getInstance(ReviewInvitationManager.class).exclude(invitation); } if (!removed) { getSession().warn("Reviewer '" + reviewer.getDisplayName() @@ -229,7 +229,7 @@ public class ReviewerListPanel extends GenericPanel { PullRequest request = getPullRequest(); User reviewer = item.getModelObject(); request.clearQualityStatus(); - TurboDev.getInstance(ReviewManager.class).delete(reviewer, request); + OneDev.getInstance(ReviewManager.class).delete(reviewer, request); reviewersModel.detach(); send(getPage(), Broadcast.BREADTH, new PageDataChanged(target)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerProvider.java b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerProvider.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerProvider.java rename to web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerProvider.java index dd63477a3e..f282c2987d 100644 --- a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/ReviewerProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/requestreviewer/ReviewerProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.requestreviewer; +package io.onedev.server.web.component.requestreviewer; import java.util.ArrayList; import java.util.Collection; @@ -7,17 +7,17 @@ import java.util.List; import org.apache.wicket.model.IModel; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.QualityCheckStatus; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.userchoice.AbstractUserChoiceProvider; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.QualityCheckStatus; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.userchoice.AbstractUserChoiceProvider; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; public class ReviewerProvider extends AbstractUserChoiceProvider { diff --git a/web/src/main/java/com/turbodev/server/web/component/requestreviewer/reviewer-list.css b/web/src/main/java/io/onedev/server/web/component/requestreviewer/reviewer-list.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/requestreviewer/reviewer-list.css rename to web/src/main/java/io/onedev/server/web/component/requestreviewer/reviewer-list.css diff --git a/web/src/main/java/com/turbodev/server/web/component/requeststatus/RequestStatusPanel.html b/web/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/requeststatus/RequestStatusPanel.html rename to web/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/requeststatus/RequestStatusPanel.java b/web/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/component/requeststatus/RequestStatusPanel.java rename to web/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.java index 0aff799e3e..37d91d2e68 100644 --- a/web/src/main/java/com/turbodev/server/web/component/requeststatus/RequestStatusPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/requeststatus/RequestStatusPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.requeststatus; +package io.onedev.server.web.component.requeststatus; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.basic.Label; @@ -6,8 +6,8 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.CloseInfo; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.CloseInfo; @SuppressWarnings("serial") public class RequestStatusPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java b/web/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java rename to web/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java index ed0ac7d301..f31c1f2398 100644 --- a/web/src/main/java/com/turbodev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java +++ b/web/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecAssistBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.reviewrequirementspec; +package io.onedev.server.web.component.reviewrequirementspec; import java.util.ArrayList; import java.util.Iterator; @@ -7,17 +7,18 @@ import java.util.List; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.codeassist.FenceAware; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.codeassist.ParentedElement; -import com.turbodev.codeassist.grammar.ElementSpec; -import com.turbodev.codeassist.grammar.LexerRuleRefElementSpec; -import com.turbodev.codeassist.grammar.RuleRefElementSpec; -import com.turbodev.server.util.reviewrequirement.ReviewRequirementSpecParser; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.web.behavior.inputassist.ANTLRAssistBehavior; -import com.turbodev.server.web.util.SuggestionUtils; +import io.onedev.server.util.reviewrequirement.ReviewRequirementSpecParser; + +import io.onedev.codeassist.FenceAware; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.codeassist.ParentedElement; +import io.onedev.codeassist.grammar.ElementSpec; +import io.onedev.codeassist.grammar.LexerRuleRefElementSpec; +import io.onedev.codeassist.grammar.RuleRefElementSpec; +import io.onedev.server.model.Project; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior; +import io.onedev.server.web.util.SuggestionUtils; @SuppressWarnings("serial") public class ReviewRequirementSpecAssistBehavior extends ANTLRAssistBehavior { diff --git a/web/src/main/java/com/turbodev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java b/web/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java rename to web/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java index acac2aad4d..35e779f4b3 100644 --- a/web/src/main/java/com/turbodev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java +++ b/web/src/main/java/io/onedev/server/web/component/reviewrequirementspec/ReviewRequirementSpecInput.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.reviewrequirementspec; +package io.onedev.server.web.component.reviewrequirementspec; import java.io.Serializable; @@ -10,8 +10,8 @@ import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidationError; import org.apache.wicket.validation.IValidator; -import com.turbodev.server.model.Project; -import com.turbodev.server.util.reviewrequirement.ReviewRequirement; +import io.onedev.server.model.Project; +import io.onedev.server.util.reviewrequirement.ReviewRequirement; @SuppressWarnings("serial") public class ReviewRequirementSpecInput extends TextField { diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/AffinalRevisionPicker.html b/web/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/AffinalRevisionPicker.html rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.html diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/AffinalRevisionPicker.java b/web/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/AffinalRevisionPicker.java rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java index 0d8471dd83..8e1e27d755 100644 --- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/AffinalRevisionPicker.java +++ b/web/src/main/java/io/onedev/server/web/component/revisionpicker/AffinalRevisionPicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.revisionpicker; +package io.onedev.server.web.component.revisionpicker; import javax.annotation.Nullable; @@ -8,11 +8,11 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.web.component.ProjectPicker; -import com.turbodev.server.web.util.model.AffinalProjectsModel; +import io.onedev.server.OneDev; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.web.component.ProjectPicker; +import io.onedev.server.web.util.model.AffinalProjectsModel; @SuppressWarnings("serial") public abstract class AffinalRevisionPicker extends Panel { @@ -53,7 +53,7 @@ public abstract class AffinalRevisionPicker extends Panel { } private Project getProject() { - return TurboDev.getInstance(Dao.class).load(Project.class, projectId); + return OneDev.getInstance(Dao.class).load(Project.class, projectId); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionPicker.java b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionPicker.java rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java index 11c682f2c2..ef19e28440 100644 --- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionPicker.java +++ b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPicker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.revisionpicker; +package io.onedev.server.web.component.revisionpicker; import javax.annotation.Nullable; @@ -7,12 +7,12 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.ProjectAndRevision; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.modal.ModalPanel; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.ProjectAndRevision; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.modal.ModalPanel; @SuppressWarnings("serial") public abstract class RevisionPicker extends DropdownLink { diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionPickerResourceReference.java b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPickerResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionPickerResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPickerResourceReference.java index e1d6eeffe3..18242f8775 100644 --- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionPickerResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionPickerResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.revisionpicker; +package io.onedev.server.web.component.revisionpicker; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.html b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.html rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.html diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java index fcd8c9f167..fd21dca841 100644 --- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelector.java +++ b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelector.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.revisionpicker; +package io.onedev.server.web.component.revisionpicker; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -39,20 +39,21 @@ import org.unbescape.html.HtmlEscape; import com.google.common.base.Preconditions; import com.google.common.base.Throwables; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.InputChangeBehavior; -import com.turbodev.server.web.behavior.infinitescroll.InfiniteScrollBehavior; -import com.turbodev.server.web.component.createtag.CreateTagPanel; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.component.tabbable.AjaxActionTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; + +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.InputChangeBehavior; +import io.onedev.server.web.behavior.infinitescroll.InfiniteScrollBehavior; +import io.onedev.server.web.component.createtag.CreateTagPanel; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.tabbable.AjaxActionTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; @SuppressWarnings("serial") public abstract class RevisionSelector extends Panel { @@ -102,7 +103,7 @@ public abstract class RevisionSelector extends Panel { revInput = null; target.add(revField); newItemsView(target); - String script = String.format("turbodev.server.revisionSelector.bindInputKeys('%s');", getMarkupId(true)); + String script = String.format("onedev.server.revisionSelector.bindInputKeys('%s');", getMarkupId(true)); target.appendJavaScript(script); target.focusComponent(revField); } @@ -203,7 +204,7 @@ public abstract class RevisionSelector extends Panel { @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); - String script = String.format("turbodev.server.revisionSelector.init('%s', %s);", + String script = String.format("onedev.server.revisionSelector.init('%s', %s);", getMarkupId(true), getCallbackFunction(explicit("value"))); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java index 9e1d17d1dc..f2780e54dd 100644 --- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/revisionpicker/RevisionSelectorResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.revisionpicker; +package io.onedev.server.web.component.revisionpicker; import java.util.List; @@ -7,8 +7,8 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class RevisionSelectorResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-picker.css b/web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-picker.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-picker.css rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-picker.css diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-selector.css b/web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-selector.css rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.css diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-selector.js b/web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js similarity index 93% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-selector.js rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js index 93a34992a9..feb8abbbc8 100644 --- a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/revision-selector.js +++ b/web/src/main/java/io/onedev/server/web/component/revisionpicker/revision-selector.js @@ -1,4 +1,4 @@ -turbodev.server.revisionSelector = { +onedev.server.revisionSelector = { init: function(containerId, callback) { var $container = $("#" + containerId); $container.data("callback", callback); @@ -6,7 +6,7 @@ turbodev.server.revisionSelector = { $floating.on("open click", function() { $container.find("input").focus(); }); - turbodev.server.revisionSelector.bindInputKeys(containerId); + onedev.server.revisionSelector.bindInputKeys(containerId); }, bindInputKeys: function(containerId) { var $container = $("#" + containerId); diff --git a/web/src/main/java/com/turbodev/server/web/component/revisionpicker/search.gif b/web/src/main/java/io/onedev/server/web/component/revisionpicker/search.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/revisionpicker/search.gif rename to web/src/main/java/io/onedev/server/web/component/revisionpicker/search.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice.java b/web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java similarity index 99% rename from web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice.java rename to web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java index 08e4cd177b..865373139f 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice.utf8.properties b/web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.utf8.properties similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice.utf8.properties rename to web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice.utf8.properties diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice_de.utf8.properties b/web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_de.utf8.properties similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice_de.utf8.properties rename to web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_de.utf8.properties diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice_hu.utf8.properties b/web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_hu.utf8.properties similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/AbstractSelect2Choice_hu.utf8.properties rename to web/src/main/java/io/onedev/server/web/component/select2/AbstractSelect2Choice_hu.utf8.properties diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/AjaxSettings.java b/web/src/main/java/io/onedev/server/web/component/select2/AjaxSettings.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/select2/AjaxSettings.java rename to web/src/main/java/io/onedev/server/web/component/select2/AjaxSettings.java index 361631641c..420ec562b9 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/AjaxSettings.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/AjaxSettings.java @@ -10,14 +10,14 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.io.Serializable; import org.json.JSONException; import org.json.JSONWriter; -import com.turbodev.server.web.component.select2.json.Json; +import io.onedev.server.web.component.select2.json.Json; /** * Select2 Ajax settings. Refer to the Select2 documentation for what these diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/ChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/select2/ChoiceProvider.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/component/select2/ChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/select2/ChoiceProvider.java index 3c1f95b2db..fa74f80e93 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/ChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/ChoiceProvider.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.Collection; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.java b/web/src/main/java/io/onedev/server/web/component/select2/DragAndDropBehavior.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.java rename to web/src/main/java/io/onedev/server/web/component/select2/DragAndDropBehavior.java index 85d2e00217..c34465390e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/DragAndDropBehavior.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/DragAndDropBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; /** * Adds drag & drop behavior to Select2MultiChoice components, i.e. the list of diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/JQuery.java b/web/src/main/java/io/onedev/server/web/component/select2/JQuery.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/component/select2/JQuery.java rename to web/src/main/java/io/onedev/server/web/component/select2/JQuery.java index a9eef8f128..6e3120c772 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/JQuery.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/JQuery.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; public class JQuery { private JQuery() { diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Response.java b/web/src/main/java/io/onedev/server/web/component/select2/Response.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/component/select2/Response.java rename to web/src/main/java/io/onedev/server/web/component/select2/Response.java index e0446b7af1..45572cf027 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/Response.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/Response.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.ArrayList; import java.util.Collection; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/ResponseFiller.java b/web/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/component/select2/ResponseFiller.java rename to web/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java index 8007a2fea2..59431e6ea0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/ResponseFiller.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/ResponseFiller.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Select2Choice.java b/web/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/select2/Select2Choice.java rename to web/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java index ca742de3b9..157230a252 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/Select2Choice.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/Select2Choice.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.Collections; @@ -20,7 +20,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.util.string.Strings; import org.json.JSONException; -import com.turbodev.server.web.component.select2.json.JsonBuilder; +import io.onedev.server.web.component.select2.json.JsonBuilder; /** * Single-select Select2 component. Should be attached to a diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Select2CssResourceReference.java b/web/src/main/java/io/onedev/server/web/component/select2/Select2CssResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/select2/Select2CssResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/select2/Select2CssResourceReference.java index f6dc7d0c92..8a21d931ab 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/Select2CssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/Select2CssResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; 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.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class Select2CssResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Select2MultiChoice.java b/web/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/select2/Select2MultiChoice.java rename to web/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java index fa433714c2..3a34862c79 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/Select2MultiChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/Select2MultiChoice.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.ArrayList; import java.util.Arrays; @@ -22,7 +22,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.util.string.Strings; import org.json.JSONException; -import com.turbodev.server.web.component.select2.json.JsonBuilder; +import io.onedev.server.web.component.select2.json.JsonBuilder; /** * Multi-select Select2 component. Should be attached to a diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.java b/web/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java index 101f0f2f17..25d7cecb44 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/Select2ResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/Select2ResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.List; @@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.mousewheel.MouseWheelResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.mousewheel.MouseWheelResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class Select2ResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/SelectToAddChoice.java b/web/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/select2/SelectToAddChoice.java rename to web/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java index 6fdd1ff7ed..127c5c7d33 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/SelectToAddChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/SelectToAddChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/Settings.java b/web/src/main/java/io/onedev/server/web/component/select2/Settings.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/component/select2/Settings.java rename to web/src/main/java/io/onedev/server/web/component/select2/Settings.java index 33fa6412d5..0ea1d44406 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/Settings.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/Settings.java @@ -10,14 +10,14 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.io.Serializable; import org.json.JSONException; import org.json.JSONStringer; -import com.turbodev.server.web.component.select2.json.Json; +import io.onedev.server.web.component.select2.json.Json; /** * Select2 settings. Refer to the Select2 documentation for what these options diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/StringTextChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/select2/StringTextChoiceProvider.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/select2/StringTextChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/select2/StringTextChoiceProvider.java index e9c54774d4..b206fcff7d 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/StringTextChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/StringTextChoiceProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import java.util.Collection; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/TextChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/select2/TextChoiceProvider.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/select2/TextChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/select2/TextChoiceProvider.java index 9c8703c4c5..16c3ec80f0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/TextChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/TextChoiceProvider.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2; +package io.onedev.server.web.component.select2; import org.json.JSONException; import org.json.JSONWriter; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/json/Json.java b/web/src/main/java/io/onedev/server/web/component/select2/json/Json.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/select2/json/Json.java rename to web/src/main/java/io/onedev/server/web/component/select2/json/Json.java index 6f78a9e3ea..cabdb25e24 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/json/Json.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/json/Json.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2.json; +package io.onedev.server.web.component.select2.json; import org.json.JSONException; import org.json.JSONWriter; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/json/JsonBuilder.java b/web/src/main/java/io/onedev/server/web/component/select2/json/JsonBuilder.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/select2/json/JsonBuilder.java rename to web/src/main/java/io/onedev/server/web/component/select2/json/JsonBuilder.java index c831b60397..d60915af5a 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/json/JsonBuilder.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/json/JsonBuilder.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2.json; +package io.onedev.server.web.component.select2.json; import org.json.JSONWriter; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/json/JsonFunction.java b/web/src/main/java/io/onedev/server/web/component/select2/json/JsonFunction.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/select2/json/JsonFunction.java rename to web/src/main/java/io/onedev/server/web/component/select2/json/JsonFunction.java index 4bf137d81d..a353b6b337 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/json/JsonFunction.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/json/JsonFunction.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2.json; +package io.onedev.server.web.component.select2.json; import org.json.JSONString; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/json/StringBuilderWriter.java b/web/src/main/java/io/onedev/server/web/component/select2/json/StringBuilderWriter.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/component/select2/json/StringBuilderWriter.java rename to web/src/main/java/io/onedev/server/web/component/select2/json/StringBuilderWriter.java index a9c529d075..44b9cc7791 100644 --- a/web/src/main/java/com/turbodev/server/web/component/select2/json/StringBuilderWriter.java +++ b/web/src/main/java/io/onedev/server/web/component/select2/json/StringBuilderWriter.java @@ -10,7 +10,7 @@ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. */ -package com.turbodev.server.web.component.select2.json; +package io.onedev.server.web.component.select2.json; import java.io.IOException; import java.io.Writer; diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2-bootstrap.css b/web/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2-bootstrap.css rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2-bootstrap.css diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2-spinner.gif b/web/src/main/java/io/onedev/server/web/component/select2/res/select2-spinner.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2-spinner.gif rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2-spinner.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2.css b/web/src/main/java/io/onedev/server/web/component/select2/res/select2.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2.css rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2.css diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2.jquery.json b/web/src/main/java/io/onedev/server/web/component/select2/res/select2.jquery.json similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2.jquery.json rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2.jquery.json diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2.min.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2.min.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2.min.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2.min.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2.png b/web/src/main/java/io/onedev/server/web/component/select2/res/select2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2.png rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_de.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_de.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_de.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_de.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_es.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_es.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_es.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_es.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_eu.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_eu.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_eu.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_eu.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_fr.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_fr.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_fr.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_fr.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_hr.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_hr.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_hr.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_hr.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_hu.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_hu.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_hu.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_hu.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_it.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_it.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_it.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_it.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_nl.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_nl.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_nl.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_nl.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_pt-BR.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_pt-BR.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_pt-BR.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_pt-BR.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_pt-PT.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_pt-PT.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_pt-PT.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_pt-PT.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_ro.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_ro.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_ro.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_ro.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_ru.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_ru.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_ru.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_ru.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_sk.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_sk.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_sk.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_sk.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_sv.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_sv.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_sv.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_sv.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_tr.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_tr.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_tr.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_tr.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_ua.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_ua.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_ua.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_ua.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_zh-CN.js b/web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_zh-CN.js similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2_locale_zh-CN.js rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2_locale_zh-CN.js diff --git a/web/src/main/java/com/turbodev/server/web/component/select2/res/select2x2.png b/web/src/main/java/io/onedev/server/web/component/select2/res/select2x2.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/select2/res/select2x2.png rename to web/src/main/java/io/onedev/server/web/component/select2/res/select2x2.png diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.html b/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.html rename to web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java b/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java rename to web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.java index 70c1c2077f..0f9148c448 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.sidebar; +package io.onedev.server.web.component.sidebar; import java.util.List; @@ -15,9 +15,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.http.WebRequest; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.util.WicketUtils; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.util.WicketUtils; @SuppressWarnings("serial") public abstract class SidebarPanel extends Panel { @@ -62,7 +62,7 @@ public abstract class SidebarPanel extends Panel { public void renderHead(IHeaderResponse response) { super.renderHead(response); response.render(JavaScriptHeaderItem.forReference(new SidebarResourceReference())); - String script = String.format("turbodev.server.sidebar.onDomReady('%s', %s);", + String script = String.format("onedev.server.sidebar.onDomReady('%s', %s);", getMarkupId(true), miniCookieKey!=null?"'"+miniCookieKey+"'":"undefined"); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarResourceReference.java b/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java similarity index 71% rename from web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java index d62739e473..b707631aef 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sidebar/SidebarResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/sidebar/SidebarResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.sidebar; +package io.onedev.server.web.component.sidebar; 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.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class SidebarResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css b/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.css rename to web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.css diff --git a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.js b/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.js rename to web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js index 4914757642..d12caec455 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sidebar/sidebar.js +++ b/web/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js @@ -1,4 +1,4 @@ -turbodev.server.sidebar = { +onedev.server.sidebar = { onDomReady: function(containerId, miniCookieKey) { var $sidebar = $("#"+containerId); var $tabs = $sidebar.children(".tabs"); diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/OptionChangeCallback.java b/web/src/main/java/io/onedev/server/web/component/sourceformat/OptionChangeCallback.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/sourceformat/OptionChangeCallback.java rename to web/src/main/java/io/onedev/server/web/component/sourceformat/OptionChangeCallback.java index 88032604e5..72d7aecb2b 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sourceformat/OptionChangeCallback.java +++ b/web/src/main/java/io/onedev/server/web/component/sourceformat/OptionChangeCallback.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.sourceformat; +package io.onedev.server.web.component.sourceformat; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.html b/web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.html rename to web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.java b/web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.java rename to web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java index 5e0139a635..ab15c95c49 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.sourceformat; +package io.onedev.server.web.component.sourceformat; import javax.annotation.Nullable; import javax.servlet.http.Cookie; @@ -168,7 +168,7 @@ public class SourceFormatPanel extends Panel { response.render(JavaScriptReferenceHeaderItem.forReference(new SourceFormatResourceReference())); - String script = String.format("turbodev.server.sourceFormat.init('%s');", getMarkupId()); + String script = String.format("onedev.server.sourceFormat.init('%s');", getMarkupId()); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatResourceReference.java b/web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatResourceReference.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatResourceReference.java index 41a3690383..121baab973 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sourceformat/SourceFormatResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/sourceformat/SourceFormatResourceReference.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.component.sourceformat; +package io.onedev.server.web.component.sourceformat; import java.util.List; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class SourceFormatResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.css b/web/src/main/java/io/onedev/server/web/component/sourceformat/source-format.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.css rename to web/src/main/java/io/onedev/server/web/component/sourceformat/source-format.css diff --git a/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.js b/web/src/main/java/io/onedev/server/web/component/sourceformat/source-format.js similarity index 91% rename from web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.js rename to web/src/main/java/io/onedev/server/web/component/sourceformat/source-format.js index d615e96e4f..894ba116d3 100644 --- a/web/src/main/java/com/turbodev/server/web/component/sourceformat/source-format.js +++ b/web/src/main/java/io/onedev/server/web/component/sourceformat/source-format.js @@ -1,4 +1,4 @@ -turbodev.server.sourceFormat = { +onedev.server.sourceFormat = { init: function(containerId) { var $container = $("#" + containerId); diff --git a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipPanel.html b/web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipPanel.html rename to web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipPanel.java rename to web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java index c4878abc68..a7418a6b1c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.symboltooltip; +package io.onedev.server.web.component.symboltooltip; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -29,24 +29,24 @@ import org.apache.wicket.request.resource.ResourceReference; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.jsymbol.Symbol; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.search.IndexConstants; -import com.turbodev.server.search.SearchManager; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.hit.SymbolHit; -import com.turbodev.server.search.query.BlobQuery; -import com.turbodev.server.search.query.SymbolQuery; -import com.turbodev.server.search.query.TextQuery; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.RunTaskBehavior; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.search.result.SearchResultPanel; +import io.onedev.jsymbol.Symbol; +import io.onedev.server.OneDev; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.search.IndexConstants; +import io.onedev.server.search.SearchManager; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.SymbolHit; +import io.onedev.server.search.query.BlobQuery; +import io.onedev.server.search.query.SymbolQuery; +import io.onedev.server.search.query.TextQuery; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.RunTaskBehavior; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel; @SuppressWarnings("serial") public abstract class SymbolTooltipPanel extends Panel { @@ -92,7 +92,7 @@ public abstract class SymbolTooltipPanel extends Panel { @Override public void onClick(AjaxRequestTarget target) { - String script = String.format("turbodev.server.symboltooltip.removeTooltip(document.getElementById('%s'));", + String script = String.format("onedev.server.symboltooltip.removeTooltip(document.getElementById('%s'));", SymbolTooltipPanel.this.getMarkupId()); target.prependJavaScript(script); onSelect(target, hit); @@ -139,7 +139,7 @@ public abstract class SymbolTooltipPanel extends Panel { @Override protected void runTask(AjaxRequestTarget target) { - String script = String.format("turbodev.server.symboltooltip.removeTooltip(document.getElementById('%s'));", + String script = String.format("onedev.server.symboltooltip.removeTooltip(document.getElementById('%s'));", SymbolTooltipPanel.this.getMarkupId()); target.prependJavaScript(script); List hits; @@ -152,7 +152,7 @@ public abstract class SymbolTooltipPanel extends Panel { .count(SearchResultPanel.MAX_QUERY_ENTRIES) .build(); try { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); ObjectId commit = projectModel.getObject().getRevCommit(revision); hits = searchManager.search(projectModel.getObject(), commit, query); } catch (InterruptedException e) { @@ -211,7 +211,7 @@ public abstract class SymbolTooltipPanel extends Panel { if (symbolHits.size() < QUERY_ENTRIES) { // first find in current file for matched symbols - List symbols = TurboDev.getInstance(SearchManager.class).getSymbols(projectModel.getObject(), + List symbols = OneDev.getInstance(SearchManager.class).getSymbols(projectModel.getObject(), blob.getBlobId(), getBlobPath()); if (symbols != null) { for (Symbol symbol: symbols) { @@ -236,7 +236,7 @@ public abstract class SymbolTooltipPanel extends Panel { if (symbolHits.size() < QUERY_ENTRIES) { // then find in other files for public symbols try { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); ObjectId commit = projectModel.getObject().getRevCommit(revision); BlobQuery query; if (symbolHits.size() < QUERY_ENTRIES) { @@ -265,7 +265,7 @@ public abstract class SymbolTooltipPanel extends Panel { } } target.add(content); - String script = String.format("turbodev.server.symboltooltip.doneQuery('%s');", content.getMarkupId()); + String script = String.format("onedev.server.symboltooltip.doneQuery('%s');", content.getMarkupId()); target.appendJavaScript(script); } @@ -277,7 +277,7 @@ public abstract class SymbolTooltipPanel extends Panel { ResourceReference ajaxIndicator = new PackageResourceReference( SymbolTooltipPanel.class, "ajax-indicator.gif"); - String script = String.format("turbodev.server.symboltooltip.init('%s', %s, '%s');", + String script = String.format("onedev.server.symboltooltip.init('%s', %s, '%s');", getMarkupId(), getCallbackFunction(explicit("revision"), explicit("symbol")), RequestCycle.get().urlFor(ajaxIndicator, new PageParameters())); response.render(OnDomReadyHeaderItem.forScript(script)); diff --git a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipResourceReference.java b/web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipResourceReference.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipResourceReference.java index ffe4b77f11..12d26f9f83 100644 --- a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/SymbolTooltipResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipResourceReference.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.component.symboltooltip; +package io.onedev.server.web.component.symboltooltip; import java.util.List; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class SymbolTooltipResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/component/symboltooltip/ajax-indicator.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/symboltooltip/ajax-indicator.gif rename to web/src/main/java/io/onedev/server/web/component/symboltooltip/ajax-indicator.gif diff --git a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/symbol-tooltip.css b/web/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/symboltooltip/symbol-tooltip.css rename to web/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.css diff --git a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/symbol-tooltip.js b/web/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js similarity index 89% rename from web/src/main/java/com/turbodev/server/web/component/symboltooltip/symbol-tooltip.js rename to web/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js index 2244a17f5c..f7b9f84043 100644 --- a/web/src/main/java/com/turbodev/server/web/component/symboltooltip/symbol-tooltip.js +++ b/web/src/main/java/io/onedev/server/web/component/symboltooltip/symbol-tooltip.js @@ -1,4 +1,4 @@ -turbodev.server.symboltooltip = { +onedev.server.symboltooltip = { init: function(containerId, queryCallback, ajaxIndicatorUrl) { var container = document.getElementById(containerId); @@ -16,7 +16,7 @@ turbodev.server.symboltooltip = { if (container.tooltip.hideTimer) clearTimeout(container.tooltip.hideTimer); container.tooltip.hideTimer = setTimeout(function(){ - turbodev.server.symboltooltip.removeTooltip(container); + onedev.server.symboltooltip.removeTooltip(container); }, 200); } }; @@ -30,7 +30,7 @@ turbodev.server.symboltooltip = { container.onMouseOverSymbol = function(revision, symbolEl) { var $symbol = $(symbolEl); - if (turbodev.server.mouseState.pressed || !turbodev.server.mouseState.moved || $symbol.text() == "@") + if (onedev.server.mouseState.pressed || !onedev.server.mouseState.moved || $symbol.text() == "@") return; cancelShow(); @@ -50,7 +50,7 @@ turbodev.server.symboltooltip = { if (container.tooltip.symbolEl == symbolEl) return; else - turbodev.server.symboltooltip.removeTooltip(container); + onedev.server.symboltooltip.removeTooltip(container); } var $tooltip = $("
    " + user.name; }, diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/RequiredVerificationsPanel.html b/web/src/main/java/io/onedev/server/web/component/verification/RequiredVerificationsPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/verification/RequiredVerificationsPanel.html rename to web/src/main/java/io/onedev/server/web/component/verification/RequiredVerificationsPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/RequiredVerificationsPanel.java b/web/src/main/java/io/onedev/server/web/component/verification/RequiredVerificationsPanel.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/component/verification/RequiredVerificationsPanel.java rename to web/src/main/java/io/onedev/server/web/component/verification/RequiredVerificationsPanel.java index cbd3aa9a87..841a8f96f0 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/RequiredVerificationsPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/verification/RequiredVerificationsPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.verification; +package io.onedev.server.web.component.verification; import java.util.ArrayList; import java.util.Collections; @@ -20,10 +20,10 @@ import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.Verification.Status; -import com.turbodev.server.web.websocket.PageDataChanged; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.Verification; +import io.onedev.server.util.Verification.Status; +import io.onedev.server.web.websocket.PageDataChanged; @SuppressWarnings("serial") public class RequiredVerificationsPanel extends GenericPanel { diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationChoiceProvider.java b/web/src/main/java/io/onedev/server/web/component/verification/VerificationChoiceProvider.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationChoiceProvider.java rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationChoiceProvider.java index bc50adcdcb..53ee63fba7 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationChoiceProvider.java +++ b/web/src/main/java/io/onedev/server/web/component/verification/VerificationChoiceProvider.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.verification; +package io.onedev.server.web.component.verification; import java.util.ArrayList; import java.util.Collection; @@ -9,14 +9,14 @@ import org.json.JSONException; import org.json.JSONWriter; import org.unbescape.html.HtmlEscape; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.select2.ChoiceProvider; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.util.WicketUtils; +import io.onedev.server.OneDev; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.select2.ChoiceProvider; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.util.WicketUtils; public class VerificationChoiceProvider extends ChoiceProvider { @@ -36,7 +36,7 @@ public class VerificationChoiceProvider extends ChoiceProvider { @Override public void query(String term, int page, Response response) { ProjectPage projectPage = (ProjectPage) WicketUtils.getPage(); - Collection verifications = TurboDev.getInstance(VerificationManager.class) + Collection verifications = OneDev.getInstance(VerificationManager.class) .getVerificationNames(projectPage.getProject()); List verificationList = new ArrayList<>(verifications); Collections.sort(verificationList); diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationDetailPanel.html b/web/src/main/java/io/onedev/server/web/component/verification/VerificationDetailPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationDetailPanel.html rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationDetailPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationDetailPanel.java b/web/src/main/java/io/onedev/server/web/component/verification/VerificationDetailPanel.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationDetailPanel.java rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationDetailPanel.java index e48acaa85b..30b7cd4d41 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationDetailPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/verification/VerificationDetailPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.verification; +package io.onedev.server.web.component.verification; import java.util.ArrayList; import java.util.Collections; @@ -19,9 +19,9 @@ import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.utils.Pair; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.Verification.Status; +import io.onedev.server.util.Verification; +import io.onedev.server.util.Verification.Status; +import io.onedev.utils.Pair; @SuppressWarnings("serial") public class VerificationDetailPanel extends GenericPanel> { diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationMultiChoice.java b/web/src/main/java/io/onedev/server/web/component/verification/VerificationMultiChoice.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationMultiChoice.java rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationMultiChoice.java index 8c181c408a..143ec0941e 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationMultiChoice.java +++ b/web/src/main/java/io/onedev/server/web/component/verification/VerificationMultiChoice.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.verification; +package io.onedev.server.web.component.verification; import java.util.Collection; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.component.select2.Select2MultiChoice; +import io.onedev.server.web.component.select2.Select2MultiChoice; public class VerificationMultiChoice extends Select2MultiChoice { @@ -20,9 +20,9 @@ public class VerificationMultiChoice extends Select2MultiChoice { protected void onInitialize() { super.onInitialize(); getSettings().setPlaceholder("Choose verifications..."); - getSettings().setFormatResult("turbodev.server.verificationChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.verificationChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.verificationChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.verificationChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.verificationChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.verificationChoiceFormatter.escapeMarkup"); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationResourceReference.java b/web/src/main/java/io/onedev/server/web/component/verification/VerificationResourceReference.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationResourceReference.java index b17ae61d29..cc3256ae81 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/verification/VerificationResourceReference.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.component.verification; +package io.onedev.server.web.component.verification; import java.util.List; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class VerificationResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationStatusPanel.html b/web/src/main/java/io/onedev/server/web/component/verification/VerificationStatusPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationStatusPanel.html rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationStatusPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationStatusPanel.java b/web/src/main/java/io/onedev/server/web/component/verification/VerificationStatusPanel.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/component/verification/VerificationStatusPanel.java rename to web/src/main/java/io/onedev/server/web/component/verification/VerificationStatusPanel.java index 28b7d7fdd9..34198ef7f6 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/VerificationStatusPanel.java +++ b/web/src/main/java/io/onedev/server/web/component/verification/VerificationStatusPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.verification; +package io.onedev.server.web.component.verification; import java.util.Collection; import java.util.Map; @@ -11,11 +11,11 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.Verification.Status; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.websocket.PageDataChanged; +import io.onedev.server.util.Verification; +import io.onedev.server.util.Verification.Status; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.websocket.PageDataChanged; @SuppressWarnings("serial") public class VerificationStatusPanel extends GenericPanel> { diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/verification.css b/web/src/main/java/io/onedev/server/web/component/verification/verification.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/verification/verification.css rename to web/src/main/java/io/onedev/server/web/component/verification/verification.css diff --git a/web/src/main/java/com/turbodev/server/web/component/verification/verification.js b/web/src/main/java/io/onedev/server/web/component/verification/verification.js similarity index 83% rename from web/src/main/java/com/turbodev/server/web/component/verification/verification.js rename to web/src/main/java/io/onedev/server/web/component/verification/verification.js index 9da718d637..879589ae7c 100644 --- a/web/src/main/java/com/turbodev/server/web/component/verification/verification.js +++ b/web/src/main/java/io/onedev/server/web/component/verification/verification.js @@ -1,4 +1,4 @@ -turbodev.server.verificationChoiceFormatter = { +onedev.server.verificationChoiceFormatter = { formatSelection: function(verification) { return verification.name; }, diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/ManualConfigStep.java b/web/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/wizard/ManualConfigStep.java rename to web/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java index 79e79a14d2..931571baab 100644 --- a/web/src/main/java/com/turbodev/server/web/component/wizard/ManualConfigStep.java +++ b/web/src/main/java/io/onedev/server/web/component/wizard/ManualConfigStep.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.component.wizard; +package io.onedev.server.web.component.wizard; import java.io.Serializable; import org.apache.wicket.markup.html.form.FormComponent; -import com.turbodev.utils.init.ManualConfig; -import com.turbodev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.utils.init.ManualConfig; @SuppressWarnings("serial") public class ManualConfigStep implements WizardStep { diff --git a/web/src/main/java/io/onedev/server/web/component/wizard/Skippable.java b/web/src/main/java/io/onedev/server/web/component/wizard/Skippable.java new file mode 100644 index 0000000000..6ebdd1e96c --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/component/wizard/Skippable.java @@ -0,0 +1,5 @@ +package io.onedev.server.web.component.wizard; + +public interface Skippable { + void skip(); +} \ No newline at end of file diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/Wizard.html b/web/src/main/java/io/onedev/server/web/component/wizard/Wizard.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/wizard/Wizard.html rename to web/src/main/java/io/onedev/server/web/component/wizard/Wizard.html diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/Wizard.java b/web/src/main/java/io/onedev/server/web/component/wizard/Wizard.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/component/wizard/Wizard.java rename to web/src/main/java/io/onedev/server/web/component/wizard/Wizard.java index 3bc14fc1da..8340e0e674 100644 --- a/web/src/main/java/com/turbodev/server/web/component/wizard/Wizard.java +++ b/web/src/main/java/io/onedev/server/web/component/wizard/Wizard.java @@ -1,12 +1,12 @@ /* - * Copyright TurboDev Inc., + * Copyright OneDev Inc., * Date: 2008-8-4 * Time: ����09:00:25 * All rights reserved. * * Revision: $Id$ */ -package com.turbodev.server.web.component.wizard; +package io.onedev.server.web.component.wizard; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/WizardResourceReference.java b/web/src/main/java/io/onedev/server/web/component/wizard/WizardResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/component/wizard/WizardResourceReference.java rename to web/src/main/java/io/onedev/server/web/component/wizard/WizardResourceReference.java index 77be2a7846..c27da98eee 100644 --- a/web/src/main/java/com/turbodev/server/web/component/wizard/WizardResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/component/wizard/WizardResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.component.wizard; +package io.onedev.server.web.component.wizard; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/WizardStep.java b/web/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/component/wizard/WizardStep.java rename to web/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java index 7c9ed7a6bd..5813d8be77 100644 --- a/web/src/main/java/com/turbodev/server/web/component/wizard/WizardStep.java +++ b/web/src/main/java/io/onedev/server/web/component/wizard/WizardStep.java @@ -1,11 +1,11 @@ /* - * Copyright TurboDev Inc., + * Copyright OneDev Inc., * Date: 2008-8-4 * All rights reserved. * * Revision: $Id$ */ -package com.turbodev.server.web.component.wizard; +package io.onedev.server.web.component.wizard; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/component/wizard/wizard.css b/web/src/main/java/io/onedev/server/web/component/wizard/wizard.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/component/wizard/wizard.css rename to web/src/main/java/io/onedev/server/web/component/wizard/wizard.css diff --git a/web/src/main/java/com/turbodev/server/web/editable/BeanContext.java b/web/src/main/java/io/onedev/server/web/editable/BeanContext.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/editable/BeanContext.java rename to web/src/main/java/io/onedev/server/web/editable/BeanContext.java index b52744397d..e5a19bf15e 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/BeanContext.java +++ b/web/src/main/java/io/onedev/server/web/editable/BeanContext.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.util.HashSet; @@ -8,8 +8,8 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.ClassUtils; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.utils.ClassUtils; @SuppressWarnings("serial") public abstract class BeanContext extends BeanDescriptor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/BeanDescriptor.java b/web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/editable/BeanDescriptor.java rename to web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java index 8957e53038..9eae9b1494 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/BeanDescriptor.java +++ b/web/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.lang.reflect.Method; @@ -6,10 +6,11 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import com.turbodev.utils.BeanUtils; import com.google.common.collect.Sets; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Editable; + +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.utils.BeanUtils; @SuppressWarnings("serial") public class BeanDescriptor implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/editable/BeanEditor.java b/web/src/main/java/io/onedev/server/web/editable/BeanEditor.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/editable/BeanEditor.java rename to web/src/main/java/io/onedev/server/web/editable/BeanEditor.java index 11be13736b..42e631c445 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/BeanEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/BeanEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.util.HashSet; import java.util.Set; @@ -11,8 +11,8 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidator; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.web.editable.PathSegment.Property; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.web.editable.PathSegment.Property; @SuppressWarnings("serial") public abstract class BeanEditor extends ValueEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/BeanViewer.html b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/BeanViewer.html rename to web/src/main/java/io/onedev/server/web/editable/BeanViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/BeanViewer.java b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/editable/BeanViewer.java rename to web/src/main/java/io/onedev/server/web/editable/BeanViewer.java index 38a34975f0..e5314151ff 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/BeanViewer.java +++ b/web/src/main/java/io/onedev/server/web/editable/BeanViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import org.apache.wicket.Component; import org.apache.wicket.behavior.AttributeAppender; diff --git a/web/src/main/java/com/turbodev/server/web/editable/DefaultEditSupportRegistry.java b/web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/editable/DefaultEditSupportRegistry.java rename to web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java index 1bec00b8ac..47e0f421d3 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/DefaultEditSupportRegistry.java +++ b/web/src/main/java/io/onedev/server/web/editable/DefaultEditSupportRegistry.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.util.ArrayList; diff --git a/web/src/main/java/com/turbodev/server/web/editable/EditSupport.java b/web/src/main/java/io/onedev/server/web/editable/EditSupport.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/editable/EditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/EditSupport.java index 7add64b386..78844bed87 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/EditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/EditSupport.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.util.Set; -import com.turbodev.launcher.loader.ExtensionPoint; +import io.onedev.launcher.loader.ExtensionPoint; @ExtensionPoint public interface EditSupport extends Serializable { diff --git a/web/src/main/java/io/onedev/server/web/editable/EditSupportLocator.java b/web/src/main/java/io/onedev/server/web/editable/EditSupportLocator.java new file mode 100644 index 0000000000..f64cb60452 --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/editable/EditSupportLocator.java @@ -0,0 +1,5 @@ +package io.onedev.server.web.editable; + +public class EditSupportLocator { + +} diff --git a/web/src/main/java/com/turbodev/server/web/editable/EditSupportRegistry.java b/web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/editable/EditSupportRegistry.java rename to web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.java index ad4d0f6914..8d1623c74d 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/EditSupportRegistry.java +++ b/web/src/main/java/io/onedev/server/web/editable/EditSupportRegistry.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.util.Set; diff --git a/web/src/main/java/com/turbodev/server/web/editable/EditableModule.java b/web/src/main/java/io/onedev/server/web/editable/EditableModule.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/editable/EditableModule.java rename to web/src/main/java/io/onedev/server/web/editable/EditableModule.java index 1a537f03cb..4d3123d87c 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/EditableModule.java +++ b/web/src/main/java/io/onedev/server/web/editable/EditableModule.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; -import com.turbodev.launcher.loader.AbstractPluginModule; +import io.onedev.launcher.loader.AbstractPluginModule; /** * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class. diff --git a/web/src/main/java/com/turbodev/server/web/editable/EditorChanged.java b/web/src/main/java/io/onedev/server/web/editable/EditorChanged.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/editable/EditorChanged.java rename to web/src/main/java/io/onedev/server/web/editable/EditorChanged.java index 29af398226..5844d46055 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/EditorChanged.java +++ b/web/src/main/java/io/onedev/server/web/editable/EditorChanged.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.web.util.AjaxPayload; +import io.onedev.server.web.util.AjaxPayload; public class EditorChanged extends AjaxPayload { diff --git a/web/src/main/java/com/turbodev/server/web/editable/ErrorContext.java b/web/src/main/java/io/onedev/server/web/editable/ErrorContext.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/editable/ErrorContext.java rename to web/src/main/java/io/onedev/server/web/editable/ErrorContext.java index 0eb43e049b..b2f0141e18 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/ErrorContext.java +++ b/web/src/main/java/io/onedev/server/web/editable/ErrorContext.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; public interface ErrorContext { diff --git a/web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java b/web/src/main/java/io/onedev/server/web/editable/NotDefinedLabel.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java rename to web/src/main/java/io/onedev/server/web/editable/NotDefinedLabel.java index 25a5e585cd..efa163a342 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/NotDefinedLabel.java +++ b/web/src/main/java/io/onedev/server/web/editable/NotDefinedLabel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import org.apache.wicket.markup.html.basic.Label; diff --git a/web/src/main/java/com/turbodev/server/web/editable/PathSegment.java b/web/src/main/java/io/onedev/server/web/editable/PathSegment.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/editable/PathSegment.java rename to web/src/main/java/io/onedev/server/web/editable/PathSegment.java index 67590d8314..e14915b4ea 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/PathSegment.java +++ b/web/src/main/java/io/onedev/server/web/editable/PathSegment.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/editable/PropertyContext.java b/web/src/main/java/io/onedev/server/web/editable/PropertyContext.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/editable/PropertyContext.java rename to web/src/main/java/io/onedev/server/web/editable/PropertyContext.java index b9e7745be2..d28441009e 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/PropertyContext.java +++ b/web/src/main/java/io/onedev/server/web/editable/PropertyContext.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; @@ -7,7 +7,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; -import com.turbodev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoader; @SuppressWarnings("serial") public abstract class PropertyContext extends PropertyDescriptor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/PropertyDescriptor.java b/web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/editable/PropertyDescriptor.java rename to web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java index fddc8c5586..2e488e461c 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/PropertyDescriptor.java +++ b/web/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.lang.reflect.InvocationTargetException; @@ -9,7 +9,7 @@ import javax.validation.constraints.Size; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.utils.BeanUtils; +import io.onedev.utils.BeanUtils; public class PropertyDescriptor implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/editable/PropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/PropertyEditor.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/editable/PropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/PropertyEditor.java index cd98f9d649..012a7396f7 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/PropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/PropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.util.Set; @@ -10,7 +10,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.validation.INullAcceptingValidator; import org.apache.wicket.validation.IValidatable; -import com.turbodev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.AppLoader; @SuppressWarnings("serial") public abstract class PropertyEditor extends ValueEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/PropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/PropertyViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/PropertyViewer.html rename to web/src/main/java/io/onedev/server/web/editable/PropertyViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/PropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/PropertyViewer.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/editable/PropertyViewer.java rename to web/src/main/java/io/onedev/server/web/editable/PropertyViewer.java index 5b77b06d4a..03481819f0 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/PropertyViewer.java +++ b/web/src/main/java/io/onedev/server/web/editable/PropertyViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import org.apache.wicket.Component; import org.apache.wicket.behavior.AttributeAppender; diff --git a/web/src/main/java/com/turbodev/server/web/editable/ValueEditor.java b/web/src/main/java/io/onedev/server/web/editable/ValueEditor.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/editable/ValueEditor.java rename to web/src/main/java/io/onedev/server/web/editable/ValueEditor.java index 5cc0e0593e..69eea54518 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/ValueEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/ValueEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import javax.annotation.Nullable; diff --git a/web/src/main/java/com/turbodev/server/web/editable/ValuePath.java b/web/src/main/java/io/onedev/server/web/editable/ValuePath.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/editable/ValuePath.java rename to web/src/main/java/io/onedev/server/web/editable/ValuePath.java index a9be64964a..009de99471 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/ValuePath.java +++ b/web/src/main/java/io/onedev/server/web/editable/ValuePath.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable; +package io.onedev.server.web.editable; import java.io.Serializable; import java.util.ArrayList; diff --git a/web/src/main/java/com/turbodev/server/web/editable/bool/BooleanEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/editable/bool/BooleanEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java index 2e28202853..d22d622935 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/bool/BooleanEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.bool; +package io.onedev.server.web.editable.bool; import java.lang.reflect.Method; import java.util.Set; @@ -7,13 +7,13 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class BooleanEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/bool/BooleanPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/bool/BooleanPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/bool/BooleanPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/editable/bool/BooleanPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java index 0199f39078..d59fb6b1b9 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/bool/BooleanPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.bool; +package io.onedev.server.web.editable.bool; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.CheckBox; @@ -7,10 +7,10 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class BooleanPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/bool/NullableBooleanPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/bool/NullableBooleanPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/bool/NullableBooleanPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/editable/bool/NullableBooleanPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java index fe6af8f5b0..9cb4065839 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/bool/NullableBooleanPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/bool/NullableBooleanPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.bool; +package io.onedev.server.web.editable.bool; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.DropDownChoice; @@ -8,10 +8,11 @@ import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; import com.google.common.collect.Lists; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; + +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class NullableBooleanPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java index a52b7dd0ca..fb2947de3a 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.branchchoice; +package io.onedev.server.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.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.BranchChoice; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.BranchChoice; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class BranchEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchMultiChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchMultiChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java index 7856e08c45..50366ff6e6 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.branchchoice; +package io.onedev.server.web.editable.branchchoice; import java.util.ArrayList; import java.util.Collection; @@ -9,14 +9,14 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.branchchoice.BranchChoiceProvider; -import com.turbodev.server.web.component.branchchoice.BranchMultiChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.branchchoice.BranchChoiceProvider; +import io.onedev.server.web.component.branchchoice.BranchMultiChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public class BranchMultiChoiceEditor extends PropertyEditor> { diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchSingleChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchSingleChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java similarity index 71% rename from web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java index 8fcdd67805..8e35e72c17 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java @@ -1,17 +1,17 @@ -package com.turbodev.server.web.editable.branchchoice; +package io.onedev.server.web.editable.branchchoice; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.branchchoice.BranchChoiceProvider; -import com.turbodev.server.web.component.branchchoice.BranchSingleChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.branchchoice.BranchChoiceProvider; +import io.onedev.server.web.component.branchchoice.BranchSingleChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public class BranchSingleChoiceEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java index 7109687d7c..19ada3d91c 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.branchpattern; +package io.onedev.server.web.editable.branchpattern; 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.turbodev.server.util.editable.annotation.BranchPattern; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.BranchPattern; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class BranchPatternEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditor.html b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditor.html rename to web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditor.java b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditor.java rename to web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java index 78cf964a7d..c83149f8f5 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/branchpattern/BranchPatternEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/branchpattern/BranchPatternEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.branchpattern; +package io.onedev.server.web.editable.branchpattern; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.TextField; @@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.BranchPatternAssistBehavior; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.BranchPatternAssistBehavior; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public class BranchPatternEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/date/DateEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/date/DateEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java index e5c1e48e8c..630ab0fb6f 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/date/DateEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/date/DateEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.date; +package io.onedev.server.web.editable.date; import java.util.Date; import java.util.Set; @@ -7,13 +7,13 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class DateEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/date/DatePropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/date/DatePropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/date/DatePropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/editable/date/DatePropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java index 4efeefa709..1cdf58338b 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/date/DatePropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/date/DatePropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.date; +package io.onedev.server.web.editable.date; import java.lang.reflect.Method; import java.util.Date; @@ -11,15 +11,14 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.OmitName; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; - import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextField; import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.DateTextFieldConfig; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.OmitName; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class DatePropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java index 2c46f70dd3..8b310a05db 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.enumeration; +package io.onedev.server.web.editable.enumeration; import java.util.Set; @@ -6,13 +6,13 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class EnumEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java index bd35527a76..a380900299 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/enumeration/EnumPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.enumeration; +package io.onedev.server.web.editable.enumeration; import java.util.ArrayList; import java.util.Collection; @@ -14,11 +14,11 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.util.editable.annotation.ExcludeValues; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.util.editable.annotation.ExcludeValues; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class EnumPropertyEditor extends PropertyEditor> { diff --git a/web/src/main/java/com/turbodev/server/web/editable/filechoice/FileChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/filechoice/FileChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/filechoice/FileChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/editable/filechoice/FileChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java index 67d2910fb2..16d430d944 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/filechoice/FileChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileChoiceEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.filechoice; +package io.onedev.server.web.editable.filechoice; import java.util.ArrayList; import java.util.List; @@ -8,20 +8,21 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.codeassist.InputCompletion; -import com.turbodev.codeassist.InputStatus; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.utils.Range; -import com.turbodev.utils.ReflectionUtils; +import io.onedev.codeassist.InputCompletion; +import io.onedev.codeassist.InputStatus; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.server.util.editable.annotation.FileChoice; +import io.onedev.server.web.behavior.inputassist.InputAssistBehavior; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.util.SuggestionUtils; +import io.onedev.utils.Range; +import io.onedev.utils.ReflectionUtils; + import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.turbodev.server.util.editable.annotation.FileChoice; -import com.turbodev.server.web.behavior.inputassist.InputAssistBehavior; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.util.SuggestionUtils; @SuppressWarnings("serial") public class FileChoiceEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/filechoice/FileEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/filechoice/FileEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java index 1b12dc2506..1fb1422b08 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/filechoice/FileEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/filechoice/FileEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.filechoice; +package io.onedev.server.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.turbodev.server.util.editable.annotation.FileChoice; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.FileChoice; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class FileEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java index 6d069434c7..12f3ea1819 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.groupchoice; +package io.onedev.server.web.editable.groupchoice; 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.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.GroupChoice; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.GroupChoice; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class GroupEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupMultiChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupMultiChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java index 92536a99c5..e7f62a10c9 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupMultiChoiceEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.groupchoice; +package io.onedev.server.web.editable.groupchoice; import java.io.Serializable; import java.util.ArrayList; @@ -9,16 +9,16 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.web.component.groupchoice.GroupChoiceProvider; -import com.turbodev.server.web.component.groupchoice.GroupMultiChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.web.component.groupchoice.GroupChoiceProvider; +import io.onedev.server.web.component.groupchoice.GroupMultiChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class GroupMultiChoiceEditor extends PropertyEditor> { @@ -36,7 +36,7 @@ public class GroupMultiChoiceEditor extends PropertyEditor> { List groups = new ArrayList<>(); if (getModelObject() != null) { - GroupManager groupManager = TurboDev.getInstance(GroupManager.class); + GroupManager groupManager = OneDev.getInstance(GroupManager.class); for (String groupName: getModelObject()) { Group group = groupManager.find(groupName); if (group != null) diff --git a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java index 76fad9c808..7ec7cd0d79 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/groupchoice/GroupSingleChoiceEditor.java @@ -1,19 +1,19 @@ -package com.turbodev.server.web.editable.groupchoice; +package io.onedev.server.web.editable.groupchoice; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.web.component.groupchoice.GroupChoiceProvider; -import com.turbodev.server.web.component.groupchoice.GroupSingleChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.web.component.groupchoice.GroupChoiceProvider; +import io.onedev.server.web.component.groupchoice.GroupSingleChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class GroupSingleChoiceEditor extends PropertyEditor { @@ -30,7 +30,7 @@ public class GroupSingleChoiceEditor extends PropertyEditor { Group group; if (getModelObject() != null) - group = TurboDev.getInstance(GroupManager.class).find(getModelObject()); + group = OneDev.getInstance(GroupManager.class).find(getModelObject()); else group = null; diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/EnumListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/list/EnumListPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/EnumListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/editable/list/EnumListPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.java index 812bb6705e..ab0a136441 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/EnumListPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/EnumListPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list; +package io.onedev.server.web.editable.list; import java.io.Serializable; import java.util.ArrayList; @@ -17,16 +17,16 @@ import org.apache.wicket.util.convert.ConversionException; import org.json.JSONException; import org.json.JSONWriter; -import com.turbodev.utils.WordUtils; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.ExcludeValues; -import com.turbodev.server.web.component.select2.ChoiceProvider; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.Select2MultiChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.ExcludeValues; +import io.onedev.server.web.component.select2.ChoiceProvider; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.Select2MultiChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.utils.WordUtils; @SuppressWarnings({"serial", "unchecked", "rawtypes"}) public class EnumListPropertyEditor extends PropertyEditor>> { @@ -91,9 +91,9 @@ public class EnumListPropertyEditor extends PropertyEditor>> { protected void onInitialize() { super.onInitialize(); getSettings().setPlaceholder("Select " + WordUtils.uncamel(enumClass.getSimpleName()).toLowerCase() + "(s)..."); - getSettings().setFormatResult("turbodev.server.choiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.choiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.choiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup"); setConvertEmptyInputStringToNull(true); } diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/ListEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/list/ListEditSupport.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/editable/list/ListEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/list/ListEditSupport.java index c209f4ee16..cc2ae00650 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/ListEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/ListEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list; +package io.onedev.server.web.editable.list; import java.io.Serializable; import java.util.List; @@ -8,21 +8,21 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import com.turbodev.utils.ClassUtils; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.ChoiceProvider; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; -import com.turbodev.server.web.editable.list.concrete.ConcreteListPropertyEditor; -import com.turbodev.server.web.editable.list.concrete.ConcreteListPropertyViewer; -import com.turbodev.server.web.editable.list.polymorphic.PolymorphicListPropertyEditor; -import com.turbodev.server.web.editable.list.polymorphic.PolymorphicListPropertyViewer; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.ChoiceProvider; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; +import io.onedev.server.web.editable.list.concrete.ConcreteListPropertyEditor; +import io.onedev.server.web.editable.list.concrete.ConcreteListPropertyViewer; +import io.onedev.server.web.editable.list.polymorphic.PolymorphicListPropertyEditor; +import io.onedev.server.web.editable.list.polymorphic.PolymorphicListPropertyViewer; +import io.onedev.utils.ClassUtils; @SuppressWarnings("serial") public class ListEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/StringListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/list/StringListPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/StringListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/editable/list/StringListPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.java index 15fc3adfd8..1eb1406e49 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/StringListPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/StringListPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list; +package io.onedev.server.web.editable.list; import java.io.Serializable; import java.util.ArrayList; @@ -12,15 +12,16 @@ import org.apache.wicket.util.convert.ConversionException; import org.json.JSONException; import org.json.JSONWriter; -import com.turbodev.utils.ReflectionUtils; import com.google.common.base.Preconditions; -import com.turbodev.server.web.component.select2.ChoiceProvider; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.Select2MultiChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; + +import io.onedev.server.web.component.select2.ChoiceProvider; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.Select2MultiChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.utils.ReflectionUtils; @SuppressWarnings("serial") public class StringListPropertyEditor extends PropertyEditor> { @@ -33,9 +34,9 @@ public class StringListPropertyEditor extends PropertyEditor> { public StringListPropertyEditor(String id, PropertyDescriptor propertyDescriptor, IModel> propertyModel) { super(id, propertyDescriptor, propertyModel); - com.turbodev.server.util.editable.annotation.ChoiceProvider choiceProvider = + io.onedev.server.util.editable.annotation.ChoiceProvider choiceProvider = propertyDescriptor.getPropertyGetter().getAnnotation( - com.turbodev.server.util.editable.annotation.ChoiceProvider.class); + io.onedev.server.util.editable.annotation.ChoiceProvider.class); Preconditions.checkNotNull(choiceProvider); for (String each: (List)ReflectionUtils .invokeStaticMethod(propertyDescriptor.getBeanClass(), choiceProvider.value())) { @@ -79,9 +80,9 @@ public class StringListPropertyEditor extends PropertyEditor> { protected void onInitialize() { super.onInitialize(); getSettings().setPlaceholder("Select below..."); - getSettings().setFormatResult("turbodev.server.choiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.choiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.choiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup"); setConvertEmptyInputStringToNull(true); } diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java index 675540f6fb..1d7c57e316 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list.concrete; +package io.onedev.server.web.editable.list.concrete; import static de.agilecoders.wicket.jquery.JQuery.$; @@ -27,18 +27,18 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.utils.ClassUtils; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.web.behavior.sortable.SortBehavior; -import com.turbodev.server.web.behavior.sortable.SortPosition; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.EditorChanged; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PathSegment.Property; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.web.behavior.sortable.SortBehavior; +import io.onedev.server.web.behavior.sortable.SortPosition; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.EditorChanged; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PathSegment.Property; +import io.onedev.utils.ClassUtils; @SuppressWarnings("serial") public class ConcreteListPropertyEditor extends PropertyEditor> { diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html rename to web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java rename to web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java index a25b327c6b..9098f1c88b 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/concrete/ConcreteListPropertyViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list.concrete; +package io.onedev.server.web.editable.list.concrete; import java.io.Serializable; import java.util.ArrayList; @@ -12,10 +12,10 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; @SuppressWarnings("serial") public class ConcreteListPropertyViewer extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java index c379220722..5601a3642f 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list.polymorphic; +package io.onedev.server.web.editable.list.polymorphic; import static de.agilecoders.wicket.jquery.JQuery.$; @@ -24,22 +24,23 @@ import org.apache.wicket.markup.repeater.RepeatingView; import org.apache.wicket.model.IModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.launcher.loader.ImplementationRegistry; -import com.turbodev.utils.ClassUtils; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.ImplementationRegistry; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Horizontal; +import io.onedev.server.util.editable.annotation.Vertical; +import io.onedev.server.web.behavior.sortable.SortBehavior; +import io.onedev.server.web.behavior.sortable.SortPosition; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.EditorChanged; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.utils.ClassUtils; + import com.google.common.base.Preconditions; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Horizontal; -import com.turbodev.server.util.editable.annotation.Vertical; -import com.turbodev.server.web.behavior.sortable.SortBehavior; -import com.turbodev.server.web.behavior.sortable.SortPosition; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.EditorChanged; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class PolymorphicListPropertyEditor extends PropertyEditor> { diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html rename to web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java rename to web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java index 20b18c88fe..719970e423 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java +++ b/web/src/main/java/io/onedev/server/web/editable/list/polymorphic/PolymorphicListPropertyViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.list.polymorphic; +package io.onedev.server.web.editable.list.polymorphic; import java.io.Serializable; import java.lang.reflect.Method; @@ -12,11 +12,11 @@ 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 com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Horizontal; -import com.turbodev.server.util.editable.annotation.Vertical; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.PropertyDescriptor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Horizontal; +import io.onedev.server.util.editable.annotation.Vertical; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.PropertyDescriptor; @SuppressWarnings("serial") public class PolymorphicListPropertyViewer extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/editable/numeric/NumericEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/numeric/NumericEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java index f39fa79000..7e8985514e 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/numeric/NumericEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.numeric; +package io.onedev.server.web.editable.numeric; import java.util.Set; @@ -6,13 +6,13 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class NumericEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/numeric/NumericPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/numeric/NumericPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/numeric/NumericPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/editable/numeric/NumericPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java index 0aff01d1ad..3ca74a4aab 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/numeric/NumericPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/numeric/NumericPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.numeric; +package io.onedev.server.web.editable.numeric; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.TextField; @@ -7,10 +7,10 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class NumericPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/password/ConfirmativePasswordPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/password/ConfirmativePasswordPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java index 024ba4cec9..3a4c9ebf14 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/password/ConfirmativePasswordPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.password; +package io.onedev.server.web.editable.password; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.PasswordTextField; @@ -7,11 +7,11 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class ConfirmativePasswordPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/password/PasswordEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/editable/password/PasswordEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java index bd6831248c..189c0eb1fb 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/password/PasswordEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/password/PasswordEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.password; +package io.onedev.server.web.editable.password; import java.util.Set; @@ -6,14 +6,14 @@ import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; -import com.turbodev.server.util.editable.annotation.Password; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.Password; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class PasswordEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/password/PasswordPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/password/PasswordPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/password/PasswordPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/editable/password/PasswordPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java index 9bb1b96dee..a3e2ba30d4 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/password/PasswordPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/password/PasswordPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.password; +package io.onedev.server.web.editable.password; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.PasswordTextField; @@ -7,11 +7,11 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class PasswordPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java index 2276c366a1..bb27a8c392 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.pathpattern; +package io.onedev.server.web.editable.pathpattern; 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.turbodev.server.util.editable.annotation.PathPattern; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.PathPattern; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class PathPatternEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditor.html b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditor.html rename to web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditor.java b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditor.java rename to web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java index 3cc9eb1c80..bf07a87cbe 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/pathpattern/PathPatternEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/pathpattern/PathPatternEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.pathpattern; +package io.onedev.server.web.editable.pathpattern; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.TextField; @@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.PathPatternAssistBehavior; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.PathPatternAssistBehavior; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public class PathPatternEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicEditSuport.java b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicEditSuport.java rename to web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java index 325e93d8f6..08a4a5cd90 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicEditSuport.java +++ b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicEditSuport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.polymorphic; +package io.onedev.server.web.editable.polymorphic; import java.io.Serializable; import java.util.Set; @@ -6,15 +6,15 @@ import java.util.Set; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.utils.ClassUtils; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; +import io.onedev.utils.ClassUtils; @SuppressWarnings("serial") public class PolymorphicEditSuport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java index f01f60be91..23dc2e2bc9 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.polymorphic; +package io.onedev.server.web.editable.polymorphic; import java.io.Serializable; import java.lang.reflect.Method; @@ -17,20 +17,21 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.launcher.loader.ImplementationRegistry; import com.google.common.base.Preconditions; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Horizontal; -import com.turbodev.server.util.editable.annotation.NullChoice; -import com.turbodev.server.util.editable.annotation.Vertical; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.EditorChanged; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; + +import io.onedev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.ImplementationRegistry; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Horizontal; +import io.onedev.server.util.editable.annotation.NullChoice; +import io.onedev.server.util.editable.annotation.Vertical; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.EditorChanged; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class PolymorphicPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html rename to web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java rename to web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java index d7e89d46c1..e35849221c 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java +++ b/web/src/main/java/io/onedev/server/web/editable/polymorphic/PolymorphicPropertyViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.polymorphic; +package io.onedev.server.web.editable.polymorphic; import java.io.Serializable; import java.lang.reflect.Method; @@ -8,11 +8,11 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Horizontal; -import com.turbodev.server.util.editable.annotation.Vertical; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.PropertyDescriptor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Horizontal; +import io.onedev.server.util.editable.annotation.Vertical; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.PropertyDescriptor; @SuppressWarnings("serial") public class PolymorphicPropertyViewer extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanEditor.html b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanEditor.html rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanEditor.java b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanEditor.java rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.java index d30455a29a..7c12d762a8 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.reflection; +package io.onedev.server.web.editable.reflection; import java.io.Serializable; import java.util.ArrayList; @@ -18,18 +18,18 @@ import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Horizontal; -import com.turbodev.server.util.editable.annotation.OmitName; -import com.turbodev.server.util.editable.annotation.Vertical; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PathSegment.Property; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Horizontal; +import io.onedev.server.util.editable.annotation.OmitName; +import io.onedev.server.util.editable.annotation.Vertical; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PathSegment.Property; @SuppressWarnings("serial") public class ReflectionBeanEditor extends BeanEditor { @@ -146,6 +146,6 @@ public class ReflectionBeanEditor extends BeanEditor { public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript(String.format("turbodev.server.editable.adjustReflectionEditor('%s')", getMarkupId()))); + response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.editable.adjustReflectionEditor('%s')", getMarkupId()))); } } diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanViewer.html b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanViewer.html rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanViewer.java b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanViewer.java rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.java index 11f2aa986b..666bf53a18 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionBeanViewer.java +++ b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionBeanViewer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.reflection; +package io.onedev.server.web.editable.reflection; import java.io.Serializable; import java.lang.reflect.Method; @@ -13,11 +13,11 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.OmitName; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.OmitName; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; @SuppressWarnings("serial") public class ReflectionBeanViewer extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionEditSupport.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionEditSupport.java index c84f71f906..f015797c50 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.reflection; +package io.onedev.server.web.editable.reflection; import java.io.Serializable; import java.util.Set; @@ -6,18 +6,18 @@ import java.util.Set; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.utils.ClassUtils; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.BeanViewer; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.BeanViewer; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; +import io.onedev.utils.ClassUtils; @SuppressWarnings("serial") public class ReflectionEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.java index 5766211451..4d9b5f012d 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/reflection/ReflectionPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/reflection/ReflectionPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.reflection; +package io.onedev.server.web.editable.reflection; import java.io.Serializable; @@ -11,13 +11,13 @@ import org.apache.wicket.markup.html.form.CheckBox; import org.apache.wicket.model.IModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.EditorChanged; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.EditorChanged; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class ReflectionPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java index da34764988..f8948de29e 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.reviewrequirementspec; +package io.onedev.server.web.editable.reviewrequirementspec; 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.turbodev.server.util.editable.annotation.ReviewRequirementSpec; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.ReviewRequirementSpec; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class ReviewRequirementSpecEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html rename to web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java rename to web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java index 8b45cda1be..9181626d95 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/reviewrequirementspec/ReviewRequirementSpecEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.reviewrequirementspec; +package io.onedev.server.web.editable.reviewrequirementspec; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.model.AbstractReadOnlyModel; @@ -6,13 +6,13 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.reviewrequirementspec.ReviewRequirementSpecInput; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.reviewrequirementspec.ReviewRequirementSpecInput; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public class ReviewRequirementSpecEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/string/StringEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/editable/string/StringEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java index 519184c8bb..0e15d434f7 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/string/StringEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/string/StringEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.string; +package io.onedev.server.web.editable.string; import java.util.Set; @@ -7,24 +7,24 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.server.util.editable.annotation.BranchPattern; -import com.turbodev.server.util.editable.annotation.GroupChoice; -import com.turbodev.server.util.editable.annotation.Markdown; -import com.turbodev.server.util.editable.annotation.Multiline; -import com.turbodev.server.util.editable.annotation.Password; -import com.turbodev.server.util.editable.annotation.PathPattern; -import com.turbodev.server.util.editable.annotation.ReviewRequirementSpec; -import com.turbodev.server.util.editable.annotation.TagPattern; -import com.turbodev.server.util.editable.annotation.UserChoice; -import com.turbodev.server.web.component.MultilineLabel; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.BranchPattern; +import io.onedev.server.util.editable.annotation.GroupChoice; +import io.onedev.server.util.editable.annotation.Markdown; +import io.onedev.server.util.editable.annotation.Multiline; +import io.onedev.server.util.editable.annotation.Password; +import io.onedev.server.util.editable.annotation.PathPattern; +import io.onedev.server.util.editable.annotation.ReviewRequirementSpec; +import io.onedev.server.util.editable.annotation.TagPattern; +import io.onedev.server.util.editable.annotation.UserChoice; +import io.onedev.server.web.component.MultilineLabel; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class StringEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/string/StringPropertyEditor.html b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/string/StringPropertyEditor.html rename to web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/string/StringPropertyEditor.java b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/editable/string/StringPropertyEditor.java rename to web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java index 385f9113a3..82b9aa0029 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/string/StringPropertyEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/string/StringPropertyEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.string; +package io.onedev.server.web.editable.string; import java.lang.reflect.Method; @@ -13,15 +13,15 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.Markdown; -import com.turbodev.server.util.editable.annotation.Multiline; -import com.turbodev.server.util.editable.annotation.OmitName; -import com.turbodev.server.web.component.markdown.MarkdownEditor; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.Markdown; +import io.onedev.server.util.editable.annotation.Multiline; +import io.onedev.server.util.editable.annotation.OmitName; +import io.onedev.server.web.component.markdown.MarkdownEditor; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class StringPropertyEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java index d91ca7c015..bcb719da0b 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.tagpattern; +package io.onedev.server.web.editable.tagpattern; 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.turbodev.server.util.editable.annotation.TagPattern; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.annotation.TagPattern; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class TagPatternEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditor.html b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditor.html rename to web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditor.java b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditor.java rename to web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java index b50fdd05c3..acb4544ede 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/tagpattern/TagPatternEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/tagpattern/TagPatternEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.tagpattern; +package io.onedev.server.web.editable.tagpattern; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.form.TextField; @@ -7,13 +7,13 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.behavior.TagPatternAssistBehavior; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.TagPatternAssistBehavior; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public class TagPatternEditor extends PropertyEditor { diff --git a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/editable/userchoice/UserEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java index 6922559a32..4a64d63d2d 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.userchoice; +package io.onedev.server.web.editable.userchoice; 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.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.UserChoice; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.UserChoice; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class UserEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserMultiChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/userchoice/UserMultiChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/editable/userchoice/UserMultiChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java index c7b08da0e1..d83d527886 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserMultiChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.userchoice; +package io.onedev.server.web.editable.userchoice; import java.io.Serializable; import java.util.ArrayList; @@ -9,17 +9,17 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.UserChoice; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.component.userchoice.UserChoiceProvider; -import com.turbodev.server.web.component.userchoice.UserMultiChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.UserChoice; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.component.userchoice.UserChoiceProvider; +import io.onedev.server.web.component.userchoice.UserMultiChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class UserMultiChoiceEditor extends PropertyEditor> { @@ -41,7 +41,7 @@ public class UserMultiChoiceEditor extends PropertyEditor> { List users = new ArrayList<>(); if (getModelObject() != null) { - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); for (String userName: getModelObject()) { User user = userManager.findByName(userName); if (user != null) diff --git a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserSingleChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/userchoice/UserSingleChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/editable/userchoice/UserSingleChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java index 741bd6487b..16a4e5e805 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/userchoice/UserSingleChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java @@ -1,20 +1,20 @@ -package com.turbodev.server.web.editable.userchoice; +package io.onedev.server.web.editable.userchoice; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.UserChoice; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.component.userchoice.UserChoiceProvider; -import com.turbodev.server.web.component.userchoice.UserSingleChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.UserChoice; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.component.userchoice.UserChoiceProvider; +import io.onedev.server.web.component.userchoice.UserSingleChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class UserSingleChoiceEditor extends PropertyEditor { @@ -35,7 +35,7 @@ public class UserSingleChoiceEditor extends PropertyEditor { User user; if (getModelObject() != null) - user = TurboDev.getInstance(UserManager.class).findByName(getModelObject()); + user = OneDev.getInstance(UserManager.class).findByName(getModelObject()); else user = null; diff --git a/web/src/main/java/com/turbodev/server/web/editable/verification/VerificationEditSupport.java b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/editable/verification/VerificationEditSupport.java rename to web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.java index 059a042d88..d10785deda 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/verification/VerificationEditSupport.java +++ b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationEditSupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.verification; +package io.onedev.server.web.editable.verification; 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.turbodev.server.util.editable.EditableUtils; -import com.turbodev.server.util.editable.annotation.VerificationChoice; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.EditSupport; -import com.turbodev.server.web.editable.NotDefinedLabel; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.editable.PropertyViewer; +import io.onedev.server.util.editable.EditableUtils; +import io.onedev.server.util.editable.annotation.VerificationChoice; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.EditSupport; +import io.onedev.server.web.editable.NotDefinedLabel; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.editable.PropertyViewer; @SuppressWarnings("serial") public class VerificationEditSupport implements EditSupport { diff --git a/web/src/main/java/com/turbodev/server/web/editable/verification/VerificationMultiChoiceEditor.html b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/editable/verification/VerificationMultiChoiceEditor.html rename to web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/editable/verification/VerificationMultiChoiceEditor.java b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/editable/verification/VerificationMultiChoiceEditor.java rename to web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java index cb70275965..90ebf5c1db 100644 --- a/web/src/main/java/com/turbodev/server/web/editable/verification/VerificationMultiChoiceEditor.java +++ b/web/src/main/java/io/onedev/server/web/editable/verification/VerificationMultiChoiceEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.editable.verification; +package io.onedev.server.web.editable.verification; import java.io.Serializable; import java.util.ArrayList; @@ -9,12 +9,12 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import com.turbodev.server.web.component.verification.VerificationChoiceProvider; -import com.turbodev.server.web.component.verification.VerificationMultiChoice; -import com.turbodev.server.web.editable.ErrorContext; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.PropertyEditor; +import io.onedev.server.web.component.verification.VerificationChoiceProvider; +import io.onedev.server.web.component.verification.VerificationMultiChoice; +import io.onedev.server.web.editable.ErrorContext; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.PropertyEditor; @SuppressWarnings("serial") public class VerificationMultiChoiceEditor extends PropertyEditor> { diff --git a/web/src/main/java/io/onedev/server/web/img/Img.java b/web/src/main/java/io/onedev/server/web/img/Img.java new file mode 100644 index 0000000000..8af9887503 --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/img/Img.java @@ -0,0 +1,5 @@ +package io.onedev.server.web.img; + +public class Img { + +} diff --git a/web/src/main/java/com/turbodev/server/web/img/apple-touch-icon.png b/web/src/main/java/io/onedev/server/web/img/apple-touch-icon.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/img/apple-touch-icon.png rename to web/src/main/java/io/onedev/server/web/img/apple-touch-icon.png diff --git a/web/src/main/java/com/turbodev/server/web/img/favicon.ico b/web/src/main/java/io/onedev/server/web/img/favicon.ico similarity index 100% rename from web/src/main/java/com/turbodev/server/web/img/favicon.ico rename to web/src/main/java/io/onedev/server/web/img/favicon.ico diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.html b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java index e71eb31999..1ef194b2be 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin; +package io.onedev.server.web.page.admin; import java.util.ArrayList; import java.util.List; @@ -9,21 +9,21 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.sidebar.SidebarPanel; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.page.admin.authenticator.AuthenticatorPage; -import com.turbodev.server.web.page.admin.databasebackup.DatabaseBackupPage; -import com.turbodev.server.web.page.admin.licensemanagement.LicenseManagementPage; -import com.turbodev.server.web.page.admin.mailsetting.MailSettingPage; -import com.turbodev.server.web.page.admin.securitysetting.SecuritySettingPage; -import com.turbodev.server.web.page.admin.serverinformation.ServerInformationPage; -import com.turbodev.server.web.page.admin.serverlog.ServerLogPage; -import com.turbodev.server.web.page.admin.systemsetting.SystemSettingPage; -import com.turbodev.server.web.page.layout.LayoutPage; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.sidebar.SidebarPanel; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage; +import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage; +import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage; +import io.onedev.server.web.page.admin.mailsetting.MailSettingPage; +import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage; +import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage; +import io.onedev.server.web.page.admin.serverlog.ServerLogPage; +import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage; +import io.onedev.server.web.page.layout.LayoutPage; @SuppressWarnings("serial") public abstract class AdministrationPage extends LayoutPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationResourceReference.java b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationResourceReference.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/admin/AdministrationResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/admin/AdministrationResourceReference.java index 6abd54a3b6..c8d92ce813 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin; +package io.onedev.server.web.page.admin; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTab.java b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTab.java rename to web/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java index 0fb2546439..f65ad17de7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTab.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationTab.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.admin; +package io.onedev.server.web.page.admin; import org.apache.wicket.Component; import org.apache.wicket.model.Model; -import com.turbodev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTab; @SuppressWarnings("serial") public class AdministrationTab extends PageTab { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.html b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.html rename to web/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.java b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.java rename to web/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.java index ff06d80a08..aabc018f6f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/AdministrationTabLink.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/AdministrationTabLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin; +package io.onedev.server.web.page.admin; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; @SuppressWarnings("serial") public class AdministrationTabLink extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/administration.css b/web/src/main/java/io/onedev/server/web/page/admin/administration.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/administration.css rename to web/src/main/java/io/onedev/server/web/page/admin/administration.css diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticationToken.java b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticationToken.java rename to web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java index ab80016aa1..c72b7e7dcd 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticationToken.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticationToken.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.admin.authenticator; +package io.onedev.server.web.page.admin.authenticator; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Password; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Password; @Editable public class AuthenticationToken implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorHolder.java b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorHolder.java rename to web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java index face413c3e..58ed5bcf47 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorHolder.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.admin.authenticator; +package io.onedev.server.web.page.admin.authenticator; import java.io.Serializable; -import com.turbodev.server.security.authenticator.Authenticator; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.NullChoice; +import io.onedev.server.security.authenticator.Authenticator; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.NullChoice; @Editable public class AuthenticatorHolder implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorPage.html b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorPage.java b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java index 49270cbdaa..02c7e21efe 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/authenticator/AuthenticatorPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin.authenticator; +package io.onedev.server.web.page.admin.authenticator; import java.io.Serializable; @@ -18,20 +18,21 @@ import org.apache.wicket.util.visit.IVisitor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.utils.ExceptionUtils; import com.google.common.base.Joiner; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.security.authenticator.Authenticated; -import com.turbodev.server.web.behavior.testform.TestFormBehavior; -import com.turbodev.server.web.behavior.testform.TestResult; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.EditorChanged; -import com.turbodev.server.web.editable.PropertyContext; -import com.turbodev.server.web.editable.PropertyEditor; -import com.turbodev.server.web.page.admin.AdministrationPage; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.security.authenticator.Authenticated; +import io.onedev.server.web.behavior.testform.TestFormBehavior; +import io.onedev.server.web.behavior.testform.TestResult; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.EditorChanged; +import io.onedev.server.web.editable.PropertyContext; +import io.onedev.server.web.editable.PropertyEditor; +import io.onedev.server.web.page.admin.AdministrationPage; +import io.onedev.utils.ExceptionUtils; @SuppressWarnings("serial") public class AuthenticatorPage extends AdministrationPage { @@ -45,7 +46,7 @@ public class AuthenticatorPage extends AdministrationPage { super.onInitialize(); AuthenticatorHolder authenticatorHolder = new AuthenticatorHolder(); - authenticatorHolder.setAuthenticator(TurboDev.getInstance(ConfigManager.class).getAuthenticator()); + authenticatorHolder.setAuthenticator(OneDev.getInstance(ConfigManager.class).getAuthenticator()); PropertyEditor authenticatorEditor = PropertyContext.editBean("editor", authenticatorHolder, "authenticator"); @@ -56,7 +57,7 @@ public class AuthenticatorPage extends AdministrationPage { public void onSubmit() { super.onSubmit(); - TurboDev.getInstance(ConfigManager.class).saveAuthenticator(authenticatorHolder.getAuthenticator()); + OneDev.getInstance(ConfigManager.class).saveAuthenticator(authenticatorHolder.getAuthenticator()); getSession().success("External authentication setting has been saved"); } diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/BackupSettingHolder.java b/web/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/BackupSettingHolder.java rename to web/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.java index 306df31220..8b389f8485 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/BackupSettingHolder.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/databasebackup/BackupSettingHolder.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.admin.databasebackup; +package io.onedev.server.web.page.admin.databasebackup; import java.io.Serializable; -import com.turbodev.server.model.support.setting.BackupSetting; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.support.setting.BackupSetting; +import io.onedev.server.util.editable.annotation.Editable; @Editable public class BackupSettingHolder implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/DatabaseBackupPage.html b/web/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/DatabaseBackupPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html index 7cc4dbedea..c248a1edf6 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/DatabaseBackupPage.html +++ b/web/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.html @@ -1,7 +1,7 @@
    - TurboDev stores project meta data into database, and its backup/restore will not affect git repositories. + OneDev stores project meta data into database, and its backup/restore will not affect git repositories. To backup git repositories, you will need to use some file system backup tool to backup directory ""
    diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/web/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/DatabaseBackupPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java index 0c49c78627..7573b59bac 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/databasebackup/DatabaseBackupPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin.databasebackup; +package io.onedev.server.web.page.admin.databasebackup; import java.io.File; import java.io.IOException; @@ -9,14 +9,14 @@ 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.turbodev.utils.FileUtils; -import com.turbodev.utils.ZipUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.StorageManager; -import com.turbodev.server.persistence.PersistManager; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.page.admin.AdministrationPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.StorageManager; +import io.onedev.server.persistence.PersistManager; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.page.admin.AdministrationPage; +import io.onedev.utils.FileUtils; +import io.onedev.utils.ZipUtils; @SuppressWarnings("serial") public class DatabaseBackupPage extends AdministrationPage { @@ -25,16 +25,16 @@ public class DatabaseBackupPage extends AdministrationPage { protected void onInitialize() { super.onInitialize(); - add(new Label("storageDir", TurboDev.getInstance(StorageManager.class).getStorageDir())); + add(new Label("storageDir", OneDev.getInstance(StorageManager.class).getStorageDir())); BackupSettingHolder backupSettingHolder = new BackupSettingHolder(); - backupSettingHolder.setBackupSetting(TurboDev.getInstance(ConfigManager.class).getBackupSetting()); + backupSettingHolder.setBackupSetting(OneDev.getInstance(ConfigManager.class).getBackupSetting()); Form form = new Form("backupSetting") { @Override protected void onSubmit() { super.onSubmit(); - TurboDev.getInstance(ConfigManager.class).saveBackupSetting(backupSettingHolder.getBackupSetting()); + OneDev.getInstance(ConfigManager.class).saveBackupSetting(backupSettingHolder.getBackupSetting()); getSession().success("Backup setting has been updated"); setResponsePage(DatabaseBackupPage.class); @@ -56,7 +56,7 @@ public class DatabaseBackupPage extends AdministrationPage { public void writeData(Attributes attributes) throws IOException { File tempDir = FileUtils.createTempDir("backup"); try { - PersistManager persistManager = TurboDev.getInstance(PersistManager.class); + PersistManager persistManager = OneDev.getInstance(PersistManager.class); persistManager.exportData(tempDir); ZipUtils.zip(tempDir, attributes.getResponse().getOutputStream()); } finally { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/licensemanagement/LicenseManagementPage.html b/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html similarity index 97% rename from web/src/main/java/com/turbodev/server/web/page/admin/licensemanagement/LicenseManagementPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html index dbca6669e0..f4c24ef016 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/licensemanagement/LicenseManagementPage.html +++ b/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.html @@ -45,7 +45,7 @@

    License key can be generated from account at - turbodev.com + onedev.io

    diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/licensemanagement/LicenseManagementPage.java b/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/admin/licensemanagement/LicenseManagementPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java index 6832db23c0..916475ab54 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/licensemanagement/LicenseManagementPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/licensemanagement/LicenseManagementPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin.licensemanagement; +package io.onedev.server.web.page.admin.licensemanagement; import javax.annotation.Nullable; @@ -15,19 +15,18 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.joda.time.DateTime; -import com.turbodev.utils.license.LicenseDetail; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.page.admin.AdministrationPage; -import com.turbodev.server.web.util.ConfirmOnClick; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.page.admin.AdministrationPage; +import io.onedev.server.web.util.ConfirmOnClick; +import io.onedev.utils.license.LicenseDetail; @SuppressWarnings("serial") public class LicenseManagementPage extends AdministrationPage { @@ -40,7 +39,7 @@ public class LicenseManagementPage extends AdministrationPage { @Override protected LicenseDetail load() { - return TurboDev.getInstance(ConfigManager.class).getLicense(); + return OneDev.getInstance(ConfigManager.class).getLicense(); } }; @@ -49,7 +48,7 @@ public class LicenseManagementPage extends AdministrationPage { @Override protected Integer load() { - return TurboDev.getInstance(UserManager.class).count(EntityCriteria.of(User.class)); + return OneDev.getInstance(UserManager.class).count(EntityCriteria.of(User.class)); } }; @@ -88,24 +87,24 @@ public class LicenseManagementPage extends AdministrationPage { }).setVisible(licenseDetail.getRemainingDays()>=0 && licenseDetail.getRemainingDays() < LicenseDetail.ABOUT_TO_EXPIRE_DAYS).setEscapeModelStrings(false)); - String usersInfo = String.format("%d free + %d licensed (add more)", + String usersInfo = String.format("%d free + %d licensed (add more)", LicenseDetail.FREE_LICENSE_USERS, licenseDetail.getLicensedUsers()); fragment.add(new Label("users", usersInfo).setEscapeModelStrings(false)); fragment.add(new Label("issueDate", WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getIssueDate())))); fragment.add(new Label("expirationDate", - WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getExpirationDate())) + " (renew)").setEscapeModelStrings(false)); + WebConstants.DATE_FORMATTER.print(new DateTime(licenseDetail.getExpirationDate())) + " (renew)").setEscapeModelStrings(false)); fragment.add(new Label("issueAccount", licenseDetail.getIssueAccount())); add(fragment); } else { if (getUserCount() > LicenseDetail.FREE_LICENSE_USERS) { String message = String.format("" - + "Free %d-user license. Add additional users", + + "Free %d-user license. Add additional users", LicenseDetail.FREE_LICENSE_USERS); add(new Label(LICENSE_DETAIL_ID, message).setEscapeModelStrings(false)); } else { String message = String.format("" - + "Free %d-user license. Add additional users", + + "Free %d-user license. Add additional users", LicenseDetail.FREE_LICENSE_USERS); add(new Label(LICENSE_DETAIL_ID, message).setEscapeModelStrings(false)); } @@ -154,7 +153,7 @@ public class LicenseManagementPage extends AdministrationPage { error("Invalid license key"); target.add(feedback); } else { - TurboDev.getInstance(ConfigManager.class).saveLicense(license); + OneDev.getInstance(ConfigManager.class).saveLicense(license); setResponsePage(LicenseManagementPage.class); getSession().success("License key applied successfully"); } @@ -195,7 +194,7 @@ public class LicenseManagementPage extends AdministrationPage { @Override public void onClick() { - TurboDev.getInstance(ConfigManager.class).saveLicense(null); + OneDev.getInstance(ConfigManager.class).saveLicense(null); setResponsePage(LicenseManagementPage.class); } diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingHolder.java b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingHolder.java rename to web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java index be7cb46c9f..646b0aac7b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingHolder.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingHolder.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.admin.mailsetting; +package io.onedev.server.web.page.admin.mailsetting; import java.io.Serializable; -import com.turbodev.server.model.support.setting.MailSetting; -import com.turbodev.server.util.editable.annotation.Editable; +import io.onedev.server.model.support.setting.MailSetting; +import io.onedev.server.util.editable.annotation.Editable; @Editable public class MailSettingHolder implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingPage.html b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingPage.java b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java index f96a76de06..110bfb918c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/mailsetting/MailSettingPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin.mailsetting; +package io.onedev.server.web.page.admin.mailsetting; import java.io.Serializable; @@ -13,18 +13,19 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.collect.Sets; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.behavior.testform.TestFormBehavior; -import com.turbodev.server.web.behavior.testform.TestResult; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.EditorChanged; -import com.turbodev.server.web.page.admin.AdministrationPage; -import com.turbodev.utils.ExceptionUtils; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.web.behavior.testform.TestFormBehavior; +import io.onedev.server.web.behavior.testform.TestResult; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.EditorChanged; +import io.onedev.server.web.page.admin.AdministrationPage; +import io.onedev.utils.ExceptionUtils; @SuppressWarnings("serial") public class MailSettingPage extends AdministrationPage { @@ -36,7 +37,7 @@ public class MailSettingPage extends AdministrationPage { super.onInitialize(); MailSettingHolder mailSettingHolder = new MailSettingHolder(); - mailSettingHolder.setMailSetting(TurboDev.getInstance(ConfigManager.class).getMailSetting()); + mailSettingHolder.setMailSetting(OneDev.getInstance(ConfigManager.class).getMailSetting()); BeanEditor editor = BeanContext.editBean("editor", mailSettingHolder); @@ -46,7 +47,7 @@ public class MailSettingPage extends AdministrationPage { public void onSubmit() { super.onSubmit(); - TurboDev.getInstance(ConfigManager.class).saveMailSetting(mailSettingHolder.getMailSetting()); + OneDev.getInstance(ConfigManager.class).saveMailSetting(mailSettingHolder.getMailSetting()); getSession().success("Mail setting has been saved"); } @@ -63,11 +64,11 @@ public class MailSettingPage extends AdministrationPage { @Override protected TestResult test() { - User currentUser = TurboDev.getInstance(UserManager.class).getCurrent(); + User currentUser = OneDev.getInstance(UserManager.class).getCurrent(); try { - TurboDev.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(), + OneDev.getInstance(MailManager.class).sendMail(mailSettingHolder.getMailSetting(), Sets.newHashSet(currentUser.getEmail()), - "Test email from TurboDev", "Great, your mail setting is working!"); + "Test email from OneDev", "Great, your mail setting is working!"); return new TestResult.Successful("Test mail has been sent to " + currentUser.getEmail() + ", please check your mail box."); } catch (Exception e) { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/securitysetting/SecuritySettingPage.html b/web/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/securitysetting/SecuritySettingPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/securitysetting/SecuritySettingPage.java b/web/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java similarity index 51% rename from web/src/main/java/com/turbodev/server/web/page/admin/securitysetting/SecuritySettingPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java index 67d0d25ef4..57873f2530 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/securitysetting/SecuritySettingPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/securitysetting/SecuritySettingPage.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.page.admin.securitysetting; +package io.onedev.server.web.page.admin.securitysetting; import org.apache.wicket.markup.html.form.Form; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.model.support.setting.SecuritySetting; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.page.admin.AdministrationPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.model.support.setting.SecuritySetting; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.page.admin.AdministrationPage; @SuppressWarnings("serial") public class SecuritySettingPage extends AdministrationPage { @@ -15,14 +15,14 @@ public class SecuritySettingPage extends AdministrationPage { protected void onInitialize() { super.onInitialize(); - SecuritySetting securitySetting = TurboDev.getInstance(ConfigManager.class).getSecuritySetting(); + SecuritySetting securitySetting = OneDev.getInstance(ConfigManager.class).getSecuritySetting(); Form form = new Form("securitySetting") { @Override protected void onSubmit() { super.onSubmit(); - TurboDev.getInstance(ConfigManager.class).saveSecuritySetting(securitySetting); + OneDev.getInstance(ConfigManager.class).saveSecuritySetting(securitySetting); getSession().success("Security setting has been updated"); setResponsePage(SecuritySettingPage.class); diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/serverinformation/ServerInformationPage.html b/web/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/serverinformation/ServerInformationPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/serverinformation/ServerInformationPage.java b/web/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/admin/serverinformation/ServerInformationPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java index c62060cd27..bff26f6325 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/serverinformation/ServerInformationPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/serverinformation/ServerInformationPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin.serverinformation; +package io.onedev.server.web.page.admin.serverinformation; import java.util.Date; @@ -6,12 +6,11 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.utils.FileUtils; -import com.turbodev.server.web.page.admin.AdministrationPage; -import com.turbodev.server.web.util.DateUtils; - import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar; import de.agilecoders.wicket.core.markup.html.bootstrap.components.progress.ProgressBar.Type; +import io.onedev.server.web.page.admin.AdministrationPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.utils.FileUtils; @SuppressWarnings("serial") public class ServerInformationPage extends AdministrationPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/serverlog/ServerLogPage.html b/web/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/serverlog/ServerLogPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/serverlog/ServerLogPage.java b/web/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/admin/serverlog/ServerLogPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java index 62d363c64f..80f78ef8b5 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/serverlog/ServerLogPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.admin.serverlog; +package io.onedev.server.web.page.admin.serverlog; import java.util.List; @@ -7,9 +7,10 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.ResourceLink; import com.google.common.base.Joiner; -import com.turbodev.server.web.page.admin.AdministrationPage; -import com.turbodev.server.web.util.resource.ServerLogResource; -import com.turbodev.server.web.util.resource.ServerLogResourceReference; + +import io.onedev.server.web.page.admin.AdministrationPage; +import io.onedev.server.web.util.resource.ServerLogResource; +import io.onedev.server.web.util.resource.ServerLogResourceReference; @SuppressWarnings("serial") public class ServerLogPage extends AdministrationPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/systemsetting/SystemSettingPage.html b/web/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/admin/systemsetting/SystemSettingPage.html rename to web/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/admin/systemsetting/SystemSettingPage.java b/web/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java similarity index 51% rename from web/src/main/java/com/turbodev/server/web/page/admin/systemsetting/SystemSettingPage.java rename to web/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java index edc507418e..464491ddb7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/admin/systemsetting/SystemSettingPage.java +++ b/web/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.page.admin.systemsetting; +package io.onedev.server.web.page.admin.systemsetting; import org.apache.wicket.markup.html.form.Form; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.model.support.setting.SystemSetting; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.page.admin.AdministrationPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.model.support.setting.SystemSetting; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.page.admin.AdministrationPage; @SuppressWarnings("serial") public class SystemSettingPage extends AdministrationPage { @@ -15,14 +15,14 @@ public class SystemSettingPage extends AdministrationPage { protected void onInitialize() { super.onInitialize(); - SystemSetting systemSetting = TurboDev.getInstance(ConfigManager.class).getSystemSetting(); + SystemSetting systemSetting = OneDev.getInstance(ConfigManager.class).getSystemSetting(); Form form = new Form("form") { @Override protected void onSubmit() { super.onSubmit(); - TurboDev.getInstance(ConfigManager.class).saveSystemSetting(systemSetting); + OneDev.getInstance(ConfigManager.class).saveSystemSetting(systemSetting); getSession().success("System setting has been updated"); setResponsePage(SystemSettingPage.class); diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.java b/web/src/main/java/io/onedev/server/web/page/base/BaseCssResourceReference.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/base/BaseCssResourceReference.java index 1b998a714d..87912bb42c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/BaseCssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/base/BaseCssResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.base; +package io.onedev.server.web.page.base; import java.util.List; @@ -6,9 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.asset.fontext.FontExtResourceReference; - import de.agilecoders.wicket.core.Bootstrap; +import io.onedev.server.web.asset.fontext.FontExtResourceReference; public class BaseCssResourceReference extends CssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BaseDependentCssResourceReference.java b/web/src/main/java/io/onedev/server/web/page/base/BaseDependentCssResourceReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/base/BaseDependentCssResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/base/BaseDependentCssResourceReference.java index 2d610e0632..42bb9a284c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/BaseDependentCssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/base/BaseDependentCssResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.base; +package io.onedev.server.web.page.base; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BaseDependentResourceReference.java b/web/src/main/java/io/onedev/server/web/page/base/BaseDependentResourceReference.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/page/base/BaseDependentResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/base/BaseDependentResourceReference.java index 8acebfe48a..5a17ffbb34 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/BaseDependentResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/base/BaseDependentResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.base; +package io.onedev.server.web.page.base; import java.util.ArrayList; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.html b/web/src/main/java/io/onedev/server/web/page/base/BasePage.html similarity index 95% rename from web/src/main/java/com/turbodev/server/web/page/base/BasePage.html rename to web/src/main/java/io/onedev/server/web/page/base/BasePage.html index 8ba9582b4a..770eee35b2 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.html +++ b/web/src/main/java/io/onedev/server/web/page/base/BasePage.html @@ -5,7 +5,7 @@ - + diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.java b/web/src/main/java/io/onedev/server/web/page/base/BasePage.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/base/BasePage.java rename to web/src/main/java/io/onedev/server/web/page/base/BasePage.java index 4fe0615c92..8e0dc42885 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/BasePage.java +++ b/web/src/main/java/io/onedev/server/web/page/base/BasePage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.base; +package io.onedev.server.web.page.base; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -39,16 +39,16 @@ import org.apache.wicket.util.time.Duration; import org.eclipse.jetty.servlet.ServletContextHandler; import org.unbescape.javascript.JavaScriptEscape; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.page.init.ServerInitPage; -import com.turbodev.server.web.page.security.LoginPage; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.WebSocketManager; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.page.init.ServerInitPage; +import io.onedev.server.web.page.security.LoginPage; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.WebSocketManager; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public abstract class BasePage extends WebPage { @@ -93,9 +93,9 @@ public abstract class BasePage extends WebPage { else autosaveKeyToClear = "undefined"; response.render(OnDomReadyHeaderItem.forScript( - String.format("turbodev.server.onDomReady(%s);", + String.format("onedev.server.onDomReady(%s);", autosaveKeyToClear))); - response.render(OnLoadHeaderItem.forScript("turbodev.server.onWindowLoad();")); + response.render(OnLoadHeaderItem.forScript("onedev.server.onWindowLoad();")); } }); @@ -142,14 +142,14 @@ public abstract class BasePage extends WebPage { byte[] bytes = Base64.decodeBase64(encodedData.getBytes()); Serializable data = (Serializable) SerializationUtils.deserialize(bytes); onPopState(target, data); - target.appendJavaScript("turbodev.server.viewState.getFromHistoryAndSetToView();"); + target.appendJavaScript("onedev.server.viewState.getFromHistoryAndSetToView();"); } @Override public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); - String script = String.format("turbodev.server.history.init(%s);", + String script = String.format("onedev.server.history.init(%s);", getCallbackFunction(explicit("data"))); response.render(OnDomReadyHeaderItem.forScript(script)); } @@ -207,7 +207,7 @@ public abstract class BasePage extends WebPage { public void pushState(IPartialPageRequestHandler partialPageRequestHandler, String url, Serializable data) { String encodedData = new String(Base64.encodeBase64(SerializationUtils.serialize(data))); - String script = String.format("turbodev.server.history.pushState('%s', '%s');", url, encodedData); + String script = String.format("onedev.server.history.pushState('%s', '%s');", url, encodedData); partialPageRequestHandler.prependJavaScript(script); } @@ -230,7 +230,7 @@ public abstract class BasePage extends WebPage { } private void checkReady() { - if (!TurboDev.getInstance().isReady() && getClass() != ServerInitPage.class) + if (!OneDev.getInstance().isReady() && getClass() != ServerInitPage.class) throw new RestartResponseAtInterceptPageException(ServerInitPage.class); } @@ -244,7 +244,7 @@ public abstract class BasePage extends WebPage { @Nullable protected final User getLoginUser() { - return TurboDev.getInstance(UserManager.class).getCurrent(); + return OneDev.getInstance(UserManager.class).getCurrent(); } public void unauthorized() { @@ -255,7 +255,7 @@ public abstract class BasePage extends WebPage { } protected final String getPageTitle() { - return "TurboDev - Git Management and Code Review"; + return "OneDev - Git Management and Code Review"; }; protected int getPageRefreshInterval() { diff --git a/web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.java b/web/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java index 5883ce82b8..586f44aa00 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/BaseResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/base/BaseResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.base; +package io.onedev.server.web.page.base; import java.util.ArrayList; import java.util.List; @@ -8,13 +8,12 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.server.web.asset.align.AlignResourceReference; -import com.turbodev.server.web.asset.areyousure.AreYouSureResourceReference; -import com.turbodev.server.web.asset.autosize.AutoSizeResourceReference; -import com.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference; - import de.agilecoders.wicket.core.Bootstrap; +import io.onedev.server.web.asset.align.AlignResourceReference; +import io.onedev.server.web.asset.areyousure.AreYouSureResourceReference; +import io.onedev.server.web.asset.autosize.AutoSizeResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.perfectscrollbar.PerfectScrollbarResourceReference; public class BaseResourceReference extends JavaScriptResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/base/SessionFeedbackPanel.java b/web/src/main/java/io/onedev/server/web/page/base/SessionFeedbackPanel.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/base/SessionFeedbackPanel.java rename to web/src/main/java/io/onedev/server/web/page/base/SessionFeedbackPanel.java index c07a4ca562..9e68112fe7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/SessionFeedbackPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/base/SessionFeedbackPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.base; +package io.onedev.server.web.page.base; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.feedback.FeedbackMessage; @@ -47,7 +47,7 @@ public class SessionFeedbackPanel extends FeedbackPanel { super.renderHead(response); // we delay show feedback with a timer as some other script may scroll the window - response.render(OnDomReadyHeaderItem.forScript("setTimeout('turbodev.server.showSessionFeedback();', 1);")); + response.render(OnDomReadyHeaderItem.forScript("setTimeout('onedev.server.showSessionFeedback();', 1);")); } } diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.css b/web/src/main/java/io/onedev/server/web/page/base/base.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/base/base.css rename to web/src/main/java/io/onedev/server/web/page/base/base.css diff --git a/web/src/main/java/com/turbodev/server/web/page/base/base.js b/web/src/main/java/io/onedev/server/web/page/base/base.js similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/base/base.js rename to web/src/main/java/io/onedev/server/web/page/base/base.js index fb1899583a..40c935f0ef 100644 --- a/web/src/main/java/com/turbodev/server/web/page/base/base.js +++ b/web/src/main/java/io/onedev/server/web/page/base/base.js @@ -1,8 +1,8 @@ -var turbodev = {}; +var onedev = {}; String.prototype.escape = function() { return (this + '').replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0'); }; -turbodev.server = { +onedev.server = { setupCollapse: function(triggerId, targetId) { var trigger = $("#" + triggerId); var target = $("#" + targetId); @@ -104,12 +104,12 @@ turbodev.server = { */ markDirty: function($forms) { $forms.addClass("dirty").each(function() { - turbodev.server.form.dirtyChanged($(this)); + onedev.server.form.dirtyChanged($(this)); }); }, markClean: function($forms) { $forms.removeClass("dirty").each(function() { - turbodev.server.form.dirtyChanged($(this)); + onedev.server.form.dirtyChanged($(this)); }); }, removeDirty: function(triggerId, $forms) { @@ -128,7 +128,7 @@ turbodev.server = { $trigger.unbind('click'); $trigger.click(function(event){ - turbodev.server.form.markClean($forms); + onedev.server.form.markClean($forms); previousClick(event); }); }); @@ -140,13 +140,13 @@ turbodev.server = { "silent": !$form.hasClass("leave-confirm"), "addRemoveFieldsMarksDirty": true, change: function() { - turbodev.server.form.dirtyChanged($(this)); + onedev.server.form.dirtyChanged($(this)); } }); if ($form.find(".has-error").length != 0) { $form.addClass("dirty"); } - turbodev.server.form.dirtyChanged($form); + onedev.server.form.dirtyChanged($form); } }, dirtyChanged: function($form) { @@ -161,7 +161,7 @@ turbodev.server = { }, setupDirtyCheck: function() { $("form").each(function() { - turbodev.server.form.trackDirty(this); + onedev.server.form.trackDirty(this); }); $(document).on("elementReplaced", function(event, componentId) { @@ -170,7 +170,7 @@ turbodev.server = { if ($component.is("form")) $forms = $forms.add($component); $forms.each(function() { - turbodev.server.form.trackDirty(this); + onedev.server.form.trackDirty(this); }); var $form = $component.closest("form").not($component); if ($form.find(".dirty-aware").length != 0 || $form.hasClass("leave-confirm")) @@ -205,7 +205,7 @@ turbodev.server = { var $dirtyForms = $container.find(selector).addBack(selector); if ($dirtyForms.length != 0) { if (confirm("There are unsaved changes, do you want to discard and continue?")) { - turbodev.server.form.clearAutosavings($dirtyForms); + onedev.server.form.clearAutosavings($dirtyForms); return true; } else { return false; @@ -250,10 +250,10 @@ turbodev.server = { track: function() { Wicket.Event.subscribe('/ajax/call/beforeSend', function() { - turbodev.server.ajaxRequests.count++; + onedev.server.ajaxRequests.count++; }); Wicket.Event.subscribe('/ajax/call/done', function() { - turbodev.server.ajaxRequests.count--; + onedev.server.ajaxRequests.count--; }); } }, @@ -295,8 +295,8 @@ turbodev.server = { focusOn: function(componentId) { if (componentId) - turbodev.server.focus.doFocus($("#" + componentId)); - turbodev.server.focus.$components = null; + onedev.server.focus.doFocus($("#" + componentId)); + onedev.server.focus.$components = null; }, doFocus: function($containers) { @@ -320,24 +320,24 @@ turbodev.server = { if (typeof(Wicket) != "undefined" && typeof(Wicket.Focus) != "undefined") { var wicketSetFocusOnId = Wicket.Focus.setFocusOnId; Wicket.Focus.setFocusOnId = function(componentId) { - turbodev.server.focus.focusOn(componentId); + onedev.server.focus.focusOn(componentId); wicketSetFocusOnId(componentId); } } Wicket.Event.subscribe('/ajax/call/beforeSend', function() { - turbodev.server.focus.$components = $(); + onedev.server.focus.$components = $(); }); Wicket.Event.subscribe('/ajax/call/complete', function() { - if (turbodev.server.focus.$components != null) - turbodev.server.focus.doFocus(turbodev.server.focus.$components); + if (onedev.server.focus.$components != null) + onedev.server.focus.doFocus(onedev.server.focus.$components); }); - turbodev.server.focus.doFocus($(document)); + onedev.server.focus.doFocus($(document)); $(document).on("elementReplaced", function(event, componentId) { - if (turbodev.server.focus.$components != null) - turbodev.server.focus.$components = turbodev.server.focus.$components.add("#" + componentId); + if (onedev.server.focus.$components != null) + onedev.server.focus.$components = onedev.server.focus.$components.add("#" + componentId); }); }, @@ -377,7 +377,7 @@ turbodev.server = { Wicket.Event.subscribe("/websocket/message", function(jqEvent, message) { if (message == "RenderCallback") { function requestToRender() { - if (turbodev.server.ajaxRequests.count != 0) { + if (onedev.server.ajaxRequests.count != 0) { setTimeout(function() { requestToRender(); }, 10); @@ -412,7 +412,7 @@ turbodev.server = { return $innerMost; }, getFromView: function() { - var $innerMost = turbodev.server.viewState.getInnerMostAutoFit(); + var $innerMost = onedev.server.viewState.getInnerMostAutoFit(); if ($innerMost) { return $innerMost.triggerHandler("getViewState"); } else { @@ -420,7 +420,7 @@ turbodev.server = { } }, setToView: function(viewState) { - var $innerMost = turbodev.server.viewState.getInnerMostAutoFit(); + var $innerMost = onedev.server.viewState.getInnerMostAutoFit(); if ($innerMost) { $innerMost.triggerHandler("setViewState", viewState); } @@ -437,20 +437,20 @@ turbodev.server = { state = {}; var newState = {viewState: viewState, data: state.data, visited: state.visited}; history.replaceState(newState, '', window.location.href ); - turbodev.server.history.current = { + onedev.server.history.current = { state: newState, url: window.location.href }; }, getFromViewAndSetToHistory: function() { - var viewState = turbodev.server.viewState.getFromView(); + var viewState = onedev.server.viewState.getFromView(); if (viewState) - turbodev.server.viewState.setToHistory(viewState); + onedev.server.viewState.setToHistory(viewState); }, getFromHistoryAndSetToView: function() { - var viewState = turbodev.server.viewState.getFromHistory(); + var viewState = onedev.server.viewState.getFromHistory(); if (viewState) - turbodev.server.viewState.setToView(viewState); + onedev.server.viewState.setToView(viewState); } }, @@ -468,14 +468,14 @@ turbodev.server = { // infinitely setTimeout(function() { window.onpopstate = function(event) { - if (turbodev.server.history.getHashlessUrl(window.location.href) - != turbodev.server.history.getHashlessUrl(turbodev.server.history.current.url)) { - if (turbodev.server.form.confirmLeave()) { + if (onedev.server.history.getHashlessUrl(window.location.href) + != onedev.server.history.getHashlessUrl(onedev.server.history.current.url)) { + if (onedev.server.form.confirmLeave()) { if (!event.state || !event.state.data) { location.reload(); } else { callback(event.state.data); - turbodev.server.history.current = { + onedev.server.history.current = { state: event.state, url: window.location.href }; @@ -485,27 +485,27 @@ turbodev.server = { * In case we want to stay in the page, we should also re-push previous url * as url has already been changed when user hits back/forward button */ - history.pushState(turbodev.server.history.current.state, '' , - turbodev.server.history.current.url); + history.pushState(onedev.server.history.current.state, '' , + onedev.server.history.current.url); } } else { - turbodev.server.viewState.getFromHistoryAndSetToView(); + onedev.server.viewState.getFromHistoryAndSetToView(); } }; }, 100); - turbodev.server.history.current = { + onedev.server.history.current = { url: window.location.href }; }, pushState: function(url, data) { var state = {data: data}; - turbodev.server.history.current = {state: state, url: url}; + onedev.server.history.current = {state: state, url: url}; history.pushState(state, '', url); // Let others have a chance to do something before marking the page as visited setTimeout(function() { - turbodev.server.history.setVisited(); + onedev.server.history.setVisited(); }, 100); }, @@ -522,7 +522,7 @@ turbodev.server = { if (!state.visited) { var newState = {viewState: state.viewState, data: state.data, visited: true}; history.replaceState(newState, '', window.location.href); - turbodev.server.history.current = { + onedev.server.history.current = { state: newState, url: window.location.href }; @@ -577,35 +577,35 @@ turbodev.server = { moved: false, track: function() { $(document).mousedown(function() { - turbodev.server.mouseState.pressed = true; - turbodev.server.mouseState.moved = false; + onedev.server.mouseState.pressed = true; + onedev.server.mouseState.moved = false; }); $(document).mouseup(function() { - turbodev.server.mouseState.pressed = false; - turbodev.server.mouseState.moved = false; + onedev.server.mouseState.pressed = false; + onedev.server.mouseState.moved = false; }); $(document).mousemove(function(e) { // IE fires mouse move event after mouse click sometimes, so we check // if mouse is really moved here if (e.clientX != self.clientX || e.clientY != self.clientY) { - turbodev.server.mouseState.moved = true; + onedev.server.mouseState.moved = true; self.clientX = e.clientX; self.clientY = e.clientY; } }); $(document).scroll(function() { - turbodev.server.mouseState.moved = false; + onedev.server.mouseState.moved = false; }); } }, onDomReady: function(autosaveKeyToClear, minWindowWidth) { - turbodev.server.setupAjaxLoadingIndicator(); - turbodev.server.form.setupDirtyCheck(); - turbodev.server.focus.setupAutoFocus(); - turbodev.server.setupWebsocketCallback(); - turbodev.server.mouseState.track(); - turbodev.server.ajaxRequests.track(); + onedev.server.setupAjaxLoadingIndicator(); + onedev.server.form.setupDirtyCheck(); + onedev.server.focus.setupAutoFocus(); + onedev.server.setupWebsocketCallback(); + onedev.server.mouseState.track(); + onedev.server.ajaxRequests.track(); if (autosaveKeyToClear) localStorage.removeItem(autosaveKeyToClear); @@ -616,22 +616,22 @@ turbodev.server = { }); window.onunload = function() { - turbodev.server.form.clearAutosavings($("form.leave-confirm.dirty")); + onedev.server.form.clearAutosavings($("form.leave-confirm.dirty")); }; }, onWindowLoad: function() { - turbodev.server.setupAutoSize(); + onedev.server.setupAutoSize(); /* * Browser will also issue resize event after window is loaded, but that is too late, * as getFromHistoryAndSetToView() must be happened after view size has been adjusted */ $(window).resize(); - turbodev.server.viewState.getFromHistoryAndSetToView(); + onedev.server.viewState.getFromHistoryAndSetToView(); // Let others have a chance to do something before marking the page as visited setTimeout(function() { - turbodev.server.history.setVisited(); + onedev.server.history.setVisited(); }, 100); /* @@ -640,7 +640,7 @@ turbodev.server = { */ /* $(window).on("beforeunload", function() { - turbodev.server.viewState.getFromViewAndSetToHistory(); + onedev.server.viewState.getFromViewAndSetToHistory(); }); */ } diff --git a/web/src/main/java/com/turbodev/server/web/page/error/BaseErrorPage.java b/web/src/main/java/io/onedev/server/web/page/error/BaseErrorPage.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/error/BaseErrorPage.java rename to web/src/main/java/io/onedev/server/web/page/error/BaseErrorPage.java index 4bc3a6136e..d5a1995733 100644 --- a/web/src/main/java/com/turbodev/server/web/page/error/BaseErrorPage.java +++ b/web/src/main/java/io/onedev/server/web/page/error/BaseErrorPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.error; +package io.onedev.server.web.page.error; import java.io.Serializable; @@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public abstract class BaseErrorPage extends BasePage { diff --git a/web/src/main/java/com/turbodev/server/web/page/error/ErrorPageResourceReference.java b/web/src/main/java/io/onedev/server/web/page/error/ErrorPageResourceReference.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/error/ErrorPageResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/error/ErrorPageResourceReference.java index 88d06c1fba..b7083281dd 100644 --- a/web/src/main/java/com/turbodev/server/web/page/error/ErrorPageResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/error/ErrorPageResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.error; +package io.onedev.server.web.page.error; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class ErrorPageResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html b/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.html rename to web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.java b/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.java rename to web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java index 592ce3d68d..228046a95f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/error/ExpectedExceptionPage.java +++ b/web/src/main/java/io/onedev/server/web/page/error/ExpectedExceptionPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.error; +package io.onedev.server.web.page.error; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -7,10 +7,10 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.util.string.Strings; -import com.turbodev.server.web.component.MultilineLabel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.utils.WordUtils; +import io.onedev.server.web.component.MultilineLabel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.utils.WordUtils; @SuppressWarnings("serial") public class ExpectedExceptionPage extends BaseErrorPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html b/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.html similarity index 97% rename from web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html rename to web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.html index 3d97cf9289..225f11b72b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.html +++ b/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.html @@ -45,10 +45,10 @@
    Whoops! An Unexpected Exception Occurred
    Sorry, we've encountered an unexpected - exception. If you believe it is a bug of TurboDev, please send this + exception. If you believe it is a bug of OneDev, please send this error using below form to help us improving quality of the product
    - +
    diff --git a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.java b/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.java rename to web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java index 064a6eb95b..3cb83e5c91 100644 --- a/web/src/main/java/com/turbodev/server/web/page/error/UnexpectedExceptionPage.java +++ b/web/src/main/java/io/onedev/server/web/page/error/UnexpectedExceptionPage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.turbodev.server.web.page.error; +package io.onedev.server.web.page.error; import java.io.Serializable; import java.net.InetAddress; @@ -33,13 +33,13 @@ import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.Model; import org.apache.wicket.util.string.Strings; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.StringUtils; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.model.User; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.utils.FileUtils; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public class UnexpectedExceptionPage extends BaseErrorPage { @@ -98,12 +98,12 @@ public class UnexpectedExceptionPage extends BaseErrorPage { System.getProperty("java.vm.name") + " " + System.getProperty("java.version") + ", " + System.getProperty("java.vm.vendor"))); - serverProps.add(new Property("TurboDev Version", "EAP")); + serverProps.add(new Property("OneDev Version", "EAP")); User user = getLoginUser(); if (user != null) - serverProps.add(new Property("TurboDev User", user.getName())); + serverProps.add(new Property("OneDev User", user.getName())); else - serverProps.add(new Property("TurboDev User", "")); + serverProps.add(new Property("OneDev User", "")); serverProps.add(new Property("Total Memory", FileUtils.byteCountToDisplaySize(Runtime.getRuntime().maxMemory()))); serverProps.add(new Property("Used Memory", @@ -127,7 +127,7 @@ public class UnexpectedExceptionPage extends BaseErrorPage { @Override protected void onComponentTag(ComponentTag tag) { super.onComponentTag(tag); - tag.put("value", TurboDev.getInstance(ConfigManager.class).getSystemSetting().getServerUrl()); + tag.put("value", OneDev.getInstance(ConfigManager.class).getSystemSetting().getServerUrl()); } }); diff --git a/web/src/main/java/com/turbodev/server/web/page/error/error-page.css b/web/src/main/java/io/onedev/server/web/page/error/error-page.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/error/error-page.css rename to web/src/main/java/io/onedev/server/web/page/error/error-page.css diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupAuthorizationsPage.html b/web/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupAuthorizationsPage.html rename to web/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupAuthorizationsPage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupAuthorizationsPage.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.java index a66403491b..3d607e9868 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupAuthorizationsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupAuthorizationsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import java.util.ArrayList; import java.util.Collection; @@ -33,31 +33,31 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.GroupAuthorizationManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.GroupAuthorization; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.datatable.SelectionColumn; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.projectchoice.AbstractProjectChoiceProvider; -import com.turbodev.server.web.component.projectchoice.ProjectChoiceResourceReference; -import com.turbodev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; -import com.turbodev.server.web.component.select2.SelectToAddChoice; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.GroupAuthorizationManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.GroupAuthorization; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.datatable.SelectionColumn; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.projectchoice.AbstractProjectChoiceProvider; +import io.onedev.server.web.component.projectchoice.ProjectChoiceResourceReference; +import io.onedev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.server.web.component.select2.SelectToAddChoice; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public class GroupAuthorizationsPage extends GroupPage { @@ -104,7 +104,7 @@ public class GroupAuthorizationsPage extends GroupPage { @Override public void query(String term, int page, Response response) { List notAuthorizedProjects = new ArrayList<>(); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); Collection authorizedProjectIds = new HashSet<>(); for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) { if (authorization.getGroupId().equals(getGroup().getId())) @@ -137,17 +137,17 @@ public class GroupAuthorizationsPage extends GroupPage { super.onInitialize(); getSettings().setPlaceholder("Add project..."); - getSettings().setFormatResult("turbodev.server.projectChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.projectChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.projectChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup"); } @Override protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) { GroupAuthorization authorization = new GroupAuthorization(); authorization.setGroup(getGroup()); - authorization.setProject(TurboDev.getInstance(ProjectManager.class).load(selection.getId())); - TurboDev.getInstance(GroupAuthorizationManager.class).save(authorization); + authorization.setProject(OneDev.getInstance(ProjectManager.class).load(selection.getId())); + OneDev.getInstance(GroupAuthorizationManager.class).save(authorization); target.add(authorizationsTable); Session.get().success("Project added"); } @@ -169,7 +169,7 @@ public class GroupAuthorizationsPage extends GroupPage { for (IModel model: selectionColumn.getSelections()) { authorizationsToDelete.add(model.getObject()); } - TurboDev.getInstance(GroupAuthorizationManager.class).delete(authorizationsToDelete); + OneDev.getInstance(GroupAuthorizationManager.class).delete(authorizationsToDelete); target.add(authorizationsTable); selectionColumn.getSelections().clear(); target.add(this); @@ -234,7 +234,7 @@ public class GroupAuthorizationsPage extends GroupPage { dropdown.close(); GroupAuthorization authorization = rowModel.getObject(); authorization.setPrivilege(privilege); - TurboDev.getInstance(GroupAuthorizationManager.class).save(authorization); + OneDev.getInstance(GroupAuthorizationManager.class).save(authorization); target.add(fragment); } @@ -262,13 +262,13 @@ public class GroupAuthorizationsPage extends GroupPage { public Iterator iterator(long first, long count) { EntityCriteria criteria = getCriteria(); criteria.addOrder(Order.desc("id")); - return TurboDev.getInstance(GroupAuthorizationManager.class).findRange(criteria, (int)first, + return OneDev.getInstance(GroupAuthorizationManager.class).findRange(criteria, (int)first, (int)count).iterator(); } @Override public long size() { - return TurboDev.getInstance(GroupAuthorizationManager.class).count(getCriteria()); + return OneDev.getInstance(GroupAuthorizationManager.class).count(getCriteria()); } @Override @@ -278,7 +278,7 @@ public class GroupAuthorizationsPage extends GroupPage { @Override protected GroupAuthorization load() { - return TurboDev.getInstance(GroupAuthorizationManager.class).load(id); + return OneDev.getInstance(GroupAuthorizationManager.class).load(id); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupListPage.html b/web/src/main/java/io/onedev/server/web/page/group/GroupListPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupListPage.html rename to web/src/main/java/io/onedev/server/web/page/group/GroupListPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupListPage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupListPage.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupListPage.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupListPage.java index 2a7cd586c2..99cf19c80c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupListPage.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupListPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import java.util.ArrayList; import java.util.Iterator; @@ -27,20 +27,20 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.link.LabelLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.util.ConfirmOnClick; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.link.LabelLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.util.ConfirmOnClick; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class GroupListPage extends LayoutPage { @@ -150,7 +150,7 @@ public class GroupListPage extends LayoutPage { @Override public void onClick() { - TurboDev.getInstance(GroupManager.class).delete(rowModel.getObject()); + OneDev.getInstance(GroupManager.class).delete(rowModel.getObject()); setResponsePage(GroupListPage.class); } @@ -173,12 +173,12 @@ public class GroupListPage extends LayoutPage { public Iterator iterator(long first, long count) { EntityCriteria criteria = getCriteria(); criteria.addOrder(Order.asc("name")); - return TurboDev.getInstance(GroupManager.class).findRange(criteria, (int)first, (int)count).iterator(); + return OneDev.getInstance(GroupManager.class).findRange(criteria, (int)first, (int)count).iterator(); } @Override public long size() { - return TurboDev.getInstance(GroupManager.class).count(getCriteria()); + return OneDev.getInstance(GroupManager.class).count(getCriteria()); } @Override @@ -188,7 +188,7 @@ public class GroupListPage extends LayoutPage { @Override protected Group load() { - return TurboDev.getInstance(GroupManager.class).load(id); + return OneDev.getInstance(GroupManager.class).load(id); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupMembershipsPage.html b/web/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupMembershipsPage.html rename to web/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupMembershipsPage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupMembershipsPage.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.java index 491750180b..fe723aeb48 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupMembershipsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupMembershipsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import java.util.ArrayList; import java.util.Collection; @@ -30,29 +30,29 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.MembershipManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Membership; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.datatable.SelectionColumn; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; -import com.turbodev.server.web.component.select2.SelectToAddChoice; -import com.turbodev.server.web.component.userchoice.AbstractUserChoiceProvider; -import com.turbodev.server.web.component.userchoice.UserChoiceResourceReference; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.MembershipManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Membership; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.datatable.SelectionColumn; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.server.web.component.select2.SelectToAddChoice; +import io.onedev.server.web.component.userchoice.AbstractUserChoiceProvider; +import io.onedev.server.web.component.userchoice.UserChoiceResourceReference; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public class GroupMembershipsPage extends GroupPage { @@ -99,7 +99,7 @@ public class GroupMembershipsPage extends GroupPage { @Override public void query(String term, int page, Response response) { List nonMembers = new ArrayList<>(); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); Set memberIds = new HashSet<>(); for (MembershipFacade membership: cacheManager.getMemberships().values()) { if (membership.getGroupId().equals(getGroup().getId())) @@ -131,17 +131,17 @@ public class GroupMembershipsPage extends GroupPage { super.onInitialize(); getSettings().setPlaceholder("Add member..."); - getSettings().setFormatResult("turbodev.server.userChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.userChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.userChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup"); } @Override protected void onSelect(AjaxRequestTarget target, UserFacade selection) { Membership membership = new Membership(); membership.setGroup(getGroup()); - membership.setUser(TurboDev.getInstance(UserManager.class).load(selection.getId())); - TurboDev.getInstance(MembershipManager.class).save(membership); + membership.setUser(OneDev.getInstance(UserManager.class).load(selection.getId())); + OneDev.getInstance(MembershipManager.class).save(membership); target.add(membershipsTable); Session.get().success("Member added"); } @@ -169,7 +169,7 @@ public class GroupMembershipsPage extends GroupPage { for (IModel model: selectionColumn.getSelections()) { membershipsToDelete.add(model.getObject()); } - TurboDev.getInstance(MembershipManager.class).delete(membershipsToDelete); + OneDev.getInstance(MembershipManager.class).delete(membershipsToDelete); target.add(membershipsTable); selectionColumn.getSelections().clear(); target.add(this); @@ -226,13 +226,13 @@ public class GroupMembershipsPage extends GroupPage { public Iterator iterator(long first, long count) { EntityCriteria criteria = getCriteria(); criteria.addOrder(Order.desc("id")); - return TurboDev.getInstance(MembershipManager.class).findRange(criteria, (int)first, + return OneDev.getInstance(MembershipManager.class).findRange(criteria, (int)first, (int)count).iterator(); } @Override public long size() { - return TurboDev.getInstance(MembershipManager.class).count(getCriteria()); + return OneDev.getInstance(MembershipManager.class).count(getCriteria()); } @Override @@ -242,7 +242,7 @@ public class GroupMembershipsPage extends GroupPage { @Override protected Membership load() { - return TurboDev.getInstance(MembershipManager.class).load(id); + return OneDev.getInstance(MembershipManager.class).load(id); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.html b/web/src/main/java/io/onedev/server/web/page/group/GroupPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupPage.html rename to web/src/main/java/io/onedev/server/web/page/group/GroupPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupPage.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupPage.java index 518fbbabd0..a04baa2108 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupPage.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import java.util.ArrayList; import java.util.List; @@ -12,17 +12,17 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.sidebar.SidebarPanel; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.util.model.EntityModel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.sidebar.SidebarPanel; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.util.model.EntityModel; @SuppressWarnings("serial") public abstract class GroupPage extends LayoutPage { @@ -36,7 +36,7 @@ public abstract class GroupPage extends LayoutPage { Long groupId = params.get(PARAM_GROUP).toLong(); - Group group = TurboDev.getInstance(GroupManager.class).load(groupId); + Group group = OneDev.getInstance(GroupManager.class).load(groupId); groupModel = new EntityModel(group); } diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupProfilePage.html b/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupProfilePage.html rename to web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupProfilePage.java b/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupProfilePage.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java index a9f2329bf9..c63444450f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupProfilePage.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupProfilePage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import java.io.Serializable; @@ -14,15 +14,16 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import com.google.common.collect.Sets; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.util.ConfirmOnClick; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.util.ConfirmOnClick; @SuppressWarnings("serial") public class GroupProfilePage extends GroupPage { @@ -77,7 +78,7 @@ public class GroupProfilePage extends GroupPage { group.setCanCreateProjects(true); else group.setCanCreateProjects(canCreateProjectsInput.getModelObject()); - GroupManager groupManager = TurboDev.getInstance(GroupManager.class); + GroupManager groupManager = OneDev.getInstance(GroupManager.class); Group groupWithSameName = groupManager.find(group.getName()); if (groupWithSameName != null && !groupWithSameName.equals(group)) { editor.getErrorContext(new PathSegment.Property("name")) @@ -129,7 +130,7 @@ public class GroupProfilePage extends GroupPage { @Override public void onClick() { - TurboDev.getInstance(GroupManager.class).delete(getGroup()); + OneDev.getInstance(GroupManager.class).delete(getGroup()); setResponsePage(GroupListPage.class); } diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupResourceReference.java b/web/src/main/java/io/onedev/server/web/page/group/GroupResourceReference.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupResourceReference.java index 3680935229..f8699ef7af 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupTab.java b/web/src/main/java/io/onedev/server/web/page/group/GroupTab.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupTab.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupTab.java index 8b625b90bf..b5a6a976f9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupTab.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupTab.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import org.apache.wicket.Component; import org.apache.wicket.model.Model; -import com.turbodev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTab; @SuppressWarnings("serial") public class GroupTab extends PageTab { diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.html b/web/src/main/java/io/onedev/server/web/page/group/GroupTabLink.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.html rename to web/src/main/java/io/onedev/server/web/page/group/GroupTabLink.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.java b/web/src/main/java/io/onedev/server/web/page/group/GroupTabLink.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.java rename to web/src/main/java/io/onedev/server/web/page/group/GroupTabLink.java index 0b3ab62015..9a23bd12bb 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/GroupTabLink.java +++ b/web/src/main/java/io/onedev/server/web/page/group/GroupTabLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; @SuppressWarnings("serial") public class GroupTabLink extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/group/NewGroupPage.html b/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/NewGroupPage.html rename to web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/group/NewGroupPage.java b/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/group/NewGroupPage.java rename to web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java index 7bc579c65f..1cfde31faa 100644 --- a/web/src/main/java/com/turbodev/server/web/page/group/NewGroupPage.java +++ b/web/src/main/java/io/onedev/server/web/page/group/NewGroupPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.group; +package io.onedev.server.web.page.group; import java.util.List; @@ -16,16 +16,17 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import com.google.common.collect.Sets; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.page.layout.LayoutPage; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.model.Group; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.page.layout.LayoutPage; @SuppressWarnings("serial") public class NewGroupPage extends LayoutPage { @@ -49,7 +50,7 @@ public class NewGroupPage extends LayoutPage { protected void onSubmit() { super.onSubmit(); - GroupManager groupManager = TurboDev.getInstance(GroupManager.class); + GroupManager groupManager = OneDev.getInstance(GroupManager.class); Group groupWithSameName = groupManager.find(group.getName()); if (groupWithSameName != null) { editor.getErrorContext(new PathSegment.Property("name")) diff --git a/web/src/main/java/com/turbodev/server/web/page/group/group.css b/web/src/main/java/io/onedev/server/web/page/group/group.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/group/group.css rename to web/src/main/java/io/onedev/server/web/page/group/group.css diff --git a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.html b/web/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.html rename to web/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html index a0af27eccf..f641eb84e2 100644 --- a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.html +++ b/web/src/main/java/io/onedev/server/web/page/init/ServerInitPage.html @@ -2,7 +2,7 @@
    - +
    diff --git a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.java b/web/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.java rename to web/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java index 903bf37dc7..2faaa3023c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitPage.java +++ b/web/src/main/java/io/onedev/server/web/page/init/ServerInitPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.init; +package io.onedev.server.web.page.init; import java.util.ArrayList; import java.util.List; @@ -11,18 +11,18 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.WebSession; -import com.turbodev.server.web.component.wizard.ManualConfigStep; -import com.turbodev.server.web.component.wizard.Wizard; -import com.turbodev.server.web.page.base.BasePage; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.utils.init.InitStage; -import com.turbodev.utils.init.ManualConfig; -import com.turbodev.utils.init.Skippable; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.WebSession; +import io.onedev.server.web.component.wizard.ManualConfigStep; +import io.onedev.server.web.component.wizard.Wizard; +import io.onedev.server.web.page.base.BasePage; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.utils.init.InitStage; +import io.onedev.utils.init.ManualConfig; +import io.onedev.utils.init.Skippable; @SuppressWarnings("serial") public class ServerInitPage extends BasePage { @@ -30,7 +30,7 @@ public class ServerInitPage extends BasePage { private InitStage initStage; public ServerInitPage() { - InitStage initStage = TurboDev.getInstance().getInitStage(); + InitStage initStage = OneDev.getInstance().getInitStage(); if (initStage != null) { if (!initStage.getManualConfigs().isEmpty()) { List clonedConfigs = new ArrayList(); @@ -50,7 +50,7 @@ public class ServerInitPage extends BasePage { @Override public void skip() { skippable.skip(); - InitStage initStage = TurboDev.getInstance().getInitStage(); + InitStage initStage = OneDev.getInstance().getInitStage(); if (initStage != null) initStage.finished(); } @@ -64,7 +64,7 @@ public class ServerInitPage extends BasePage { @Override public void complete() { lastConfig.complete(); - InitStage initStage = TurboDev.getInstance().getInitStage(); + InitStage initStage = OneDev.getInstance().getInitStage(); if (initStage != null) initStage.finished(); } @@ -97,7 +97,7 @@ public class ServerInitPage extends BasePage { @Override protected void finished() { WebSession.get().logout(); - User root = TurboDev.getInstance(UserManager.class).getRoot(); + User root = OneDev.getInstance(UserManager.class).getRoot(); SecurityUtils.getSubject().runAs(root.getPrincipals()); throw new RestartResponseException(ProjectListPage.class); } diff --git a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitResourceReference.java b/web/src/main/java/io/onedev/server/web/page/init/ServerInitResourceReference.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/init/ServerInitResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/init/ServerInitResourceReference.java index 5c415a0d14..3bf54ec8b7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/init/ServerInitResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/init/ServerInitResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.init; +package io.onedev.server.web.page.init; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/init/server-init.css b/web/src/main/java/io/onedev/server/web/page/init/server-init.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/init/server-init.css rename to web/src/main/java/io/onedev/server/web/page/init/server-init.css diff --git a/web/src/main/java/com/turbodev/server/web/page/init/welcome.css b/web/src/main/java/io/onedev/server/web/page/init/welcome.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/init/welcome.css rename to web/src/main/java/io/onedev/server/web/page/init/welcome.css diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html b/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html similarity index 91% rename from web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html rename to web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html index e6a5641e6a..67492958bb 100644 --- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.html +++ b/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html @@ -41,7 +41,7 @@
    -

    TurboDev

    +

    OneDev

    diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java b/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java rename to web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java index 72799da2aa..ab946483e5 100644 --- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutPage.java +++ b/web/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.layout; +package io.onedev.server.web.page.layout; import java.util.ArrayList; import java.util.Collection; @@ -19,38 +19,37 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.launcher.loader.Plugin; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.behavior.TooltipBehavior; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.floating.AlignPlacement; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.admin.systemsetting.SystemSettingPage; -import com.turbodev.server.web.page.base.BasePage; -import com.turbodev.server.web.page.group.GroupListPage; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.server.web.page.security.LoginPage; -import com.turbodev.server.web.page.security.LogoutPage; -import com.turbodev.server.web.page.security.RegisterPage; -import com.turbodev.server.web.page.user.TaskListPage; -import com.turbodev.server.web.page.user.UserListPage; -import com.turbodev.server.web.page.user.UserProfilePage; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.TaskChangedRegion; -import com.turbodev.server.web.websocket.WebSocketRegion; -import com.turbodev.utils.license.LicenseDetail; - import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig; import de.agilecoders.wicket.core.markup.html.bootstrap.components.TooltipConfig.Placement; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.launcher.loader.Plugin; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.behavior.TooltipBehavior; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.floating.AlignPlacement; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage; +import io.onedev.server.web.page.base.BasePage; +import io.onedev.server.web.page.group.GroupListPage; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.server.web.page.security.LoginPage; +import io.onedev.server.web.page.security.LogoutPage; +import io.onedev.server.web.page.security.RegisterPage; +import io.onedev.server.web.page.user.TaskListPage; +import io.onedev.server.web.page.user.UserListPage; +import io.onedev.server.web.page.user.UserProfilePage; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.TaskChangedRegion; +import io.onedev.server.web.websocket.WebSocketRegion; +import io.onedev.utils.license.LicenseDetail; @SuppressWarnings("serial") public abstract class LayoutPage extends BasePage { @@ -81,7 +80,7 @@ public abstract class LayoutPage extends BasePage { Plugin product = AppLoader.getProduct(); fragment.add(new Label("productVersion", product.getVersion())); - fragment.add(new ExternalLink("docLink", TurboDev.getInstance().getDocLink() + "/readme.md")); + fragment.add(new ExternalLink("docLink", OneDev.getInstance().getDocLink() + "/readme.md")); return fragment; } @@ -97,9 +96,9 @@ public abstract class LayoutPage extends BasePage { }); - int userCount = TurboDev.getInstance(UserManager.class).count(EntityCriteria.of(User.class)); + int userCount = OneDev.getInstance(UserManager.class).count(EntityCriteria.of(User.class)); int licenseLimit = LicenseDetail.FREE_LICENSE_USERS; - LicenseDetail license = TurboDev.getInstance(ConfigManager.class).getLicense(); + LicenseDetail license = OneDev.getInstance(ConfigManager.class).getLicense(); if (license != null && license.getRemainingDays()>=0) licenseLimit += license.getLicensedUsers(); if (userCount > licenseLimit) { @@ -125,7 +124,7 @@ public abstract class LayoutPage extends BasePage { }.setVisible(!signedIn)); - boolean enableSelfRegister = TurboDev.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister(); + boolean enableSelfRegister = OneDev.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister(); head.add(new ViewStateAwarePageLink("register", RegisterPage.class).setVisible(!signedIn && enableSelfRegister)); head.add(new ViewStateAwarePageLink("logout", LogoutPage.class).setVisible(signedIn)); if (user != null) { diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.java b/web/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java index 7a4ba926fc..46ee5898b4 100644 --- a/web/src/main/java/com/turbodev/server/web/page/layout/LayoutResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/layout/LayoutResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.layout; +package io.onedev.server.web.page.layout; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class LayoutResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/layout/layout.css b/web/src/main/java/io/onedev/server/web/page/layout/layout.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/layout/layout.css rename to web/src/main/java/io/onedev/server/web/page/layout/layout.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/NewProjectPage.html b/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/NewProjectPage.html rename to web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/NewProjectPage.java b/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/page/project/NewProjectPage.java rename to web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java index 6fd54439b6..cc2d80206f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/NewProjectPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/NewProjectPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; import java.util.List; @@ -13,17 +13,17 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; @SuppressWarnings("serial") public class NewProjectPage extends LayoutPage { @@ -46,7 +46,7 @@ public class NewProjectPage extends LayoutPage { protected void onSubmit() { super.onSubmit(); - ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class); + ProjectManager projectManager = OneDev.getInstance(ProjectManager.class); Project projectWithSameName = projectManager.find(project.getName()); if (projectWithSameName != null) { editor.getErrorContext(new PathSegment.Property("name")) diff --git a/web/src/main/java/com/turbodev/server/web/page/project/NoCommitsPage.html b/web/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/NoCommitsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/NoCommitsPage.java b/web/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/NoCommitsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java index 8567aee133..f66e83b27e 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/NoCommitsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/NoCommitsPage.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; import org.apache.wicket.RestartResponseException; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; @SuppressWarnings("serial") public class NoCommitsPage extends ProjectPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.html b/web/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.html rename to web/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.java b/web/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.java rename to web/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java index 5caab0d100..046fcebbb8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectListPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; import java.util.ArrayList; import java.util.Comparator; @@ -21,22 +21,22 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.projectlist.ProjectListPanel; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.util.PagingHistorySupport; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.projectlist.ProjectListPanel; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public class ProjectListPage extends LayoutPage { @@ -51,7 +51,7 @@ public class ProjectListPage extends LayoutPage { @Override protected List load() { - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); List projects = new ArrayList<>(); Set projectIdsWithExplicitAdministrators = new HashSet<>(); @@ -92,7 +92,7 @@ public class ProjectListPage extends LayoutPage { @Override protected List load() { - List projects = new ArrayList<>(TurboDev.getInstance(ProjectManager.class) + List projects = new ArrayList<>(OneDev.getInstance(ProjectManager.class) .getAccessibleProjects(getLoginUser())); projects.sort(ProjectFacade::compareLastVisit); return MatchScoreUtils.filterAndSort(projects, new MatchScoreProvider() { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.html b/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.html rename to web/src/main/java/io/onedev/server/web/page/project/ProjectPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.java b/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.java rename to web/src/main/java/io/onedev/server/web/page/project/ProjectPage.java index 4a64791d15..1dc121ba38 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/ProjectPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; import java.util.ArrayList; import java.util.HashMap; @@ -23,33 +23,34 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.ObjectId; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserInfoManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.sidebar.SidebarPanel; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.branches.ProjectBranchesPage; -import com.turbodev.server.web.page.project.comments.ProjectCodeCommentsPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.commit.ProjectCommitsPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.page.project.moreinfo.MoreInfoPanel; -import com.turbodev.server.web.page.project.pullrequest.InvalidRequestPage; -import com.turbodev.server.web.page.project.pullrequest.newrequest.NewRequestPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.page.project.pullrequest.requestlist.RequestListPage; -import com.turbodev.server.web.page.project.setting.ProjectSettingPage; -import com.turbodev.server.web.page.project.setting.general.GeneralSettingPage; -import com.turbodev.server.web.page.project.tags.ProjectTagsPage; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserInfoManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.sidebar.SidebarPanel; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.branches.ProjectBranchesPage; +import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.commit.ProjectCommitsPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.page.project.moreinfo.MoreInfoPanel; +import io.onedev.server.web.page.project.pullrequest.InvalidRequestPage; +import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage; +import io.onedev.server.web.page.project.setting.ProjectSettingPage; +import io.onedev.server.web.page.project.setting.general.GeneralSettingPage; +import io.onedev.server.web.page.project.tags.ProjectTagsPage; @SuppressWarnings("serial") public abstract class ProjectPage extends LayoutPage { @@ -70,7 +71,7 @@ public abstract class ProjectPage extends LayoutPage { String projectName = params.get(PARAM_PROJECT).toString(); Preconditions.checkNotNull(projectName); - Project project = TurboDev.getInstance(ProjectManager.class).find(projectName); + Project project = OneDev.getInstance(ProjectManager.class).find(projectName); if (project == null) throw new EntityNotFoundException("Unable to find project " + projectName); @@ -81,7 +82,7 @@ public abstract class ProjectPage extends LayoutPage { @Override protected Project load() { - Project project = TurboDev.getInstance(ProjectManager.class).load(projectId); + Project project = OneDev.getInstance(ProjectManager.class).load(projectId); /* * Give child page a chance to cache object id of known revisions upon @@ -113,7 +114,7 @@ public abstract class ProjectPage extends LayoutPage { protected void onAfterRender() { super.onAfterRender(); if (getLoginUser() != null) - TurboDev.getInstance(UserInfoManager.class).visit(getLoginUser(), getProject()); + OneDev.getInstance(UserInfoManager.class).visit(getLoginUser(), getProject()); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java index c0c490d903..0af635a476 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/ProjectResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class ProjectResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectTab.java b/web/src/main/java/io/onedev/server/web/page/project/ProjectTab.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectTab.java rename to web/src/main/java/io/onedev/server/web/page/project/ProjectTab.java index 623add852b..1feecf7861 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectTab.java +++ b/web/src/main/java/io/onedev/server/web/page/project/ProjectTab.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTab; @SuppressWarnings("serial") public class ProjectTab extends PageTab { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectTabLink.html b/web/src/main/java/io/onedev/server/web/page/project/ProjectTabLink.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectTabLink.html rename to web/src/main/java/io/onedev/server/web/page/project/ProjectTabLink.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/ProjectTabLink.java b/web/src/main/java/io/onedev/server/web/page/project/ProjectTabLink.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/project/ProjectTabLink.java rename to web/src/main/java/io/onedev/server/web/page/project/ProjectTabLink.java index e5ea07cd9a..eb7c88836f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/ProjectTabLink.java +++ b/web/src/main/java/io/onedev/server/web/page/project/ProjectTabLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project; +package io.onedev.server.web.page.project; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; @SuppressWarnings("serial") public class ProjectTabLink extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java index 2ef00895bd..02224a6f14 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/BlobUploadPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob; +package io.onedev.server.web.page.project.blob; import java.util.ArrayList; import java.util.Collection; @@ -15,12 +15,11 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.util.lang.Bytes; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.dropzonefield.DropzoneField; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.dropzonefield.DropzoneField; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; @SuppressWarnings("serial") abstract class BlobUploadPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.html b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java index 915f8232ac..f3482db94a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob; +package io.onedev.server.web.page.project.blob; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -48,64 +48,65 @@ import org.eclipse.jgit.treewalk.TreeWalk; import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; -import com.turbodev.jsymbol.TokenPosition; -import com.turbodev.jsymbol.util.NoAntiCacheImage; -import com.turbodev.launcher.loader.ListenerRegistry; -import com.turbodev.server.TurboDev; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.git.BlobContent; -import com.turbodev.server.git.BlobEdits; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.exception.NotTreeException; -import com.turbodev.server.git.exception.ObjectAlreadyExistsException; -import com.turbodev.server.git.exception.ObsoleteCommitException; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.persistence.UnitOfWork; -import com.turbodev.server.search.IndexManager; -import com.turbodev.server.search.SearchManager; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.query.BlobQuery; -import com.turbodev.server.search.query.TextQuery; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.ArchiveMenuLink; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.menu.MenuItem; -import com.turbodev.server.web.component.menu.MenuLink; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.component.revisionpicker.RevisionPicker; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.navigator.BlobNavigator; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobUploadException; -import com.turbodev.server.web.page.project.blob.render.view.Markable; -import com.turbodev.server.web.page.project.blob.search.SearchMenuContributor; -import com.turbodev.server.web.page.project.blob.search.advanced.AdvancedSearchPanel; -import com.turbodev.server.web.page.project.blob.search.quick.QuickSearchPanel; -import com.turbodev.server.web.page.project.blob.search.result.SearchResultPanel; -import com.turbodev.server.web.page.project.commit.ProjectCommitsPage; -import com.turbodev.server.web.util.resource.RawBlobResourceReference; -import com.turbodev.server.web.websocket.CodeCommentChangedRegion; -import com.turbodev.server.web.websocket.CommitIndexedRegion; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.PullRequestChangedRegion; -import com.turbodev.server.web.websocket.WebSocketManager; -import com.turbodev.server.web.websocket.WebSocketRegion; + +import io.onedev.jsymbol.TokenPosition; +import io.onedev.jsymbol.util.NoAntiCacheImage; +import io.onedev.launcher.loader.ListenerRegistry; +import io.onedev.server.OneDev; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.git.BlobContent; +import io.onedev.server.git.BlobEdits; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.exception.NotTreeException; +import io.onedev.server.git.exception.ObjectAlreadyExistsException; +import io.onedev.server.git.exception.ObsoleteCommitException; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.persistence.UnitOfWork; +import io.onedev.server.search.IndexManager; +import io.onedev.server.search.SearchManager; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.query.BlobQuery; +import io.onedev.server.search.query.TextQuery; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.ArchiveMenuLink; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.menu.MenuItem; +import io.onedev.server.web.component.menu.MenuLink; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.revisionpicker.RevisionPicker; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.navigator.BlobNavigator; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobUploadException; +import io.onedev.server.web.page.project.blob.render.view.Markable; +import io.onedev.server.web.page.project.blob.search.SearchMenuContributor; +import io.onedev.server.web.page.project.blob.search.advanced.AdvancedSearchPanel; +import io.onedev.server.web.page.project.blob.search.quick.QuickSearchPanel; +import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel; +import io.onedev.server.web.page.project.commit.ProjectCommitsPage; +import io.onedev.server.web.util.resource.RawBlobResourceReference; +import io.onedev.server.web.websocket.CodeCommentChangedRegion; +import io.onedev.server.web.websocket.CommitIndexedRegion; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.PullRequestChangedRegion; +import io.onedev.server.web.websocket.WebSocketManager; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { @@ -222,9 +223,9 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { super.onConfigure(); RevCommit commit = getProject().getRevCommit(resolvedRevision); - IndexManager indexManager = TurboDev.getInstance(IndexManager.class); + IndexManager indexManager = OneDev.getInstance(IndexManager.class); if (!indexManager.isIndexed(getProject(), commit)) { - TurboDev.getInstance(IndexManager.class).indexAsync(getProject(), commit); + OneDev.getInstance(IndexManager.class).indexAsync(getProject(), commit); setVisible(true); } else { setVisible(false); @@ -246,7 +247,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { .count(SearchResultPanel.MAX_QUERY_ENTRIES) .build(); try { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); queryHits = searchManager.search(projectModel.getObject(), getProject().getRevCommit(resolvedRevision), query); } catch (InterruptedException e) { @@ -311,7 +312,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { @Override public CodeComment getOpenComment() { if (state.commentId != null) - return TurboDev.getInstance(CodeCommentManager.class).load(state.commentId); + return OneDev.getInstance(CodeCommentManager.class).load(state.commentId); else return null; } @@ -319,7 +320,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { @Override public PullRequest getPullRequest() { if (state.requestId != null) - return TurboDev.getInstance(PullRequestManager.class).load(state.requestId); + return OneDev.getInstance(PullRequestManager.class).load(state.requestId); else return null; } @@ -422,7 +423,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { if ((state.mode == Mode.VIEW || state.mode == Mode.BLAME) && isOnBranch() && state.blobIdent.isTree() && SecurityUtils.canWrite(project)) { - ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class); + ProjectManager projectManager = OneDev.getInstance(ProjectManager.class); setEnabled(!projectManager.isModificationNeedsQualityCheck( getLoginUser(), project, state.blobIdent.revision, null)); } else { @@ -624,7 +625,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { private void newBlobContent(@Nullable AjaxRequestTarget target) { PrioritizedComponentRenderer mostPrioritizedRenderer = null; - for (BlobRendererContribution contribution: TurboDev.getExtensions(BlobRendererContribution.class)) { + for (BlobRendererContribution contribution: OneDev.getExtensions(BlobRendererContribution.class)) { PrioritizedComponentRenderer renderer = contribution.getRenderer(this); if (renderer != null) { if (mostPrioritizedRenderer == null || mostPrioritizedRenderer.getPriority() > renderer.getPriority()) @@ -706,7 +707,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { resolvedRevision = null; resolvedRevision = getProject().getObjectId(state.blobIdent.revision); - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); newRevisionPicker(target); target.add(revisionIndexing); newBlobNavigator(target); @@ -722,11 +723,11 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { response.render(JavaScriptHeaderItem.forReference(new ProjectBlobResourceReference())); String callback = ajaxBehavior.getCallbackFunction(explicit("action")).toString(); - String script = String.format("turbodev.server.projectBlob.onDomReady(%s);", callback); + String script = String.format("onedev.server.projectBlob.onDomReady(%s);", callback); response.render(OnDomReadyHeaderItem.forScript(script)); - response.render(OnLoadHeaderItem.forScript("turbodev.server.projectBlob.onWindowLoad();")); + response.render(OnLoadHeaderItem.forScript("onedev.server.projectBlob.onWindowLoad();")); } public static ProjectBlobPage.State getState(CodeComment comment) { @@ -878,7 +879,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { newBlobOperations(target); newBlobContent(target); resizeWindow(target); - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); } else if (state.mark != null) { // This logic is added for performance reason, we do not want to // reload the file if go to different mark positions in same file @@ -903,14 +904,14 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { state.commentId = null; state.mark = null; } - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); pushState(target); } @Override public void onAddComment(AjaxRequestTarget target, TextRange mark) { state.commentId = null; - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); state.mark = mark; pushState(target); } @@ -1018,15 +1019,15 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { newBlobIdent = null; } - TurboDev.getInstance(UnitOfWork.class).doAsync(new Runnable() { + OneDev.getInstance(UnitOfWork.class).doAsync(new Runnable() { @Override public void run() { ThreadContext.bind(subject); try { - Project project = TurboDev.getInstance(ProjectManager.class).load(projectId); + Project project = OneDev.getInstance(ProjectManager.class).load(projectId); project.cacheObjectId(branch, refUpdated.getNewCommitId()); - TurboDev.getInstance(ListenerRegistry.class).post(refUpdated); + OneDev.getInstance(ListenerRegistry.class).post(refUpdated); } finally { ThreadContext.unbindSubject(); } @@ -1128,7 +1129,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { @Override public RefUpdated uploadFiles(Collection uploads, String directory, String commitMessage) { - ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class); + ProjectManager projectManager = OneDev.getInstance(ProjectManager.class); Map newBlobs = new HashMap<>(); String parentPath; @@ -1169,7 +1170,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext { BlobEdits blobEdits = new BlobEdits(Sets.newHashSet(), newBlobs); String refName = GitUtils.branch2ref(blobIdent.revision); - User user = Preconditions.checkNotNull(TurboDev.getInstance(UserManager.class).getCurrent()); + User user = Preconditions.checkNotNull(OneDev.getInstance(UserManager.class).getCurrent()); ObjectId prevCommitId = getProject().getObjectId(blobIdent.revision); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobResourceReference.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobResourceReference.java index 2f3cff409c..da3be20ea7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/ProjectBlobResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob; +package io.onedev.server.web.page.project.blob; 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.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ProjectBlobResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/RevisionResolved.java b/web/src/main/java/io/onedev/server/web/page/project/blob/RevisionResolved.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/RevisionResolved.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/RevisionResolved.java index 929c411057..5632aefa57 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/RevisionResolved.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/RevisionResolved.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.project.blob; +package io.onedev.server.web.page.project.blob; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.web.util.AjaxPayload; +import io.onedev.server.web.util.AjaxPayload; public class RevisionResolved extends AjaxPayload { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/hgrabber.png b/web/src/main/java/io/onedev/server/web/page/project/blob/hgrabber.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/hgrabber.png rename to web/src/main/java/io/onedev/server/web/page/project/blob/hgrabber.png diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/indexing.gif b/web/src/main/java/io/onedev/server/web/page/project/blob/indexing.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/indexing.gif rename to web/src/main/java/io/onedev/server/web/page/project/blob/indexing.gif diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNameChanging.java b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNameChanging.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNameChanging.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNameChanging.java index 227679c4f3..42c9284b68 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNameChanging.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNameChanging.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.page.project.blob.navigator; +package io.onedev.server.web.page.project.blob.navigator; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; -import com.turbodev.server.web.util.AjaxPayload; +import io.onedev.server.web.util.AjaxPayload; public class BlobNameChanging extends AjaxPayload { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigator.html b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigator.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigator.java b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigator.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java index bffa29ec93..d66be6092e 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigator.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.navigator; +package io.onedev.server.web.page.project.blob.navigator; import java.util.ArrayList; import java.util.Iterator; @@ -36,20 +36,21 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.FileMode; -import com.turbodev.utils.StringUtils; import com.google.common.base.Splitter; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.BlobIdentFilter; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.web.component.BlobIcon; -import com.turbodev.server.web.component.floating.AlignPlacement; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; + +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.BlobIdentFilter; +import io.onedev.server.git.GitUtils; +import io.onedev.server.web.component.BlobIcon; +import io.onedev.server.web.component.floating.AlignPlacement; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public class BlobNavigator extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java index 403680ed01..27a9d63a4b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/BlobNavigatorResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.project.blob.navigator; +package io.onedev.server.web.page.project.blob.navigator; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class BlobNavigatorResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/arrow-down.png b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-down.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/arrow-down.png rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-down.png diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/arrow-right.png b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-right.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/arrow-right.png rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/arrow-right.png diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/blob-navigator.css b/web/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/navigator/blob-navigator.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/navigator/blob-navigator.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css b/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js b/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js index a670a2be9f..df998e5a2c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/project-blob.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js @@ -1,4 +1,4 @@ -turbodev.server.projectBlob = { +onedev.server.projectBlob = { onDomReady: function(callback) { // hide browser scrollbar as we will manage it in blob content container $("body").css("overflow", "hidden"); @@ -55,7 +55,7 @@ turbodev.server.projectBlob = { var $blobContent = $("#project-blob>.blob-content"); - var minWindowWidth = turbodev.server.projectBlob.parseCssDimension($("#layout").css("min-width")); + var minWindowWidth = onedev.server.projectBlob.parseCssDimension($("#layout").css("min-width")); var windowWidth = $(window).width(); if (windowWidth < minWindowWidth) { @@ -93,7 +93,7 @@ turbodev.server.projectBlob = { * properly in readonly mode */ $(document).on("keydown", function(e) { - if ($(".modal:visible").length == 0 && !turbodev.server.util.canInput(e.target)) { + if ($(".modal:visible").length == 0 && !onedev.server.util.canInput(e.target)) { if (e.keyCode == 84) { callback("quickSearch"); } else if (e.keyCode == 86) { @@ -112,7 +112,7 @@ turbodev.server.projectBlob = { } }, onWindowLoad: function() { - if (location.hash && !turbodev.server.viewState.getFromHistory()) { + if (location.hash && !onedev.server.viewState.getFromHistory()) { // Scroll anchors into view (for instance the markdown headline) var element = document.getElementsByName(decodeURIComponent(location.hash.slice(1)))[0]; if (element) diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java index 7d1b5ba6b7..25fcbaa47b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRenderContext.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRenderContext.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render; +package io.onedev.server.web.page.project.blob.render; import java.io.Serializable; import java.util.Collection; @@ -10,14 +10,14 @@ import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.markup.html.form.upload.FileUpload; import org.eclipse.jgit.revwalk.RevCommit; -import com.turbodev.jsymbol.TokenPosition; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.search.hit.QueryHit; +import io.onedev.jsymbol.TokenPosition; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.search.hit.QueryHit; public interface BlobRenderContext extends Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRendererContribution.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java similarity index 57% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRendererContribution.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java index 96f511ffa6..c2fa23a06a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobRendererContribution.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render; +package io.onedev.server.web.page.project.blob.render; import java.io.Serializable; import javax.annotation.Nullable; -import com.turbodev.launcher.loader.ExtensionPoint; -import com.turbodev.server.web.PrioritizedComponentRenderer; +import io.onedev.launcher.loader.ExtensionPoint; +import io.onedev.server.web.PrioritizedComponentRenderer; @ExtensionPoint public interface BlobRendererContribution extends Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobUploadException.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobUploadException.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobUploadException.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobUploadException.java index 26583fedf8..cedbabb655 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/BlobUploadException.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/BlobUploadException.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render; +package io.onedev.server.web.page.project.blob.render; public class BlobUploadException extends RuntimeException { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java index c91475b0db..fb276550a9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.commitoption; +package io.onedev.server.web.page.project.blob.render.commitoption; import java.io.IOException; import java.util.Arrays; @@ -38,38 +38,38 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; import org.unbescape.javascript.JavaScriptEscape; -import com.turbodev.utils.Provider; import com.google.common.base.Objects; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.event.RefUpdated; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobChange; -import com.turbodev.server.git.BlobContent; -import com.turbodev.server.git.BlobEdits; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.exception.NotTreeException; -import com.turbodev.server.git.exception.ObjectAlreadyExistsException; -import com.turbodev.server.git.exception.ObsoleteCommitException; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.component.diff.blob.BlobDiffPanel; -import com.turbodev.server.web.component.diff.revision.DiffViewMode; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.RevisionResolved; -import com.turbodev.server.web.page.project.blob.navigator.BlobNameChanging; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.util.ajaxlistener.TrackViewStateListener; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.event.RefUpdated; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobChange; +import io.onedev.server.git.BlobContent; +import io.onedev.server.git.BlobEdits; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.exception.NotTreeException; +import io.onedev.server.git.exception.ObjectAlreadyExistsException; +import io.onedev.server.git.exception.ObsoleteCommitException; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.component.diff.blob.BlobDiffPanel; +import io.onedev.server.web.component.diff.revision.DiffViewMode; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.RevisionResolved; +import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener; +import io.onedev.utils.Provider; @SuppressWarnings("serial") public class CommitOptionPanel extends Panel { @@ -255,7 +255,7 @@ public class CommitOptionPanel extends Panel { if (save(target, feedback)) { String script = String.format("" + "$('#%s').attr('disabled', 'disabled').val('Please wait...');" - + "turbodev.server.form.markClean($('form'));", getMarkupId()); + + "onedev.server.form.markClean($('form'));", getMarkupId()); target.appendJavaScript(script); } } @@ -308,7 +308,7 @@ public class CommitOptionPanel extends Panel { commitMessage = getDefaultCommitMessage(); if (StringUtils.isNotBlank(detailCommitMessage)) commitMessage += "\n\n" + detailCommitMessage; - User user = Preconditions.checkNotNull(TurboDev.getInstance(UserManager.class).getCurrent()); + User user = Preconditions.checkNotNull(OneDev.getInstance(UserManager.class).getCurrent()); String refName = GitUtils.branch2ref(context.getBlobIdent().revision); ObjectId prevCommitId = context.getProject().getObjectId(context.getBlobIdent().revision); @@ -318,7 +318,7 @@ public class CommitOptionPanel extends Panel { Map newBlobs = new HashMap<>(); if (newContentProvider != null) { - if (TurboDev.getInstance(ProjectManager.class).isModificationNeedsQualityCheck(SecurityUtils.getUser(), + if (OneDev.getInstance(ProjectManager.class).isModificationNeedsQualityCheck(SecurityUtils.getUser(), context.getProject(), context.getBlobIdent().revision, context.getNewPath())) { CommitOptionPanel.this.error("Adding of file '" + context.getNewPath() + "' need to be reviewed/verified. " + "Please submit pull request instead"); @@ -462,7 +462,7 @@ public class CommitOptionPanel extends Panel { } private void onBlobChange(IPartialPageRequestHandler partialPageRequestHandler) { - String script = String.format("turbodev.server.commitOption.onBlobChange('%s', '%s', %b);", getMarkupId(), + String script = String.format("onedev.server.commitOption.onBlobChange('%s', '%s', %b);", getMarkupId(), JavaScriptEscape.escapeJavaScript(getDefaultCommitMessage()), isBlobModified()); partialPageRequestHandler.appendJavaScript(script); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java index e4e0be6a9a..95658b210c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/CommitOptionResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.commitoption; +package io.onedev.server.web.page.project.blob.render.commitoption; 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.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class CommitOptionResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/commit-option.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/commit-option.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/commit-option.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.js similarity index 92% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/commit-option.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.js index 343772cf00..1b8f106417 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/commitoption/commit-option.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/commitoption/commit-option.js @@ -1,4 +1,4 @@ -turbodev.server.commitOption = { +onedev.server.commitOption = { onBlobChange: function(containerId, defaultCommitMessage, blobModified) { var $commitOption = $("#" + containerId + ">.commit-option"); $commitOption.find(".summary-commit-message").attr("placeholder", defaultCommitMessage); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java index 94102c3e88..345f5197a0 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.edit; +package io.onedev.server.web.page.project.blob.render.edit; import org.apache.wicket.Component; import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior; @@ -15,15 +15,16 @@ import org.apache.wicket.markup.html.form.FormComponentPanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.utils.Provider; import com.google.common.base.Preconditions; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.navigator.BlobNameChanging; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.page.project.blob.render.commitoption.CommitOptionPanel; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; + +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.utils.Provider; @SuppressWarnings("serial") public abstract class BlobEditPanel extends Panel { @@ -90,7 +91,7 @@ public abstract class BlobEditPanel extends Panel { commitOption.onContentChange(target); String script = String.format( - "turbodev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.save'));", + "onedev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.save'));", BlobEditPanel.this.getMarkupId(true)); target.appendJavaScript(script); } @@ -134,7 +135,7 @@ public abstract class BlobEditPanel extends Panel { * any change yet */ BlobNameChanging payload = (BlobNameChanging) event.getPayload(); - String script = String.format("turbodev.server.blobEdit.onNameChanging('%s', %s, %s);", + String script = String.format("onedev.server.blobEdit.onNameChanging('%s', %s, %s);", getMarkupId(), context.getMode() == Mode.ADD, recreateBehavior.getCallbackFunction()); payload.getHandler().appendJavaScript(script); } @@ -154,7 +155,7 @@ public abstract class BlobEditPanel extends Panel { response.render(JavaScriptHeaderItem.forReference(new BlobEditResourceReference())); - String script = String.format("turbodev.server.blobEdit.onDomReady('%s');", getMarkupId()); + String script = String.format("onedev.server.blobEdit.onDomReady('%s');", getMarkupId()); response.render(OnDomReadyHeaderItem.forScript(script)); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java index 612bc843c7..9dd6ef12af 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.edit; +package io.onedev.server.web.page.project.blob.render.edit; 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.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class BlobEditResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js index b9f215344e..9444bea4ac 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/edit/blob-edit.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js @@ -1,4 +1,4 @@ -turbodev.server.blobEdit = { +onedev.server.blobEdit = { onDomReady: function(containerId) { var $container = $("#" + containerId); var $blobEdit = $container.children(".blob-edit"); @@ -7,7 +7,7 @@ turbodev.server.blobEdit = { var $content = $body.children(".content"); $head.find(".edit>a").click(function() { - turbodev.server.blobEdit.selectTab($(this).parent()); + onedev.server.blobEdit.selectTab($(this).parent()); }); $head.find(".save>a").click(function() { $body.children(".content").children(".submit").click(); @@ -40,7 +40,7 @@ turbodev.server.blobEdit = { }, selectTab: function($tab) { - turbodev.server.viewState.getFromViewAndSetToHistory(); + onedev.server.viewState.getFromViewAndSetToHistory(); var $active = $tab.parent().find(".tab.active"); $active.removeClass("active"); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java similarity index 59% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java index cc8e76bae0..bff8d76034 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.page.project.blob.render.renderers; +package io.onedev.server.web.page.project.blob.render.renderers; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.page.project.blob.render.commitoption.CommitOptionPanel; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel; public class BlobDeletionProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java index a3b4966b92..01aa4fde8a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.failsafe; +package io.onedev.server.web.page.project.blob.render.renderers.failsafe; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; public class FailsafeRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java index 45e058b9b3..4290985821 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.failsafe; +package io.onedev.server.web.page.project.blob.render.renderers.failsafe; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java similarity index 72% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java index 295bba5ab8..27ec55be7e 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.failsafe; +package io.onedev.server.web.page.project.blob.render.renderers.failsafe; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; @SuppressWarnings("serial") public class FailsafeViewPanel extends BlobViewPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/failsafe.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java index 0a0e76680c..9b5f0343d1 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.folder; +package io.onedev.server.web.page.project.blob.render.renderers.folder; import java.io.IOException; import java.util.ArrayList; @@ -30,12 +30,13 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; import com.google.common.base.Preconditions; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; + +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; @SuppressWarnings("serial") public class FolderViewPanel extends Panel { @@ -261,7 +262,7 @@ public class FolderViewPanel extends Panel { context.getBlobIdent().revision, context.getBlobIdent().path); String lastCommitsUrl = urlFor(new LastCommitsResourceReference(), params).toString(); response.render(OnDomReadyHeaderItem.forScript( - String.format("turbodev.server.folderView('%s', '%s')", getMarkupId(), lastCommitsUrl))); + String.format("onedev.server.folderView('%s', '%s')", getMarkupId(), lastCommitsUrl))); } private ObjectId getCommitId() { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java index 90dfcb640c..07ab3e26cd 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.folder; +package io.onedev.server.web.page.project.blob.render.renderers.folder; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class FolderViewRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java index f02d5b4d33..684505f76f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.folder; +package io.onedev.server.web.page.project.blob.render.renderers.folder; import java.util.List; @@ -6,8 +6,8 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.request.resource.CssResourceReference; -import com.turbodev.server.web.component.avatar.AvatarResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.component.avatar.AvatarResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class FolderViewResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java index 0deaba92d9..64de200396 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.folder; +package io.onedev.server.web.page.project.blob.render.renderers.folder; import java.io.IOException; import java.util.HashMap; @@ -17,16 +17,17 @@ import org.unbescape.html.HtmlEscape; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.user.UserProfilePage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.avatar.AvatarManager; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.user.UserProfilePage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.avatar.AvatarManager; /** * Loading commits of children may take some time, and we do this via resource loading to avoid blocking @@ -58,15 +59,15 @@ class LastCommitsResource extends AbstractResource { @Override public void writeData(Attributes attributes) throws IOException { - Project repo = TurboDev.getInstance(Dao.class).load(Project.class, repoId); + Project repo = OneDev.getInstance(Dao.class).load(Project.class, repoId); if (!SecurityUtils.canRead(repo)) throw new UnauthorizedException(); LastCommitsOfChildren lastCommits = repo.getLastCommitsOfChildren(revision, path); - UserManager userManager = TurboDev.getInstance(UserManager.class); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); Map map = new HashMap<>(); for (Map.Entry entry: lastCommits.entrySet()) { @@ -94,7 +95,7 @@ class LastCommitsResource extends AbstractResource { } String json; try { - json = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(map); + json = OneDev.getInstance(ObjectMapper.class).writeValueAsString(map); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java index f6a710b74c..28b5e9e139 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.folder; +package io.onedev.server.web.page.project.blob.render.renderers.folder; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/folder-view.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/folder-view.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js similarity index 96% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/folder-view.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js index 441d91d0a8..9765082a88 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/folder/folder-view.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js @@ -1,4 +1,4 @@ -turbodev.server.folderView = function(containerId, lastCommitsUrl) { +onedev.server.folderView = function(containerId, lastCommitsUrl) { var $container = $("#" + containerId); var $folderView = $container.find(">.folder-view"); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java index aeed555419..9b6fa120c1 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.gitlink; +package io.onedev.server.web.page.project.blob.render.renderers.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.turbodev.server.TurboDev; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.Submodule; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.Blob; +import io.onedev.server.git.Submodule; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; @SuppressWarnings("serial") public class GitLinkPanel extends BlobViewPanel { @@ -28,7 +28,7 @@ public class GitLinkPanel extends BlobViewPanel { Blob blob = context.getProject().getBlob(context.getBlobIdent()); Submodule submodule = Submodule.fromString(blob.getText().getContent()); WebMarkupContainer link; - ConfigManager configManager = TurboDev.getInstance(ConfigManager.class); + ConfigManager configManager = OneDev.getInstance(ConfigManager.class); if (submodule.getUrl().startsWith(configManager.getSystemSetting().getServerUrl() + "/")) { link = new WebMarkupContainer("link"); link.add(AttributeModifier.replace("href", submodule.getUrl() + "/blob/" + submodule.getCommitId())); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java index fd92b541cb..42bfd81d0a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.gitlink; +package io.onedev.server.web.page.project.blob.render.renderers.gitlink; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class GitLinkRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java index 5b0dd503d6..fceea330a2 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.gitlink; +package io.onedev.server.web.page.project.blob.render.renderers.gitlink; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/git-link.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/git-link.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/gitlink/git-link.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/git-link.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java index 9273f0a188..ce4ffbffa1 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.image; +package io.onedev.server.web.page.project.blob.render.renderers.image; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class ImageRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java similarity index 70% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java index da7fd823e0..9dac627467 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewPanel.java @@ -1,13 +1,13 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.image; +package io.onedev.server.web.page.project.blob.render.renderers.image; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.image.Image; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; -import com.turbodev.server.web.util.resource.RawBlobResource; -import com.turbodev.server.web.util.resource.RawBlobResourceReference; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.web.util.resource.RawBlobResource; +import io.onedev.server.web.util.resource.RawBlobResourceReference; @SuppressWarnings("serial") public class ImageViewPanel extends BlobViewPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java index 0f4a21b384..0e9da17a5b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageViewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.image; +package io.onedev.server.web.page.project.blob.render.renderers.image; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/image-view.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/image-view.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/image/image-view.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/image-view.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java index 0f0bbba2f3..015bb6145a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.markdown; +package io.onedev.server.web.page.project.blob.render.renderers.markdown; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.form.FormComponentPanel; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.edit.BlobEditPanel; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel; @SuppressWarnings("serial") public class MarkdownBlobEditPanel extends BlobEditPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java index c73d836ac4..4b1206a803 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.markdown; +package io.onedev.server.web.page.project.blob.render.renderers.markdown; import java.nio.charset.Charset; @@ -8,13 +8,13 @@ import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.markup.html.form.FormComponentPanel; import org.apache.wicket.model.Model; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.MarkdownManager; -import com.turbodev.server.util.ContentDetector; -import com.turbodev.server.web.component.markdown.MarkdownEditor; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.OneDev; +import io.onedev.server.manager.MarkdownManager; +import io.onedev.server.util.ContentDetector; +import io.onedev.server.web.component.markdown.MarkdownEditor; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") abstract class MarkdownBlobEditor extends FormComponentPanel { @@ -48,7 +48,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel { @Override protected String renderMarkdown(String markdown) { - MarkdownManager markdownManager = TurboDev.getInstance(MarkdownManager.class); + MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class); String html = markdownManager.render(markdown); return markdownManager.process(html, context); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java index 4c53fd4cd8..954891dbdb 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.markdown; +package io.onedev.server.web.page.project.blob.render.renderers.markdown; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class MarkdownBlobResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java index 80acce3014..49828125d8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobViewPanel.java @@ -1,13 +1,13 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.markdown; +package io.onedev.server.web.page.project.blob.render.renderers.markdown; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.Model; -import com.turbodev.server.git.Blob; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.git.Blob; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; @SuppressWarnings("serial") public class MarkdownBlobViewPanel extends BlobViewPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java index 03ff701b18..4f56b91c8c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.markdown; +package io.onedev.server.web.page.project.blob.render.renderers.markdown; import javax.annotation.Nullable; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.page.project.blob.render.renderers.source.SourceViewPanel; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.page.project.blob.render.renderers.source.SourceViewPanel; @SuppressWarnings("serial") public class MarkdownRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/markdown-blob.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java similarity index 59% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java index c7b305fc7f..00288b3776 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.noname; +package io.onedev.server.web.page.project.blob.render.renderers.noname; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; @SuppressWarnings("serial") public class NoNameCssResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java index 44da8ffe37..a1ef27f4e5 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.noname; +package io.onedev.server.web.page.project.blob.render.renderers.noname; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.form.FormComponentPanel; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.edit.BlobEditPanel; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel; @SuppressWarnings("serial") public class NoNameEditPanel extends BlobEditPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java index bf2357f926..72ab16c146 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.noname; +package io.onedev.server.web.page.project.blob.render.renderers.noname; import org.apache.wicket.markup.html.form.FormComponentPanel; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java index a65564ad16..b723c80359 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.noname; +package io.onedev.server.web.page.project.blob.render.renderers.noname; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class NoNameRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/no-name.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/no-name.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/noname/no-name.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/no-name.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java index 526451a21c..2e08065fa9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.source; +package io.onedev.server.web.page.project.blob.render.renderers.source; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -15,14 +15,15 @@ import org.unbescape.javascript.JavaScriptEscape; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.web.component.sourceformat.OptionChangeCallback; -import com.turbodev.server.web.component.sourceformat.SourceFormatPanel; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.page.project.blob.render.edit.BlobEditPanel; -import com.turbodev.server.web.page.project.blob.render.view.Markable; + +import io.onedev.server.OneDev; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.web.component.sourceformat.OptionChangeCallback; +import io.onedev.server.web.component.sourceformat.SourceFormatPanel; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel; +import io.onedev.server.web.page.project.blob.render.view.Markable; @SuppressWarnings("serial") public class SourceEditPanel extends BlobEditPanel implements Markable { @@ -47,7 +48,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { @Override public void onOptioneChange(AjaxRequestTarget target) { - String script = String.format("turbodev.server.sourceEdit.onIndentTypeChange('%s', '%s');", + String script = String.format("onedev.server.sourceEdit.onIndentTypeChange('%s', '%s');", sourceFormComponent.getMarkupId(), sourceFormat.getIndentType()); target.appendJavaScript(script); } @@ -56,7 +57,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { @Override public void onOptioneChange(AjaxRequestTarget target) { - String script = String.format("turbodev.server.sourceEdit.onTabSizeChange('%s', %s);", + String script = String.format("onedev.server.sourceEdit.onTabSizeChange('%s', %s);", sourceFormComponent.getMarkupId(), sourceFormat.getTabSize()); target.appendJavaScript(script); } @@ -65,7 +66,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { @Override public void onOptioneChange(AjaxRequestTarget target) { - String script = String.format("turbodev.server.sourceEdit.onLineWrapModeChange('%s', '%s');", + String script = String.format("onedev.server.sourceEdit.onLineWrapModeChange('%s', '%s');", sourceFormComponent.getMarkupId(), sourceFormat.getLineWrapMode()); target.appendJavaScript(script); } @@ -120,7 +121,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { @Override public CharSequence getBeforeHandler(Component component) { - return String.format("turbodev.server.sourceEdit.onSubmit('%s');", + return String.format("onedev.server.sourceEdit.onSubmit('%s');", sourceFormComponent.getMarkupId()); } @@ -141,7 +142,7 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey()); String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined"; - String script = String.format("turbodev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');", + String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');", sourceFormComponent.getMarkupId(), JavaScriptEscape.escapeJavaScript(context.getNewPath()), jsonOfMark, @@ -152,14 +153,14 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { autosaveKey); response.render(OnDomReadyHeaderItem.forScript(script)); - script = String.format("turbodev.server.sourceEdit.onWindowLoad('%s', %s, '%s');", + script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');", sourceFormComponent.getMarkupId(), jsonOfMark, autosaveKey); response.render(OnLoadHeaderItem.forScript(script)); } private String getJson(TextRange mark) { try { - return TurboDev.getInstance(ObjectMapper.class).writeValueAsString(mark); + return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -169,10 +170,10 @@ public class SourceEditPanel extends BlobEditPanel implements Markable { public void mark(AjaxRequestTarget target, TextRange mark) { String script; if (mark != null) { - script = String.format("turbodev.server.sourceEdit.mark('%s', %s);", + script = String.format("onedev.server.sourceEdit.mark('%s', %s);", sourceFormComponent.getMarkupId(), getJson(mark)); } else { - script = String.format("turbodev.server.sourceEdit.mark('%s', undefined);", + script = String.format("onedev.server.sourceEdit.mark('%s', undefined);", sourceFormComponent.getMarkupId()); } target.appendJavaScript(script); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java index 7f13eca6bf..82b3bd1225 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.source; +package io.onedev.server.web.page.project.blob.render.renderers.source; import java.util.List; @@ -6,12 +6,12 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference; -import com.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.diffmatchpatch.DiffMatchPatchResourceReference; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.diffmatchpatch.DiffMatchPatchResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class SourceEditResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java index 5e522e4f83..58971bda5a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.source; +package io.onedev.server.web.page.project.blob.render.renderers.source; import java.nio.charset.Charset; @@ -6,9 +6,10 @@ import org.apache.wicket.markup.html.form.FormComponentPanel; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.Model; -import com.turbodev.utils.StringUtils; import com.google.common.base.Charsets; -import com.turbodev.server.util.ContentDetector; + +import io.onedev.server.util.ContentDetector; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") class SourceFormComponent extends FormComponentPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java index 085b5e4b6a..74eddff022 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.source; +package io.onedev.server.web.page.project.blob.render.renderers.source; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class SourceRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java index 3bd07e1892..cce0d65ed6 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.source; +package io.onedev.server.web.page.project.blob.render.renderers.source; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -54,60 +54,60 @@ import org.unbescape.javascript.JavaScriptEscape; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; -import com.turbodev.jsymbol.Symbol; -import com.turbodev.jsymbol.SymbolExtractor; -import com.turbodev.jsymbol.SymbolExtractorRegistry; -import com.turbodev.jsymbol.TokenPosition; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlameBlock; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.BlameCommand; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.model.support.ProjectAndRevision; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.search.SearchManager; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.blamemessage.BlameMessageBehavior; -import com.turbodev.server.web.component.comment.CodeCommentPanel; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.component.menu.MenuItem; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.component.revisionpicker.RevisionSelector; -import com.turbodev.server.web.component.sourceformat.OptionChangeCallback; -import com.turbodev.server.web.component.sourceformat.SourceFormatPanel; -import com.turbodev.server.web.component.symboltooltip.SymbolTooltipPanel; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; -import com.turbodev.server.web.page.project.blob.render.view.Markable; -import com.turbodev.server.web.page.project.blob.search.SearchMenuContributor; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.WicketUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.utils.Range; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.jsymbol.Symbol; +import io.onedev.jsymbol.SymbolExtractor; +import io.onedev.jsymbol.SymbolExtractorRegistry; +import io.onedev.jsymbol.TokenPosition; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlameBlock; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.BlameCommand; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.model.support.ProjectAndRevision; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.search.SearchManager; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.blamemessage.BlameMessageBehavior; +import io.onedev.server.web.component.comment.CodeCommentPanel; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.component.menu.MenuItem; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.revisionpicker.RevisionSelector; +import io.onedev.server.web.component.sourceformat.OptionChangeCallback; +import io.onedev.server.web.component.sourceformat.SourceFormatPanel; +import io.onedev.server.web.component.symboltooltip.SymbolTooltipPanel; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.web.page.project.blob.render.view.Markable; +import io.onedev.server.web.page.project.blob.search.SearchMenuContributor; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.WicketUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.utils.Range; +import io.onedev.utils.StringUtils; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; /** * Make sure to add only one source view panel per page @@ -131,7 +131,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe @Override protected Map load() { - return TurboDev.getInstance(CodeCommentManager.class).findHistory( + return OneDev.getInstance(CodeCommentManager.class).findHistory( context.getProject(), context.getCommit(), context.getBlobIdent().path); } @@ -158,7 +158,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe SymbolExtractor extractor = SymbolExtractorRegistry.getExtractor(blobName); if (extractor != null) { try { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); List cachedSymbols = searchManager.getSymbols(context.getProject(), blob.getBlobId(), blob.getIdent().path); if (cachedSymbols != null) @@ -178,7 +178,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe @Override public void onOptioneChange(AjaxRequestTarget target) { - String script = String.format("turbodev.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize()); + String script = String.format("onedev.server.sourceView.onTabSizeChange(%s);", sourceFormat.getTabSize()); target.appendJavaScript(script); } @@ -186,7 +186,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe @Override public void onOptioneChange(AjaxRequestTarget target) { - String script = String.format("turbodev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode()); + String script = String.format("onedev.server.sourceView.onLineWrapModeChange('%s');", sourceFormat.getLineWrapMode()); target.appendJavaScript(script); } @@ -231,12 +231,12 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe cookie.setMaxAge(Integer.MAX_VALUE); response.addCookie(cookie); target.add(outline); - target.appendJavaScript("turbodev.server.sourceView.onToggleOutline();"); + target.appendJavaScript("onedev.server.sourceView.onToggleOutline();"); } private String getJson(TextRange mark) { try { - return TurboDev.getInstance(ObjectMapper.class).writeValueAsString(mark); + return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -251,7 +251,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript("turbodev.server.sourceView.initComment();")); + response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initComment();")); } }; @@ -415,7 +415,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe } } - String script = String.format("turbodev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);", + String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s, %s);", getJson(mark), context.getMarkUrl(mark), SecurityUtils.getUser()!=null, unableCommentMessage!=null?"'" + unableCommentMessage + "'":"undefined"); target.appendJavaScript(script); @@ -486,8 +486,8 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe @Override public void onClick(AjaxRequestTarget target) { clearComment(target); - target.appendJavaScript("turbodev.server.sourceView.mark(undefined);"); - target.appendJavaScript("turbodev.server.sourceView.onLayoutChange();"); + target.appendJavaScript("onedev.server.sourceView.mark(undefined);"); + target.appendJavaScript("onedev.server.sourceView.onLayoutChange();"); context.onMark(target, null); } @@ -516,7 +516,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe comment.setProject(context.getProject()); comment.setCompareContext(getCompareContext()); - TurboDev.getInstance(CodeCommentManager.class).save(comment, context.getPullRequest()); + OneDev.getInstance(CodeCommentManager.class).save(comment, context.getPullRequest()); CodeCommentPanel commentPanel = new CodeCommentPanel(fragment.getId(), comment.getId()) { @@ -545,7 +545,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe target.add(commentContainer); String script = String.format("" - + "turbodev.server.sourceView.onCommentAdded(%s);" + + "onedev.server.sourceView.onCommentAdded(%s);" + "localStorage.removeItem('%s');", getJsonOfComment(comment), autosaveKey); @@ -560,11 +560,11 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe commentContainer.setVisible(true); target.add(commentContainer); context.onAddComment(target, mark); - target.appendJavaScript(String.format("turbodev.server.sourceView.onAddComment(%s);", getJson(mark))); + target.appendJavaScript(String.format("onedev.server.sourceView.onAddComment(%s);", getJson(mark))); break; case "toggleComment": Long commentId = params.getParameterValue("param1").toLong(); - CodeComment comment = TurboDev.getInstance(CodeCommentManager.class).load(commentId); + CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(commentId); if (!comment.equals(context.getOpenComment())) { CodeCommentPanel commentPanel = new CodeCommentPanel(BODY_ID, commentId) { @@ -592,7 +592,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe commentContainer.replace(commentPanel); commentContainer.setVisible(true); target.add(commentContainer); - script = String.format("turbodev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment)); + script = String.format("onedev.server.sourceView.onOpenComment(%s);", getJsonOfComment(comment)); target.appendJavaScript(script); context.onCommentOpened(target, comment); } else { @@ -636,7 +636,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe tree.expand(current); current = current.getParent(); } - script = String.format("turbodev.server.sourceView.syncOutline('%s');", + script = String.format("onedev.server.sourceView.syncOutline('%s');", getSymbolId(symbols, closest)); target.appendJavaScript(script); } @@ -659,7 +659,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript("turbodev.server.sourceView.initOutline();")); + response.render(OnDomReadyHeaderItem.forScript("onedev.server.sourceView.initOutline();")); } }; @@ -793,7 +793,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe String jsonOfCommentInfo; try { - jsonOfCommentInfo = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo); + jsonOfCommentInfo = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfo); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -808,7 +808,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe private void onCommentDeleted(AjaxRequestTarget target, CodeComment comment) { clearComment(target); - String script = String.format("turbodev.server.sourceView.onCommentDeleted(%s);", + String script = String.format("onedev.server.sourceView.onCommentDeleted(%s);", getJsonOfComment(comment)); target.appendJavaScript(script); context.onCommentOpened(target, null); @@ -855,7 +855,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe blameInfos.add(blameInfo); } try { - jsonOfBlameInfos = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos); + jsonOfBlameInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(blameInfos); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -895,7 +895,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe String jsonOfCommentInfos; try { - jsonOfCommentInfos = TurboDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfos); + jsonOfCommentInfos = OneDev.getInstance(ObjectMapper.class).writeValueAsString(commentInfos); } catch (JsonProcessingException e) { throw new RuntimeException(e); } @@ -906,7 +906,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe explicit("action"), explicit("param1"), explicit("param2"), explicit("param3"), explicit("param4")); - String script = String.format("turbodev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', " + String script = String.format("onedev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', " + "%s, %s, %s, %s, %s, '%s');", JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path), JavaScriptEscape.escapeJavaScript(blob.getText().getContent()), @@ -922,7 +922,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe sourceFormat.getLineWrapMode()); response.render(OnDomReadyHeaderItem.forScript(script)); - script = String.format("turbodev.server.sourceView.onWindowLoad(%s);", jsonOfMark); + script = String.format("onedev.server.sourceView.onWindowLoad(%s);", jsonOfMark); response.render(OnLoadHeaderItem.forScript(script)); } @@ -975,9 +975,9 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe public void mark(AjaxRequestTarget target, TextRange mark) { String script; if (mark != null) { - script = String.format("turbodev.server.sourceView.mark(%s);", getJson(mark)); + script = String.format("onedev.server.sourceView.mark(%s);", getJson(mark)); } else { - script = String.format("turbodev.server.sourceView.mark(undefined);"); + script = String.format("onedev.server.sourceView.mark(undefined);"); } target.appendJavaScript(script); } @@ -1068,7 +1068,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe clearComment(target); if (context.getOpenComment() != null) context.onCommentOpened(target, null); - target.appendJavaScript("turbodev.server.sourceView.onCloseComment();"); + target.appendJavaScript("onedev.server.sourceView.onCloseComment();"); } private Component newOutlineSearchPanel(String id, ModalPanel modal) { @@ -1142,7 +1142,7 @@ public class SourceViewPanel extends BlobViewPanel implements Markable, SearchMe public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); String script = String.format( - "turbodev.server.sourceView.onOutlineSearchDomReady('%s', %s);", + "onedev.server.sourceView.onOutlineSearchDomReady('%s', %s);", fragment.getMarkupId(), getCallbackFunction(explicit("key"), explicit("param"))); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java similarity index 62% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java index 748f629017..4c4e39636a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.source; +package io.onedev.server.web.page.project.blob.render.renderers.source; import java.util.List; @@ -6,17 +6,17 @@ import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; -import com.turbodev.server.web.asset.clipboard.ClipboardResourceReference; -import com.turbodev.server.web.asset.codemirror.CodeMirrorResourceReference; -import com.turbodev.server.web.asset.cookies.CookiesResourceReference; -import com.turbodev.server.web.asset.doneevents.DoneEventsResourceReference; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.asset.hover.HoverResourceReference; -import com.turbodev.server.web.asset.jqueryui.JQueryUIResourceReference; -import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; -import com.turbodev.server.web.asset.selectionpopover.SelectionPopoverResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.clipboard.ClipboardResourceReference; +import io.onedev.server.web.asset.codemirror.CodeMirrorResourceReference; +import io.onedev.server.web.asset.cookies.CookiesResourceReference; +import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.asset.hover.HoverResourceReference; +import io.onedev.server.web.asset.jqueryui.JQueryUIResourceReference; +import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; +import io.onedev.server.web.asset.selectionpopover.SelectionPopoverResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class SourceViewResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-edit.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-edit.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-edit.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-edit.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js index ed17a84f79..048400ec44 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-edit.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js @@ -1,4 +1,4 @@ -turbodev.server.sourceEdit = { +onedev.server.sourceEdit = { onDomReady: function(containerId, filePath, mark, indentType, tabSize, lineWrapMode, autoFocus, autosaveKey) { var $container = $("#" + containerId); @@ -24,7 +24,7 @@ turbodev.server.sourceEdit = { highlightIdentifiers: {delay: 500} }); - turbodev.server.codemirror.setMode(cm, filePath); + onedev.server.codemirror.setMode(cm, filePath); /* * AreYouSure can not track dirty correctly for CodeMirror generated @@ -35,11 +35,11 @@ turbodev.server.sourceEdit = { $sourceEdit.closest("form").find("textarea").addClass("no-dirtytrack"); if (mark) - turbodev.server.codemirror.mark(cm, mark); + onedev.server.codemirror.mark(cm, mark); cm.oldDocValue = cm.doc.getValue(); - turbodev.server.codemirror.bindShortcuts(cm); + onedev.server.codemirror.bindShortcuts(cm); var doneTimer; cm.on("change", function() { @@ -54,10 +54,10 @@ turbodev.server.sourceEdit = { }); $sourceEdit.on("getViewState", function(e) { - return turbodev.server.codemirror.getViewState(cm); + return onedev.server.codemirror.getViewState(cm); }); $sourceEdit.on("setViewState", function(e, viewState) { - turbodev.server.codemirror.setViewState(cm, viewState); + onedev.server.codemirror.setViewState(cm, viewState); }); $sourceEdit.on("autofit", function(e, width, height) { @@ -78,8 +78,8 @@ turbodev.server.sourceEdit = { onWindowLoad: function(containerId, mark, autosaveKey) { var $container = $("#" + containerId); var $warning = $container.find(">.source-edit>.warning"); - var cm = turbodev.server.sourceEdit.getCodeMirror(containerId); - turbodev.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey); + var cm = onedev.server.sourceEdit.getCodeMirror(containerId); + onedev.server.form.registerAutosaveKey($container.closest("form.leave-confirm"), autosaveKey); var autosaveValue = localStorage.getItem(autosaveKey); if (autosaveValue) { cm.doc.setValue(autosaveValue); @@ -87,13 +87,13 @@ turbodev.server.sourceEdit = { $(window).resize(); } - if (mark && turbodev.server.viewState.getFromHistory() === undefined - && turbodev.server.viewState.carryOver === undefined) { - turbodev.server.codemirror.scrollTo(cm, mark); + if (mark && onedev.server.viewState.getFromHistory() === undefined + && onedev.server.viewState.carryOver === undefined) { + onedev.server.codemirror.scrollTo(cm, mark); } }, mark: function(containerId, mark) { - var cm = turbodev.server.sourceEdit.getCodeMirror(containerId); + var cm = onedev.server.sourceEdit.getCodeMirror(containerId); if (mark) { if (cm.oldDocValue) { var dmp = new diff_match_patch(); @@ -159,30 +159,30 @@ turbodev.server.sourceEdit = { endLine: newEndLine, endChar: newEndChar }; - turbodev.server.codemirror.mark(cm, newMark); - turbodev.server.codemirror.scrollTo(cm, newMark); + onedev.server.codemirror.mark(cm, newMark); + onedev.server.codemirror.scrollTo(cm, newMark); } } else { - turbodev.server.codemirror.clearMark(cm); + onedev.server.codemirror.clearMark(cm); } }, getCodeMirror: function(containerId) { return $("#" + containerId + ">.source-edit>.code>.CodeMirror")[0].CodeMirror; }, onSubmit: function(containerId) { - var cm = turbodev.server.sourceEdit.getCodeMirror(containerId); + var cm = onedev.server.sourceEdit.getCodeMirror(containerId); $("#" + containerId + ">.source-edit>textarea").val(cm.getValue()); }, onIndentTypeChange: function(containerId, indentType) { - var cm = turbodev.server.sourceEdit.getCodeMirror(containerId); + var cm = onedev.server.sourceEdit.getCodeMirror(containerId); cm.setOption("indentWithTabs", indentType == "Tabs"); }, onLineWrapModeChange: function(containerId, lineWrapMode) { - var cm = turbodev.server.sourceEdit.getCodeMirror(containerId); + var cm = onedev.server.sourceEdit.getCodeMirror(containerId); cm.setOption("lineWrapping", lineWrapMode == "Soft wrap"); }, onTabSizeChange: function(containerId, tabSize) { - var cm = turbodev.server.sourceEdit.getCodeMirror(containerId); + var cm = onedev.server.sourceEdit.getCodeMirror(containerId); cm.setOption("tabSize", tabSize); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js index 9a186817e0..9a71d02b1f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/source-view.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js @@ -1,4 +1,4 @@ -turbodev.server.sourceView = { +onedev.server.sourceView = { onDomReady: function(filePath, fileContent, openComment, mark, symbolTooltipId, revision, blameInfos, comments, callback, blameMessageCallback, tabSize, lineWrapMode) { @@ -8,7 +8,7 @@ turbodev.server.sourceView = { var cm = CodeMirror($code[0], { value: fileContent, - readOnly: turbodev.server.util.isDevice()?"nocursor": true, + readOnly: onedev.server.util.isDevice()?"nocursor": true, theme: "eclipse", lineNumbers: true, lineWrapping: lineWrapMode == "Soft wrap", @@ -23,13 +23,13 @@ turbodev.server.sourceView = { gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"] }); - turbodev.server.codemirror.setMode(cm, filePath); + onedev.server.codemirror.setMode(cm, filePath); $sourceView.data("callback", callback); $sourceView.data("blameMessageCallback", blameMessageCallback); if (mark) { - turbodev.server.codemirror.mark(cm, mark); + onedev.server.codemirror.mark(cm, mark); $sourceView.data("mark", mark); cm.setCursor({line: mark.beginLine, ch: 0}); } @@ -42,16 +42,16 @@ turbodev.server.sourceView = { cm.setOption("gutters", gutters); for (var line in comments) { if (comments.hasOwnProperty(line)) { - turbodev.server.sourceView.addCommentGutter(line, comments[line][1]); + onedev.server.sourceView.addCommentGutter(line, comments[line][1]); } } if (blameInfos) { - turbodev.server.sourceView.blame(blameInfos); + onedev.server.sourceView.blame(blameInfos); } - turbodev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.highlightCommentTrigger(); - turbodev.server.codemirror.bindShortcuts(cm); + onedev.server.codemirror.bindShortcuts(cm); if (!($(document).data("SourceViewShortcutsBinded"))) { $(document).data("SourceViewShortcutsBinded", true); @@ -61,7 +61,7 @@ turbodev.server.sourceView = { * properly in readonly mode */ $(document).on("keydown", function(e) { - if ($(".modal:visible").length == 0 && !turbodev.server.util.canInput(e.target) + if ($(".modal:visible").length == 0 && !onedev.server.util.canInput(e.target) && e.keyCode == 79) { var $sourceView = $(".source-view"); if ($sourceView.length != 0 && $(".outline-toggle").length != 0) @@ -96,8 +96,8 @@ turbodev.server.sourceView = { }); cm.on("scroll", function() { - turbodev.server.symboltooltip.removeTooltip(document.getElementById(symbolTooltipId)); - turbodev.server.mouseState.moved = false; + onedev.server.symboltooltip.removeTooltip(document.getElementById(symbolTooltipId)); + onedev.server.mouseState.moved = false; repositionCommentPopovers(); }); @@ -115,10 +115,10 @@ turbodev.server.sourceView = { }); $sourceView.on("getViewState", function() { - return turbodev.server.codemirror.getViewState(cm); + return onedev.server.codemirror.getViewState(cm); }); $sourceView.on("setViewState", function(e, viewState) { - return turbodev.server.codemirror.setViewState(cm, viewState); + return onedev.server.codemirror.setViewState(cm, viewState); }); $sourceView.on("autofit", function(event, width, height) { @@ -183,10 +183,10 @@ turbodev.server.sourceView = { } }, onWindowLoad: function(mark) { - if (mark && turbodev.server.viewState.getFromHistory() === undefined - && turbodev.server.viewState.carryOver === undefined) { + if (mark && onedev.server.viewState.getFromHistory() === undefined + && onedev.server.viewState.carryOver === undefined) { var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror; - turbodev.server.codemirror.scrollTo(cm, mark); + onedev.server.codemirror.scrollTo(cm, mark); } }, initComment: function() { @@ -259,9 +259,9 @@ turbodev.server.sourceView = { var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror; var mark = $sourceView.data("mark"); if (mark) { - turbodev.server.codemirror.mark(cm, mark); + onedev.server.codemirror.mark(cm, mark); } else { - turbodev.server.codemirror.clearMark(cm); + onedev.server.codemirror.clearMark(cm); } }, addCommentGutter: function(line, comments) { @@ -299,10 +299,10 @@ turbodev.server.sourceView = { $(".comment-popover[data-line='" + line + "'] a").each(function() { $(this).mouseover(function() { var comment = comments[$(this).index()]; - turbodev.server.codemirror.mark(cm, comment.mark); + onedev.server.codemirror.mark(cm, comment.mark); }); $(this).mouseout(function() { - turbodev.server.sourceView.restoreMark(); + onedev.server.sourceView.restoreMark(); }); $(this).click(function() { if ($(".source-view form.dirty").length != 0 @@ -313,17 +313,17 @@ turbodev.server.sourceView = { callback("toggleComment", comment.id); }); }); - turbodev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.highlightCommentTrigger(); }); } else { var comment = comments[0]; $gutter.append(""); var $indicator = $gutter.children("a"); $indicator.mouseover(function() { - turbodev.server.codemirror.mark(cm, comment.mark); + onedev.server.codemirror.mark(cm, comment.mark); }); $indicator.mouseout(function() { - turbodev.server.sourceView.restoreMark(); + onedev.server.sourceView.restoreMark(); }); $indicator.click(function() { if ($(".source-view form.dirty").length != 0 @@ -397,9 +397,9 @@ turbodev.server.sourceView = { comments = []; } comments.push(comment); - turbodev.server.sourceView.addCommentGutter(line, comments); - turbodev.server.sourceView.highlightCommentTrigger(); - turbodev.server.sourceView.onLayoutChange(); + onedev.server.sourceView.addCommentGutter(line, comments); + onedev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.onLayoutChange(); }, onCommentDeleted: function(comment) { var $sourceView = $(".source-view"); @@ -419,56 +419,56 @@ turbodev.server.sourceView = { break; } } - turbodev.server.sourceView.addCommentGutter(line, comments); + onedev.server.sourceView.addCommentGutter(line, comments); } - turbodev.server.sourceView.highlightCommentTrigger(); - turbodev.server.sourceView.onLayoutChange(); + onedev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.onLayoutChange(); - turbodev.server.sourceView.mark(undefined); + onedev.server.sourceView.mark(undefined); }, onLayoutChange: function() { $sourceView = $('.source-view'); $sourceView.triggerHandler('autofit', [$sourceView.outerWidth(), $sourceView.outerHeight()]); }, onAddComment: function(mark) { - turbodev.server.sourceView.exitFullScreen(); + onedev.server.sourceView.exitFullScreen(); var $sourceView = $(".source-view"); $sourceView.removeData("openComment"); $sourceView.data("mark", mark); $(".source-view>.code").selectionPopover("close"); var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror; - turbodev.server.codemirror.clearSelection(cm); - turbodev.server.sourceView.onLayoutChange(); + onedev.server.codemirror.clearSelection(cm); + onedev.server.sourceView.onLayoutChange(); // Mark again to make sure marked text still exists in viewport after layout change - turbodev.server.sourceView.mark(mark); + onedev.server.sourceView.mark(mark); - turbodev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.highlightCommentTrigger(); var $textarea = $sourceView.find(".comment textarea"); $textarea.caret($textarea.val().length); }, onOpenComment: function(comment) { - turbodev.server.sourceView.exitFullScreen(); + onedev.server.sourceView.exitFullScreen(); var $sourceView = $(".source-view"); $sourceView.data("openComment", comment); $sourceView.data("mark", comment.mark); - turbodev.server.sourceView.highlightCommentTrigger(); - turbodev.server.sourceView.onLayoutChange(); + onedev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.onLayoutChange(); // Mark again to make sure marked text still exists in viewport after layout change - turbodev.server.sourceView.mark(comment.mark); + onedev.server.sourceView.mark(comment.mark); }, onCloseComment: function() { var $sourceView = $(".source-view"); $sourceView.removeData("openComment"); - turbodev.server.sourceView.highlightCommentTrigger(); - turbodev.server.sourceView.onLayoutChange(); - turbodev.server.sourceView.mark(undefined); + onedev.server.sourceView.highlightCommentTrigger(); + onedev.server.sourceView.onLayoutChange(); + onedev.server.sourceView.mark(undefined); }, onToggleOutline: function() { - turbodev.server.sourceView.exitFullScreen(); - turbodev.server.sourceView.onLayoutChange(); + onedev.server.sourceView.exitFullScreen(); + onedev.server.sourceView.onLayoutChange(); $(".outline-toggle").prop("checked", $(".source-view>.outline").is(":visible")); }, highlightCommentTrigger: function() { @@ -516,12 +516,12 @@ turbodev.server.sourceView = { var cm = $(".source-view>.code>.CodeMirror")[0].CodeMirror; if (mark) { $(".source-view").data("mark", mark); - turbodev.server.codemirror.mark(cm, mark); - turbodev.server.codemirror.scrollTo(cm, mark); + onedev.server.codemirror.mark(cm, mark); + onedev.server.codemirror.scrollTo(cm, mark); cm.setCursor({line: mark.beginLine, ch: 0}); } else { $(".source-view").removeData("mark"); - turbodev.server.codemirror.clearMark(cm); + onedev.server.codemirror.clearMark(cm); } }, blame: function(blameInfos) { @@ -542,7 +542,7 @@ turbodev.server.sourceView = { $("" + blameInfo.abbreviatedHash + "") .appendTo($gutter) .attr("href", blameInfo.url) - .attr("onclick", "turbodev.server.viewState.getFromViewAndSetToHistory();"); + .attr("onclick", "onedev.server.viewState.getFromViewAndSetToHistory();"); var $hashLink = $gutter.children("a.hash"); $hashLink.data("hash", blameInfo.hash); $hashLink.data("line", range.from); @@ -595,7 +595,7 @@ turbodev.server.sourceView = { }, 100); function onReturn() { - if (turbodev.server.form.confirmLeave()) { + if (onedev.server.form.confirmLeave()) { var $result = $body.children(".result"); var $active = $result.find("a.active"); if ($active.length != 0) { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/vgrabber.png b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/vgrabber.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/source/vgrabber.png rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/vgrabber.png diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java index a6b9104652..2ad04ef914 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.symbollink; +package io.onedev.server.web.page.project.blob.render.renderers.symbollink; import java.io.File; import java.io.IOException; @@ -14,13 +14,13 @@ import org.eclipse.jgit.revwalk.RevTree; import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.treewalk.TreeWalk; -import com.turbodev.utils.PathUtils; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.utils.PathUtils; @SuppressWarnings("serial") public class SymbolLinkPanel extends BlobViewPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java index 32e28d8088..4debbde779 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.symbollink; +package io.onedev.server.web.page.project.blob.render.renderers.symbollink; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class SymbolLinkRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java index ac737925de..2193c8498d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.symbollink; +package io.onedev.server.web.page.project.blob.render.renderers.symbollink; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/symbol-link.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/symbol-link.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/symbollink/symbol-link.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/symbol-link.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java index 69584d6522..9451f42ab3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.video; +package io.onedev.server.web.page.project.blob.render.renderers.video; import org.apache.wicket.Component; -import com.turbodev.server.web.PrioritizedComponentRenderer; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRendererContribution; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.PrioritizedComponentRenderer; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRendererContribution; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; public class VideoRendererProvider implements BlobRendererContribution { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java similarity index 75% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java index b1d8f74b44..5f3691642e 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.video; +package io.onedev.server.web.page.project.blob.render.renderers.video; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.head.CssHeaderItem; @@ -6,10 +6,10 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.view.BlobViewPanel; -import com.turbodev.server.web.util.resource.RawBlobResource; -import com.turbodev.server.web.util.resource.RawBlobResourceReference; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel; +import io.onedev.server.web.util.resource.RawBlobResource; +import io.onedev.server.web.util.resource.RawBlobResourceReference; @SuppressWarnings("serial") public class VideoViewPanel extends BlobViewPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewResourceReference.java index 1634edd165..2256aa28e3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/VideoViewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoViewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.renderers.video; +package io.onedev.server.web.page.project.blob.render.renderers.video; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/video-view.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/video-view.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/renderers/video/video-view.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/video-view.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java index 6e6c14a53b..74f53028be 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.view; +package io.onedev.server.web.page.project.blob.render.view; import javax.annotation.Nullable; @@ -21,22 +21,23 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.Model; -import com.turbodev.utils.FileUtils; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.util.ajaxlistener.TrackViewStateListener; -import com.turbodev.server.web.util.resource.RawBlobResource; -import com.turbodev.server.web.util.resource.RawBlobResourceReference; + +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.util.ajaxlistener.TrackViewStateListener; +import io.onedev.server.web.util.resource.RawBlobResource; +import io.onedev.server.web.util.resource.RawBlobResourceReference; +import io.onedev.utils.FileUtils; @SuppressWarnings("serial") public abstract class BlobViewPanel extends Panel { @@ -72,8 +73,8 @@ public abstract class BlobViewPanel extends Panel { Project project = context.getProject(); if (SecurityUtils.canWrite(project) && context.isOnBranch()) { - ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class); - User user = TurboDev.getInstance(UserManager.class).getCurrent(); + ProjectManager projectManager = OneDev.getInstance(ProjectManager.class); + User user = OneDev.getInstance(UserManager.class).getCurrent(); boolean needsQualityCheck = projectManager.isModificationNeedsQualityCheck( user, project, context.getBlobIdent().revision, context.getBlobIdent().path); @@ -240,7 +241,7 @@ public abstract class BlobViewPanel extends Panel { response.render(JavaScriptHeaderItem.forReference(new BlobViewResourceReference())); - response.render(OnDomReadyHeaderItem.forScript(String.format("turbodev.server.blobView.onDomReady('%s');", getMarkupId()))); + response.render(OnDomReadyHeaderItem.forScript(String.format("onedev.server.blobView.onDomReady('%s');", getMarkupId()))); } public BlobRenderContext getContext() { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewResourceReference.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewResourceReference.java index a890c34700..3f9202de5d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/BlobViewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.render.view; +package io.onedev.server.web.page.project.blob.render.view; 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.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class BlobViewResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/Markable.java b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/Markable.java similarity index 61% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/Markable.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/view/Markable.java index 5def9aa282..1e1d6f4a99 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/Markable.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/Markable.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.project.blob.render.view; +package io.onedev.server.web.page.project.blob.render.view; import javax.annotation.Nullable; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.model.support.TextRange; +import io.onedev.server.model.support.TextRange; public interface Markable { void mark(AjaxRequestTarget target, @Nullable TextRange mark); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.js b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.js similarity index 97% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.js index 89d4086ee7..2a5963259c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/render/view/blob-view.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/render/view/blob-view.js @@ -1,4 +1,4 @@ -turbodev.server.blobView = { +onedev.server.blobView = { onDomReady: function(containerId) { var $blobView = $("#" + containerId + ">.blob-view"); diff --git a/web/src/main/java/io/onedev/server/web/page/project/blob/search/SearchMenuContributor.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/SearchMenuContributor.java new file mode 100644 index 0000000000..0f9803a37d --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/SearchMenuContributor.java @@ -0,0 +1,12 @@ +package io.onedev.server.web.page.project.blob.search; + +import java.util.List; + +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.menu.MenuItem; + +public interface SearchMenuContributor { + + List getMenuItems(FloatingPanel dropdown); + +} diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java index 2b63d89c79..06d1865edb 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.advanced; +package io.onedev.server.web.page.project.blob.search.advanced; import java.io.Serializable; import java.util.ArrayList; @@ -34,25 +34,24 @@ import org.apache.wicket.validation.IValidatable; import org.apache.wicket.validation.IValidationError; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.Project; -import com.turbodev.server.search.SearchManager; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.query.BlobQuery; -import com.turbodev.server.search.query.FileQuery; -import com.turbodev.server.search.query.SymbolQuery; -import com.turbodev.server.search.query.TextQuery; -import com.turbodev.server.search.query.TooGeneralQueryException; -import com.turbodev.server.web.WebSession; -import com.turbodev.server.web.behavior.RunTaskBehavior; -import com.turbodev.server.web.component.tabbable.AjaxActionTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.page.project.blob.search.result.SearchResultPanel; -import com.turbodev.utils.StringUtils; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.Project; +import io.onedev.server.search.SearchManager; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.query.BlobQuery; +import io.onedev.server.search.query.FileQuery; +import io.onedev.server.search.query.SymbolQuery; +import io.onedev.server.search.query.TextQuery; +import io.onedev.server.search.query.TooGeneralQueryException; +import io.onedev.server.web.WebSession; +import io.onedev.server.web.behavior.RunTaskBehavior; +import io.onedev.server.web.component.tabbable.AjaxActionTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel; +import io.onedev.utils.StringUtils; import jersey.repackaged.com.google.common.base.Throwables; @SuppressWarnings("serial") @@ -536,7 +535,7 @@ public abstract class AdvancedSearchPanel extends Panel { @Override public List query(AdvancedSearchPanel context) throws InterruptedException { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); List hits; BlobQuery query = new SymbolQuery.Builder() .term(term) @@ -576,7 +575,7 @@ public abstract class AdvancedSearchPanel extends Panel { @Override public List query(AdvancedSearchPanel context) throws InterruptedException { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); BlobQuery query = new FileQuery.Builder() .fileNames(term) .caseSensitive(caseSensitive) @@ -604,7 +603,7 @@ public abstract class AdvancedSearchPanel extends Panel { @Override public List query(AdvancedSearchPanel context) throws InterruptedException { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); BlobQuery query = new TextQuery.Builder() .term(term) .regex(regex) diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java index 872653094e..28e7a936bb 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.advanced; +package io.onedev.server.web.page.project.blob.search.advanced; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/advanced-search.css b/web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/advanced-search.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/advanced/advanced-search.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/advanced-search.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java index 773f8635e6..58658e30ea 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.quick; +package io.onedev.server.web.page.project.blob.search.quick; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -32,23 +32,23 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.search.SearchManager; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.query.BlobQuery; -import com.turbodev.server.search.query.FileQuery; -import com.turbodev.server.search.query.SymbolQuery; -import com.turbodev.server.search.query.TooGeneralQueryException; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.behavior.RunTaskBehavior; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.search.result.SearchResultPanel; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.search.SearchManager; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.query.BlobQuery; +import io.onedev.server.search.query.FileQuery; +import io.onedev.server.search.query.SymbolQuery; +import io.onedev.server.search.query.TooGeneralQueryException; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.RunTaskBehavior; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public abstract class QuickSearchPanel extends Panel { @@ -73,7 +73,7 @@ public abstract class QuickSearchPanel extends Panel { } private List querySymbols(String searchInput, int count) { - SearchManager searchManager = TurboDev.getInstance(SearchManager.class); + SearchManager searchManager = OneDev.getInstance(SearchManager.class); ObjectId commit = projectModel.getObject().getRevCommit(revisionModel.getObject()); List symbolHits = new ArrayList<>(); try { @@ -197,7 +197,7 @@ public abstract class QuickSearchPanel extends Panel { public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); String script = String.format( - "turbodev.server.onQuickSearchDomReady('%s', %s);", + "onedev.server.onQuickSearchDomReady('%s', %s);", getMarkupId(), getCallbackFunction(explicit("key"), explicit("param"))); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java index 0bd4b0755b..57af11c577 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.quick; +package io.onedev.server.web.page.project.blob.search.quick; 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.turbodev.server.web.asset.doneevents.DoneEventsResourceReference; -import com.turbodev.server.web.asset.hotkeys.HotkeysResourceReference; -import com.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference; +import io.onedev.server.web.asset.hotkeys.HotkeysResourceReference; +import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class QuickSearchResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/point.png b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/point.png similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/point.png rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/point.png diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/quick-search.css b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/quick-search.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/quick-search.js b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js similarity index 91% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/quick-search.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js index 4d4db5699c..6c3ce80c3d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/quick/quick-search.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/quick/quick-search.js @@ -1,4 +1,4 @@ -turbodev.server.onQuickSearchDomReady = function(containerId, callback) { +onedev.server.onQuickSearchDomReady = function(containerId, callback) { var $body = $("#" + containerId + ">.quick-search>.modal-body"); var $input = $body.children("input"); @@ -8,7 +8,7 @@ turbodev.server.onQuickSearchDomReady = function(containerId, callback) { }, 100); function onReturn() { - if (turbodev.server.form.confirmLeave()) { + if (onedev.server.form.confirmLeave()) { var $result = $body.children(".result"); var $active = $result.find("li.hit.active"); if ($active.length != 0) { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java index 3fd833a0d7..a5769df1f8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/ConfirmSwitchFileListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.result; +package io.onedev.server.web.page.project.blob.search.result; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.wicket.Component; @@ -28,10 +28,10 @@ class ConfirmSwitchFileListener implements IAjaxCallListener { @Override public CharSequence getPrecondition(Component component) { if (path != null) { - return String.format("return turbodev.server.searchResult.confirmSwitchFileByPath('%s', %b);", + return String.format("return onedev.server.searchResult.confirmSwitchFileByPath('%s', %b);", StringEscapeUtils.escapeEcmaScript(path), hasMark); } else { - return String.format("return turbodev.server.searchResult.confirmSwitchFileByLink('%s');", + return String.format("return onedev.server.searchResult.confirmSwitchFileByLink('%s');", component.getMarkupId(true)); } } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/MatchedBlob.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/MatchedBlob.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java index 37cfa206ef..37328e483b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/MatchedBlob.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/MatchedBlob.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.project.blob.search.result; +package io.onedev.server.web.page.project.blob.search.result; import java.io.Serializable; import java.util.List; -import com.turbodev.utils.Range; -import com.turbodev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.utils.Range; public class MatchedBlob implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultPanel.html b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultPanel.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java index 123bd9f8cd..a14559db01 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.result; +package io.onedev.server.web.page.project.blob.search.result; import java.util.ArrayList; import java.util.Collections; @@ -28,17 +28,17 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.FileMode; -import com.turbodev.jsymbol.TokenPosition; -import com.turbodev.jsymbol.util.HighlightableLabel; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.model.support.TextRange; -import com.turbodev.server.search.hit.FileHit; -import com.turbodev.server.search.hit.QueryHit; -import com.turbodev.server.search.hit.TextHit; -import com.turbodev.server.web.component.link.ViewStateAwareAjaxLink; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.utils.Range; +import io.onedev.jsymbol.TokenPosition; +import io.onedev.jsymbol.util.HighlightableLabel; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.model.support.TextRange; +import io.onedev.server.search.hit.FileHit; +import io.onedev.server.search.hit.QueryHit; +import io.onedev.server.search.hit.TextHit; +import io.onedev.server.web.component.link.ViewStateAwareAjaxLink; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.utils.Range; @SuppressWarnings("serial") public abstract class SearchResultPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java index 6ec6cd176f..6d11be4cef 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/SearchResultResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.blob.search.result; +package io.onedev.server.web.page.project.blob.search.result; 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.turbodev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; -import com.turbodev.server.web.asset.uri.URIResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference; +import io.onedev.server.web.asset.uri.URIResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class SearchResultResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/search-result.css b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/search-result.css rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/search-result.js b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.js similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/search-result.js rename to web/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.js index ac2cf6ce5b..1b56858a55 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/blob/search/result/search-result.js +++ b/web/src/main/java/io/onedev/server/web/page/project/blob/search/result/search-result.js @@ -1,16 +1,16 @@ -turbodev.server.searchResult = { +onedev.server.searchResult = { confirmSwitchFileByLink: function(linkId) { var linkURI = new URI(document.getElementById(linkId)); var currentURI = new URI(window.location.href); if (linkURI.path() != currentURI.path() || linkURI.hasQuery("mark") != currentURI.hasQuery("mark")) - return turbodev.server.form.confirmLeave(); + return onedev.server.form.confirmLeave(); else return true; }, confirmSwitchFileByPath: function(path, hasMark) { var currentURI = new URI(window.location.href); if (path != currentURI.path() || hasMark != currentURI.hasQuery("mark")) - return turbodev.server.form.confirmLeave(); + return onedev.server.form.confirmLeave(); else return true; } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/AheadBehind.java b/web/src/main/java/io/onedev/server/web/page/project/branches/AheadBehind.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/branches/AheadBehind.java rename to web/src/main/java/io/onedev/server/web/page/project/branches/AheadBehind.java index 4498c83d9e..c48c0d3db8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/branches/AheadBehind.java +++ b/web/src/main/java/io/onedev/server/web/page/project/branches/AheadBehind.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.branches; +package io.onedev.server.web.page.project.branches; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.html b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.html rename to web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java rename to web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java index e87980f145..03431e442b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.branches; +package io.onedev.server.web.page.project.branches; import java.io.IOException; import java.io.Serializable; @@ -51,44 +51,44 @@ import org.eclipse.jgit.revwalk.RevWalk; import org.eclipse.jgit.revwalk.filter.RevFilter; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.manager.BranchWatchManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.BranchWatch; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.Verification; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.branchchoice.BranchChoiceProvider; -import com.turbodev.server.web.component.branchchoice.BranchSingleChoice; -import com.turbodev.server.web.component.contributorpanel.ContributorPanel; -import com.turbodev.server.web.component.datatable.HistoryAwarePagingNavigator; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.component.revisionpicker.RevisionPicker; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.page.project.pullrequest.requestlist.RequestListPage; -import com.turbodev.server.web.page.project.pullrequest.requestlist.SearchOption; -import com.turbodev.server.web.page.project.pullrequest.requestlist.SearchOption.Status; -import com.turbodev.server.web.page.project.pullrequest.requestlist.SortOption; -import com.turbodev.server.web.util.PagingHistorySupport; -import com.turbodev.utils.StringUtils; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.manager.BranchWatchManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.BranchWatch; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.Verification; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.branchchoice.BranchChoiceProvider; +import io.onedev.server.web.component.branchchoice.BranchSingleChoice; +import io.onedev.server.web.component.contributorpanel.ContributorPanel; +import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.revisionpicker.RevisionPicker; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage; +import io.onedev.server.web.page.project.pullrequest.requestlist.SearchOption; +import io.onedev.server.web.page.project.pullrequest.requestlist.SortOption; +import io.onedev.server.web.page.project.pullrequest.requestlist.SearchOption.Status; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public class ProjectBranchesPage extends ProjectPage { @@ -258,7 +258,7 @@ public class ProjectBranchesPage extends ProjectPage { @Override protected Map load() { Map watches = new HashMap<>(); - for (BranchWatch watch: TurboDev.getInstance(BranchWatchManager.class).find( + for (BranchWatch watch: OneDev.getInstance(BranchWatchManager.class).find( Preconditions.checkNotNull(getLoginUser()), getProject())) watches.put(watch.getBranch(), watch); return watches; @@ -471,7 +471,7 @@ public class ProjectBranchesPage extends ProjectPage { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class).getVerifications(getProject(), lastCommitHash); + return OneDev.getInstance(VerificationManager.class).getVerifications(getProject(), lastCommitHash); } })); @@ -604,7 +604,7 @@ public class ProjectBranchesPage extends ProjectPage { WebMarkupContainer actionsContainer = new WebMarkupContainer("actions"); item.add(actionsContainer.setOutputMarkupId(true)); - PullRequestManager pullRequestManager = TurboDev.getInstance(PullRequestManager.class); + PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class); PullRequest effectiveRequest = pullRequestManager.findEffective( new ProjectAndBranch(getProject(), baseBranch), new ProjectAndBranch(getProject(), branch)); @@ -633,7 +633,7 @@ public class ProjectBranchesPage extends ProjectPage { public void onClick(AjaxRequestTarget target) { BranchWatch watch = branchWatchesModel.getObject().get(branch); if (watch != null) { - TurboDev.getInstance(BranchWatchManager.class).delete(watch); + OneDev.getInstance(BranchWatchManager.class).delete(watch); branchWatchesModel.getObject().remove(branch); } target.add(actionsContainer); @@ -654,7 +654,7 @@ public class ProjectBranchesPage extends ProjectPage { watch.setProject(getProject()); watch.setBranch(branch); watch.setUser(getLoginUser()); - TurboDev.getInstance(BranchWatchManager.class).save(watch); + OneDev.getInstance(BranchWatchManager.class).save(watch); target.add(actionsContainer); } @@ -682,7 +682,7 @@ public class ProjectBranchesPage extends ProjectPage { @Override protected Component newContent(String id, ModalPanel modal) { Fragment fragment = new Fragment(id, "confirmDeleteBranchFrag", ProjectBranchesPage.this); - PullRequestManager pullRequestManager = TurboDev.getInstance(PullRequestManager.class); + PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class); if (!pullRequestManager.findAllOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) { Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this); SearchOption searchOption = new SearchOption(); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesResourceReference.java index 44b6eeda08..b6d651519a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/branches/ProjectBranchesResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.branches; +package io.onedev.server.web.page.project.branches; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/page/project/branches/ajax-indicator.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/branches/ajax-indicator.gif rename to web/src/main/java/io/onedev/server/web/page/project/branches/ajax-indicator.gif diff --git a/web/src/main/java/com/turbodev/server/web/page/project/branches/project-branches.css b/web/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/branches/project-branches.css rename to web/src/main/java/io/onedev/server/web/page/project/branches/project-branches.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsPage.html b/web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java index 3ef7618a6a..b10aa03922 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java @@ -1,15 +1,15 @@ -package com.turbodev.server.web.page.project.comments; +package io.onedev.server.web.page.project.comments; import org.apache.wicket.markup.head.CssHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.web.component.comment.CodeCommentFilter; -import com.turbodev.server.web.component.comment.CodeCommentListPanel; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.model.PullRequest; +import io.onedev.server.web.component.comment.CodeCommentFilter; +import io.onedev.server.web.component.comment.CodeCommentListPanel; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class ProjectCodeCommentsPage extends ProjectPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java index f76a1eb312..b935255cbd 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.project.comments; +package io.onedev.server.web.page.project.comments; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class ProjectCodeCommentsResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/comments/project-code-comments.css b/web/src/main/java/io/onedev/server/web/page/project/comments/project-code-comments.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/comments/project-code-comments.css rename to web/src/main/java/io/onedev/server/web/page/project/comments/project-code-comments.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailPage.html b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailPage.html rename to web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailPage.java b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailPage.java rename to web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.java index 69d95c3459..6ccdd4fa43 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.commit; +package io.onedev.server.web.page.project.commit; import java.io.Serializable; import java.util.ArrayList; @@ -36,35 +36,36 @@ import org.eclipse.jgit.revwalk.RevCommit; import com.google.common.base.Joiner; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.component.avatar.ContributorAvatars; -import com.turbodev.server.web.component.commitmessage.CommitMessageLabel; -import com.turbodev.server.web.component.contributorpanel.ContributorPanel; -import com.turbodev.server.web.component.createbranch.CreateBranchLink; -import com.turbodev.server.web.component.createtag.CreateTagLink; -import com.turbodev.server.web.component.diff.revision.CommentSupport; -import com.turbodev.server.web.component.diff.revision.RevisionDiffPanel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.branches.ProjectBranchesPage; -import com.turbodev.server.web.page.project.tags.ProjectTagsPage; -import com.turbodev.server.web.websocket.CommitIndexedRegion; -import com.turbodev.server.web.websocket.WebSocketRegion; + +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.util.Verification; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.component.avatar.ContributorAvatars; +import io.onedev.server.web.component.commitmessage.CommitMessageLabel; +import io.onedev.server.web.component.contributorpanel.ContributorPanel; +import io.onedev.server.web.component.createbranch.CreateBranchLink; +import io.onedev.server.web.component.createtag.CreateTagLink; +import io.onedev.server.web.component.diff.revision.CommentSupport; +import io.onedev.server.web.component.diff.revision.RevisionDiffPanel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.branches.ProjectBranchesPage; +import io.onedev.server.web.page.project.tags.ProjectTagsPage; +import io.onedev.server.web.websocket.CommitIndexedRegion; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public class CommitDetailPage extends ProjectPage implements CommentSupport { @@ -163,7 +164,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - String script = String.format("turbodev.server.commitdetail.initRefs('%s');", getMarkupId()); + String script = String.format("onedev.server.commitdetail.initRefs('%s');", getMarkupId()); response.render(OnDomReadyHeaderItem.forScript(script)); } @@ -172,7 +173,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport { @Override protected List load() { - Set descendants = TurboDev.getInstance(CommitInfoManager.class) + Set descendants = OneDev.getInstance(CommitInfoManager.class) .getDescendants(getProject(), getCommit().getId()); descendants.add(getCommit().getId()); @@ -221,7 +222,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class).getVerifications(getProject(), getCommit().name()); + return OneDev.getInstance(VerificationManager.class).getVerifications(getProject(), getCommit().name()); } })); @@ -517,7 +518,7 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport { @Override public CodeComment getOpenComment() { if (state.commentId != null) - return TurboDev.getInstance(CodeCommentManager.class).load(state.commentId); + return OneDev.getInstance(CodeCommentManager.class).load(state.commentId); else return null; } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailResourceReference.java index 436c365839..7b39b99be3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitDetailResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitDetailResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.commit; +package io.onedev.server.web.page.project.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.turbodev.server.web.asset.oneline.OnelineResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.oneline.OnelineResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class CommitDetailResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitQuery.g4 b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitQuery.g4 similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/CommitQuery.g4 rename to web/src/main/java/io/onedev/server/web/page/project/commit/CommitQuery.g4 diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitQueryBehavior.java b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitQueryBehavior.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/CommitQueryBehavior.java rename to web/src/main/java/io/onedev/server/web/page/project/commit/CommitQueryBehavior.java index 3dbb914da4..5cb6a533d7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/commit/CommitQueryBehavior.java +++ b/web/src/main/java/io/onedev/server/web/page/project/commit/CommitQueryBehavior.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.commit; +package io.onedev.server.web.page.project.commit; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -8,23 +8,24 @@ import java.util.Map; import org.apache.wicket.Component; import org.apache.wicket.model.IModel; -import com.turbodev.codeassist.FenceAware; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.codeassist.ParentedElement; -import com.turbodev.codeassist.grammar.ElementSpec; -import com.turbodev.codeassist.grammar.LexerRuleRefElementSpec; -import com.turbodev.utils.Range; -import com.turbodev.utils.StringUtils; -import com.turbodev.utils.stringmatch.PatternApplied; -import com.turbodev.utils.stringmatch.WildcardUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.NameAndEmail; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.inputassist.ANTLRAssistBehavior; -import com.turbodev.server.web.util.SuggestionUtils; -import com.turbodev.server.web.page.project.commit.CommitQueryParser; +import io.onedev.codeassist.FenceAware; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.codeassist.ParentedElement; +import io.onedev.codeassist.grammar.ElementSpec; +import io.onedev.codeassist.grammar.LexerRuleRefElementSpec; +import io.onedev.server.OneDev; +import io.onedev.server.git.NameAndEmail; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.model.Project; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior; +import io.onedev.server.web.util.SuggestionUtils; +import io.onedev.utils.Range; +import io.onedev.utils.StringUtils; +import io.onedev.utils.stringmatch.PatternApplied; +import io.onedev.utils.stringmatch.WildcardUtils; + +import io.onedev.server.web.page.project.commit.CommitQueryParser; @SuppressWarnings("serial") public class CommitQueryBehavior extends ANTLRAssistBehavior { @@ -74,7 +75,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior { case CommitQueryParser.AUTHOR: case CommitQueryParser.COMMITTER: Map suggestedInputs = new LinkedHashMap<>(); - CommitInfoManager commitInfoManager = TurboDev.getInstance(CommitInfoManager.class); + CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class); List users = commitInfoManager.getUsers(project); for (NameAndEmail user: users) { String content; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.html b/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.java b/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.java index db91f2b77b..2128c4e7e6 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.commit; +package io.onedev.server.web.page.project.commit; import java.io.IOException; import java.io.Serializable; @@ -46,40 +46,40 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.unbescape.java.JavaEscape; -import com.turbodev.server.web.page.project.commit.CommitQueryLexer; -import com.turbodev.server.web.page.project.commit.CommitQueryParser; -import com.turbodev.server.web.page.project.commit.CommitQueryParser.CriteriaContext; -import com.turbodev.server.web.page.project.commit.CommitQueryParser.FuzzyCriteriaContext; -import com.turbodev.server.web.page.project.commit.CommitQueryParser.QueryContext; -import com.turbodev.utils.StringUtils; +import io.onedev.server.web.page.project.commit.CommitQueryLexer; +import io.onedev.server.web.page.project.commit.CommitQueryParser; +import io.onedev.server.web.page.project.commit.CommitQueryParser.CriteriaContext; +import io.onedev.server.web.page.project.commit.CommitQueryParser.FuzzyCriteriaContext; +import io.onedev.server.web.page.project.commit.CommitQueryParser.QueryContext; import com.google.common.base.Joiner; import com.google.common.base.Optional; import com.google.common.base.Throwables; import com.google.common.collect.Lists; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.command.RevListCommand; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.ProjectAndRevision; -import com.turbodev.server.util.Verification; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.component.avatar.ContributorAvatars; -import com.turbodev.server.web.component.commitgraph.CommitGraphResourceReference; -import com.turbodev.server.web.component.commitgraph.CommitGraphUtils; -import com.turbodev.server.web.component.commitmessage.ExpandableCommitMessagePanel; -import com.turbodev.server.web.component.contributorpanel.ContributorPanel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.util.ajaxlistener.IndicateLoadingListener; -import com.turbodev.server.web.util.model.CommitRefsModel; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.command.RevListCommand; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.ProjectAndRevision; +import io.onedev.server.util.Verification; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.component.avatar.ContributorAvatars; +import io.onedev.server.web.component.commitgraph.CommitGraphResourceReference; +import io.onedev.server.web.component.commitgraph.CommitGraphUtils; +import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel; +import io.onedev.server.web.component.contributorpanel.ContributorPanel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.util.ajaxlistener.IndicateLoadingListener; +import io.onedev.server.web.util.model.CommitRefsModel; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public class ProjectCommitsPage extends ProjectPage { @@ -511,7 +511,7 @@ public class ProjectCommitsPage extends ProjectPage { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class).getVerifications(getProject(), commit.name()); + return OneDev.getInstance(VerificationManager.class).getVerifications(getProject(), commit.name()); } })); @@ -561,7 +561,7 @@ public class ProjectCommitsPage extends ProjectPage { private String renderCommitGraph() { String jsonOfCommits = CommitGraphUtils.asJSON(commitsModel.getObject().current); - return String.format("turbodev.server.commitgraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits); + return String.format("onedev.server.commitgraph.render('%s', %s);", body.getMarkupId(), jsonOfCommits); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsResourceReference.java index 1e36636bfd..3e0693feb4 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/commit/ProjectCommitsResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/commit/ProjectCommitsResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.commit; +package io.onedev.server.web.page.project.commit; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css b/web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.css rename to web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.js b/web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.js similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.js rename to web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.js index 03223d0fd5..ab443e464a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/commit/commit-detail.js +++ b/web/src/main/java/io/onedev/server/web/page/project/commit/commit-detail.js @@ -1,4 +1,4 @@ -turbodev.server.commitdetail = { +onedev.server.commitdetail = { initRefs: function(refsId) { var $refs = $("#" + refsId); if ($refs.children().length != 0) diff --git a/web/src/main/java/com/turbodev/server/web/page/project/commit/project-commits.css b/web/src/main/java/io/onedev/server/web/page/project/commit/project-commits.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/commit/project-commits.css rename to web/src/main/java/io/onedev/server/web/page/project/commit/project-commits.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.html b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.html rename to web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.java b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.java rename to web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java index b5ae543945..97a95bdf8b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionComparePage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.compare; +package io.onedev.server.web.page.project.compare; import java.io.IOException; import java.io.Serializable; @@ -30,37 +30,37 @@ import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.CompareContext; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.model.support.ProjectAndRevision; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.behavior.TooltipBehavior; -import com.turbodev.server.web.component.commitlist.CommitListPanel; -import com.turbodev.server.web.component.diff.revision.CommentSupport; -import com.turbodev.server.web.component.diff.revision.RevisionDiffPanel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.revisionpicker.AffinalRevisionPicker; -import com.turbodev.server.web.component.tabbable.AjaxActionTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.pullrequest.newrequest.NewRequestPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.websocket.CodeCommentChangedRegion; -import com.turbodev.server.web.websocket.CommitIndexedRegion; -import com.turbodev.server.web.websocket.WebSocketManager; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.OneDev; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.CompareContext; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.model.support.ProjectAndRevision; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.behavior.TooltipBehavior; +import io.onedev.server.web.component.commitlist.CommitListPanel; +import io.onedev.server.web.component.diff.revision.CommentSupport; +import io.onedev.server.web.component.diff.revision.RevisionDiffPanel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.revisionpicker.AffinalRevisionPicker; +import io.onedev.server.web.component.tabbable.AjaxActionTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.websocket.CodeCommentChangedRegion; +import io.onedev.server.web.websocket.CommitIndexedRegion; +import io.onedev.server.web.websocket.WebSocketManager; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public class RevisionComparePage extends ProjectPage implements CommentSupport { @@ -215,7 +215,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport { if (state.leftSide.getBranch() != null && state.rightSide.getBranch() != null) { ProjectAndBranch left = new ProjectAndBranch(state.leftSide.toString()); ProjectAndBranch right = new ProjectAndBranch(state.rightSide.toString()); - return TurboDev.getInstance(PullRequestManager.class).findEffective(left, right); + return OneDev.getInstance(PullRequestManager.class).findEffective(left, right); } else { return null; } @@ -643,7 +643,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport { super.onPopState(target, data); state = (State) data; - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); newTabPanel(target); target.add(tabbable); @@ -724,7 +724,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport { @Override public CodeComment getOpenComment() { if (state.commentId != null) - return TurboDev.getInstance(CodeCommentManager.class).load(state.commentId); + return OneDev.getInstance(CodeCommentManager.class).load(state.commentId); else return null; } @@ -739,7 +739,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport { state.mark = null; } pushState(target); - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); } @Override @@ -758,7 +758,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport { state.commentId = null; state.mark = mark; pushState(target); - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionCompareResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionCompareResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java index 05a011a876..b4ec5c9290 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/compare/RevisionCompareResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/compare/RevisionCompareResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.compare; +package io.onedev.server.web.page.project.compare; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css b/web/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/compare/revision-compare.css rename to web/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/ForkOptionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/moreinfo/ForkOptionPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/ForkOptionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/moreinfo/ForkOptionPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java index 00217d8da4..9de430b2ce 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/ForkOptionPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/ForkOptionPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.moreinfo; +package io.onedev.server.web.page.project.moreinfo; import org.apache.wicket.Session; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -8,14 +8,14 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; @SuppressWarnings("serial") abstract class ForkOptionPanel extends Panel { @@ -46,7 +46,7 @@ abstract class ForkOptionPanel extends Panel { @Override protected void onSubmit(AjaxRequestTarget target, Form form) { super.onSubmit(target, form); - ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class); + ProjectManager projectManager = OneDev.getInstance(ProjectManager.class); Project projectWithSameName = projectManager.find(project.getName()); if (projectWithSameName != null) { editor.getErrorContext(new PathSegment.Property("name")) diff --git a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoPanel.html b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoPanel.java b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java index c076f265b2..19a73d09d2 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.moreinfo; +package io.onedev.server.web.page.project.moreinfo; import java.util.Collection; @@ -17,23 +17,23 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.eclipse.jgit.lib.Constants; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.UrlManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.component.projectselector.ProjectSelector; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.branches.ProjectBranchesPage; -import com.turbodev.server.web.page.project.commit.ProjectCommitsPage; -import com.turbodev.server.web.page.project.tags.ProjectTagsPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.UrlManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.projectselector.ProjectSelector; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.branches.ProjectBranchesPage; +import io.onedev.server.web.page.project.commit.ProjectCommitsPage; +import io.onedev.server.web.page.project.tags.ProjectTagsPage; @SuppressWarnings("serial") public abstract class MoreInfoPanel extends Panel { @@ -62,7 +62,7 @@ public abstract class MoreInfoPanel extends Panel { } add(new Label("id", getProject().getId())); - UrlManager urlManager = TurboDev.getInstance(UrlManager.class); + UrlManager urlManager = OneDev.getInstance(UrlManager.class); Model cloneUrlModel = Model.of(urlManager.urlFor(getProject())); add(new TextField("cloneUrl", cloneUrlModel)); add(new WebMarkupContainer("copyUrl").add(new CopyClipboardBehavior(cloneUrlModel))); @@ -79,13 +79,13 @@ public abstract class MoreInfoPanel extends Panel { @Override protected void onConfigure() { super.onConfigure(); - setVisible(TurboDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0); + setVisible(OneDev.getInstance(CommitInfoManager.class).getCommitCount(getProject()) != 0); } @Override protected void onInitialize() { super.onInitialize(); - CommitInfoManager commitInfoManager = TurboDev.getInstance(CommitInfoManager.class); + CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class); add(new Label("count", commitInfoManager.getCommitCount(getProject()) + " commits")); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoResourceReference.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoResourceReference.java index e31b652da5..edf53f82ea 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/MoreInfoResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/MoreInfoResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.project.moreinfo; +package io.onedev.server.web.page.project.moreinfo; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class MoreInfoResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/moreinfo/more-info.css b/web/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/moreinfo/more-info.css rename to web/src/main/java/io/onedev/server/web/page/project/moreinfo/more-info.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/project.css b/web/src/main/java/io/onedev/server/web/page/project/project.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/project.css rename to web/src/main/java/io/onedev/server/web/page/project/project.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.java index fccd427626..6901661929 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest; +package io.onedev.server.web.page.project.pullrequest; import javax.persistence.EntityNotFoundException; @@ -11,14 +11,15 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.pullrequest.requestlist.RequestListPage; -import com.turbodev.server.web.util.ConfirmOnClick; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage; +import io.onedev.server.web.util.ConfirmOnClick; @SuppressWarnings("serial") public class InvalidRequestPage extends ProjectPage { @@ -38,7 +39,7 @@ public class InvalidRequestPage extends ProjectPage { @Override protected PullRequest load() { Long requestNumber = params.get(PARAM_REQUEST).toLong(); - PullRequest request = TurboDev.getInstance(PullRequestManager.class).find(getProject(), requestNumber); + PullRequest request = OneDev.getInstance(PullRequestManager.class).find(getProject(), requestNumber); if (request == null) throw new EntityNotFoundException("Unable to find request #" + requestNumber + " in project " + getProject()); Preconditions.checkState(!request.isValid()); @@ -55,7 +56,7 @@ public class InvalidRequestPage extends ProjectPage { @Override public void onClick() { - TurboDev.getInstance(PullRequestManager.class).delete(requestModel.getObject()); + OneDev.getInstance(PullRequestManager.class).delete(requestModel.getObject()); setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getProject())); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java index 72153e9deb..c69ba1d22c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/InvalidRequestResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest; +package io.onedev.server.web.page.project.pullrequest; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/invalid-request.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/invalid-request.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/invalid-request.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/invalid-request.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java index f78502668f..6cc33fdae0 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.newrequest; +package io.onedev.server.web.page.project.pullrequest.newrequest; import java.io.IOException; import java.util.ArrayList; @@ -36,52 +36,51 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevWalk; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.ReviewInvitation; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.CloseInfo; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.model.support.MergeStrategy; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.QualityCheckStatus; -import com.turbodev.server.util.Verification; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.component.branchpicker.AffinalBranchPicker; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.commitlist.CommitListPanel; -import com.turbodev.server.web.component.diff.revision.CommentSupport; -import com.turbodev.server.web.component.diff.revision.RevisionDiffPanel; -import com.turbodev.server.web.component.link.BranchLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.requestreviewer.ReviewerListPanel; -import com.turbodev.server.web.component.tabbable.AjaxActionTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.component.verification.RequiredVerificationsPanel; -import com.turbodev.server.web.page.base.BasePage; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.compare.RevisionComparePage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.page.security.LoginPage; -import com.turbodev.server.web.websocket.CommitIndexedRegion; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.WebSocketRegion; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.ReviewInvitation; +import io.onedev.server.model.User; +import io.onedev.server.model.support.CloseInfo; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.model.support.MergeStrategy; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.QualityCheckStatus; +import io.onedev.server.util.Verification; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.component.branchpicker.AffinalBranchPicker; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.commitlist.CommitListPanel; +import io.onedev.server.web.component.diff.revision.CommentSupport; +import io.onedev.server.web.component.diff.revision.RevisionDiffPanel; +import io.onedev.server.web.component.link.BranchLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.requestreviewer.ReviewerListPanel; +import io.onedev.server.web.component.tabbable.AjaxActionTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.component.verification.RequiredVerificationsPanel; +import io.onedev.server.web.page.base.BasePage; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.compare.RevisionComparePage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.page.security.LoginPage; +import io.onedev.server.web.websocket.CommitIndexedRegion; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public class NewRequestPage extends ProjectPage implements CommentSupport { @@ -131,7 +130,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { if (targetParam != null) { target = new ProjectAndBranch(targetParam); } else { - prevRequest = TurboDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser()); + prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser()); if (prevRequest != null && prevRequest.getTarget().getObjectId(false) != null) { target = prevRequest.getTarget(); } else if (getProject().getForkedFrom() != null) { @@ -146,7 +145,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { source = new ProjectAndBranch(sourceParam); } else { if (prevRequest == null) - prevRequest = TurboDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser()); + prevRequest = OneDev.getInstance(PullRequestManager.class).findLatest(getProject(), getLoginUser()); if (prevRequest != null && prevRequest.getSource().getObjectId(false) != null) { source = prevRequest.getSource(); } else if (getProject().getForkedFrom() != null) { @@ -160,7 +159,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { if (prevRequest != null && source.equals(prevRequest.getSource()) && target.equals(prevRequest.getTarget()) && prevRequest.isOpen()) pullRequestRef.set(prevRequest); else - pullRequestRef.set(TurboDev.getInstance(PullRequestManager.class).findEffective(target, source)); + pullRequestRef.set(OneDev.getInstance(PullRequestManager.class).findEffective(target, source)); if (pullRequestRef.get() == null) { ObjectId baseCommitId = GitUtils.getMergeBase( @@ -215,7 +214,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { @Override protected PullRequest load() { - return TurboDev.getInstance(PullRequestManager.class).load(requestId); + return OneDev.getInstance(PullRequestManager.class).load(requestId); } }; @@ -546,7 +545,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { public void onSubmit() { super.onSubmit(); - Dao dao = TurboDev.getInstance(Dao.class); + Dao dao = OneDev.getInstance(Dao.class); ProjectAndBranch target = getPullRequest().getTarget(); ProjectAndBranch source = getPullRequest().getSource(); if (!target.getObjectName().equals(getPullRequest().getTarget().getObjectName()) @@ -559,7 +558,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { for (ReviewInvitation invitation: getPullRequest().getReviewInvitations()) invitation.setUser(dao.load(User.class, invitation.getUser().getId())); - TurboDev.getInstance(PullRequestManager.class).open(getPullRequest()); + OneDev.getInstance(PullRequestManager.class).open(getPullRequest()); PageParameters params = RequestOverviewPage.paramsOf(getPullRequest()); params.add(BasePage.PARAM_AUTOSAVE_KEY_TO_CLEAR, autosaveKey); @@ -783,7 +782,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport { @Override public CodeComment getOpenComment() { if (commentId != null) - return TurboDev.getInstance(CodeCommentManager.class).load(commentId); + return OneDev.getInstance(CodeCommentManager.class).load(commentId); else return null; } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java index eb5e9e4f40..09c9d548f9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/NewRequestResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.newrequest; +package io.onedev.server.web.page.project.pullrequest.newrequest; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/new-request.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/new-request.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/newrequest/new-request.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/newrequest/new-request.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java index 0d6552d6db..69a7b35291 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/CheckoutRequestInstructionPanel.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.PullRequest; +import io.onedev.server.model.PullRequest; @SuppressWarnings("serial") class CheckoutRequestInstructionPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java similarity index 72% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java index 82f71ff003..f907ed87f3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/PullRequestOperation.java @@ -1,17 +1,17 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; import javax.annotation.Nullable; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.ReviewManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.Review; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.OneDev; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.ReviewManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.Review; +import io.onedev.server.model.User; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.security.SecurityUtils; public enum PullRequestOperation { DISCARD { @@ -23,7 +23,7 @@ public enum PullRequestOperation { @Override public void operate(PullRequest request, String comment) { - TurboDev.getInstance(PullRequestManager.class).discard(request, comment); + OneDev.getInstance(PullRequestManager.class).discard(request, comment); } }, @@ -42,7 +42,7 @@ public enum PullRequestOperation { review.setNote(comment); review.setRequest(request); review.setUser(SecurityUtils.getUser()); - TurboDev.getInstance(ReviewManager.class).save(review); + OneDev.getInstance(ReviewManager.class).save(review); } }, @@ -61,7 +61,7 @@ public enum PullRequestOperation { review.setNote(comment); review.setRequest(request); review.setUser(SecurityUtils.getUser()); - TurboDev.getInstance(ReviewManager.class).save(review); + OneDev.getInstance(ReviewManager.class).save(review); } }, @@ -69,7 +69,7 @@ public enum PullRequestOperation { @Override public boolean canOperate(PullRequest request) { - PullRequestManager pullRequestManager = TurboDev.getInstance(PullRequestManager.class); + PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class); return !request.isOpen() && SecurityUtils.canModify(request) && request.getTarget().getObjectName(false) != null @@ -82,7 +82,7 @@ public enum PullRequestOperation { @Override public void operate(PullRequest request, String comment) { - TurboDev.getInstance(PullRequestManager.class).reopen(request, comment); + OneDev.getInstance(PullRequestManager.class).reopen(request, comment); } }, @@ -90,13 +90,13 @@ public enum PullRequestOperation { @Override public void operate(PullRequest request, String comment) { - TurboDev.getInstance(PullRequestManager.class).deleteSourceBranch(request, comment); + OneDev.getInstance(PullRequestManager.class).deleteSourceBranch(request, comment); } @Override public boolean canOperate(PullRequest request) { MergePreview preview = request.getLastMergePreview(); - PullRequestManager pullRequestManager = TurboDev.getInstance(PullRequestManager.class); + PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class); return request.isMerged() && request.getSourceProject() != null && request.getSource().getObjectName(false) != null @@ -114,7 +114,7 @@ public enum PullRequestOperation { @Override public void operate(PullRequest request, String comment) { - TurboDev.getInstance(PullRequestManager.class).restoreSourceBranch(request, comment); + OneDev.getInstance(PullRequestManager.class).restoreSourceBranch(request, comment); } @Override @@ -128,7 +128,7 @@ public enum PullRequestOperation { }; private static boolean canReview(PullRequest request) { - User user = TurboDev.getInstance(UserManager.class).getCurrent(); + User user = OneDev.getInstance(UserManager.class).getCurrent(); return request.getQualityCheckStatus().getAwaitingReviewers().contains(user); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java index 643ab72d64..6be4d4feae 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailPage.java @@ -1,15 +1,15 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; -import static com.turbodev.server.model.support.MergeStrategy.ALWAYS_MERGE; -import static com.turbodev.server.model.support.MergeStrategy.MERGE_IF_NECESSARY; -import static com.turbodev.server.model.support.MergeStrategy.REBASE_MERGE; -import static com.turbodev.server.model.support.MergeStrategy.SQUASH_MERGE; -import static com.turbodev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.APPROVE; -import static com.turbodev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH; -import static com.turbodev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE; -import static com.turbodev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISCARD; -import static com.turbodev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.REOPEN; -import static com.turbodev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH; +import static io.onedev.server.model.support.MergeStrategy.ALWAYS_MERGE; +import static io.onedev.server.model.support.MergeStrategy.MERGE_IF_NECESSARY; +import static io.onedev.server.model.support.MergeStrategy.REBASE_MERGE; +import static io.onedev.server.model.support.MergeStrategy.SQUASH_MERGE; +import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.APPROVE; +import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DELETE_SOURCE_BRANCH; +import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISAPPROVE; +import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.DISCARD; +import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.REOPEN; +import static io.onedev.server.web.page.project.pullrequest.requestdetail.PullRequestOperation.RESTORE_SOURCE_BRANCH; import java.util.ArrayList; import java.util.Collection; @@ -55,51 +55,51 @@ import org.apache.wicket.util.visit.IVisitor; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.manager.PullRequestUpdateManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.model.support.MergeStrategy; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.Verification; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.BranchLink; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.PageTabLink; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.base.BasePage; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.pullrequest.InvalidRequestPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.WicketUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.util.model.EntityModel; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.PullRequestChangedRegion; -import com.turbodev.server.web.websocket.WebSocketRegion; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.manager.PullRequestUpdateManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.User; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.model.support.MergeStrategy; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.Verification; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.BranchLink; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTabLink; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.base.BasePage; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.pullrequest.InvalidRequestPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.codecomments.RequestCodeCommentsPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview.MergePreviewPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.WicketUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.util.model.EntityModel; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.PullRequestChangedRegion; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public abstract class RequestDetailPage extends ProjectPage { @@ -125,7 +125,7 @@ public abstract class RequestDetailPage extends ProjectPage { @Override protected PullRequest load() { Long requestNumber = params.get(PARAM_REQUEST).toLong(); - PullRequest request = TurboDev.getInstance(PullRequestManager.class).find(getProject(), requestNumber); + PullRequest request = OneDev.getInstance(PullRequestManager.class).find(getProject(), requestNumber); if (request == null) throw new EntityNotFoundException("Unable to find request #" + requestNumber + " in project " + getProject()); return request; @@ -234,7 +234,7 @@ public abstract class RequestDetailPage extends ProjectPage { super.onSubmit(target, form); if (StringUtils.isNotBlank(getPullRequest().getTitle())) { - TurboDev.getInstance(Dao.class).persist(getPullRequest()); + OneDev.getInstance(Dao.class).persist(getPullRequest()); editingTitle = false; } @@ -355,7 +355,7 @@ public abstract class RequestDetailPage extends ProjectPage { @Override public void onEndRequest(RequestCycle cycle) { if (SecurityUtils.getUser() != null) { - TurboDev.getInstance(VisitManager.class).visitPullRequest(SecurityUtils.getUser(), getPullRequest()); + OneDev.getInstance(VisitManager.class).visitPullRequest(SecurityUtils.getUser(), getPullRequest()); } } @@ -518,7 +518,7 @@ public abstract class RequestDetailPage extends ProjectPage { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class) + return OneDev.getInstance(VerificationManager.class) .getVerifications(getProject(), getPullRequest().getMergePreview().getMerged()); } @@ -740,7 +740,7 @@ public abstract class RequestDetailPage extends ProjectPage { @Override protected PullRequestUpdate load() { - return TurboDev.getInstance(PullRequestUpdateManager.class).load(prevReviewUpdateId); + return OneDev.getInstance(PullRequestUpdateManager.class).load(prevReviewUpdateId); } }); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java index 2f9e8281cd..ca39f46e4c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/RequestDetailResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html similarity index 96% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html index 8b13cf2db4..ad09785791 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.html @@ -16,7 +16,7 @@

    -

    Step 2: Resolve merge conflicts, test changes and push result commit to TurboDev.

    +

    Step 2: Resolve merge conflicts, test changes and push result commit to OneDev.

    git push origin
    @@ -38,7 +38,7 @@

    -

    Step 2: Resolve rebase conflicts, test changes and force push result commit to TurboDev.

    +

    Step 2: Resolve rebase conflicts, test changes and force push result commit to OneDev.

    git push -f origin
    diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java index b97a241289..19f7b500d9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ResolveConflictInstructionPanel.java @@ -1,7 +1,7 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; -import static com.turbodev.server.model.support.MergeStrategy.ALWAYS_MERGE; -import static com.turbodev.server.model.support.MergeStrategy.REBASE_MERGE; +import static io.onedev.server.model.support.MergeStrategy.ALWAYS_MERGE; +import static io.onedev.server.model.support.MergeStrategy.REBASE_MERGE; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -9,8 +9,8 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.MergeStrategy; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.MergeStrategy; @SuppressWarnings("serial") class ResolveConflictInstructionPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java similarity index 76% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java index 35eddc896f..5eb97c84cc 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UnreviewedChangesPanel.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; @SuppressWarnings("serial") public class UnreviewedChangesPanel extends GenericPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java similarity index 70% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java index ff29355c04..83d67626c1 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/UpdateChangesLink.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail; +package io.onedev.server.web.page.project.pullrequest.requestdetail; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; @SuppressWarnings("serial") public class UpdateChangesLink extends ViewStateAwarePageLink { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/ajax-indicator.gif diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java index d2c3f3b013..b5ee06c805 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.changes; +package io.onedev.server.web.page.project.pullrequest.requestdetail.changes; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; @@ -33,25 +33,25 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.revwalk.RevCommit; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.CodeCommentManager; -import com.turbodev.server.model.CodeComment; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.support.MarkPos; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; -import com.turbodev.server.web.component.diff.revision.CommentSupport; -import com.turbodev.server.web.component.diff.revision.RevisionDiffPanel; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.websocket.CodeCommentChangedRegion; -import com.turbodev.server.web.websocket.CommitIndexedRegion; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.WebSocketManager; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.OneDev; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.CodeCommentManager; +import io.onedev.server.model.CodeComment; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.support.MarkPos; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.component.diff.revision.CommentSupport; +import io.onedev.server.web.component.diff.revision.RevisionDiffPanel; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.websocket.CodeCommentChangedRegion; +import io.onedev.server.web.websocket.CommitIndexedRegion; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.WebSocketManager; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public class RequestChangesPage extends RequestDetailPage implements CommentSupport { @@ -101,7 +101,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp PullRequest request = getPullRequest(); if (state.commentId != null) { - CodeComment comment = TurboDev.getInstance(CodeCommentManager.class).load(state.commentId); + CodeComment comment = OneDev.getInstance(CodeCommentManager.class).load(state.commentId); CodeComment.ComparingInfo commentComparingInfo = comment.getComparingInfo(); PullRequest.ComparingInfo requestComparingInfo = getPullRequest().getRequestComparingInfo(commentComparingInfo); @@ -134,7 +134,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp } private void onRegionChange() { - TurboDev.getInstance(WebSocketManager.class).onRegionChange(this); + OneDev.getInstance(WebSocketManager.class).onRegionChange(this); } @Override @@ -277,10 +277,10 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp int newIndex = getCommitIndex(state.newCommit); if ((state.oldCommit.equals(getPullRequest().getBaseCommitHash()) || oldIndex != -1) && newIndex != -1) { - script = String.format("turbodev.server.requestChanges.initCommitSelector(%s, '%s', %d, %d);", + script = String.format("onedev.server.requestChanges.initCommitSelector(%s, '%s', %d, %d);", callback, getPullRequest().getBaseCommitHash(), oldIndex+1, newIndex); } else { - script = String.format("turbodev.server.requestChanges.initCommitSelector(%s, '%s');", + script = String.format("onedev.server.requestChanges.initCommitSelector(%s, '%s');", callback, getPullRequest().getBaseCommitHash()); } response.render(OnDomReadyHeaderItem.forScript(script)); @@ -519,7 +519,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp @Override public CodeComment getOpenComment() { if (state.commentId != null) - return TurboDev.getInstance(CodeCommentManager.class).load(state.commentId); + return OneDev.getInstance(CodeCommentManager.class).load(state.commentId); else return null; } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java index ef7a665cf9..1c17f19707 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/RequestChangesResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.changes; +package io.onedev.server.web.page.project.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.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class RequestChangesResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js similarity index 97% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js index 2e66626665..5cdea025f0 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/changes/request-changes.js @@ -1,4 +1,4 @@ -turbodev.server.requestChanges = { +onedev.server.requestChanges = { initCommitSelector: function(callback, baseCommit, fromIndex, toIndex) { var $commits = $(".commits-selector ul a"); if (fromIndex!=undefined && toIndex!=undefined) { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java index 3a881185d8..679bdba921 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/codecomments/RequestCodeCommentsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.codecomments; +package io.onedev.server.web.page.project.pullrequest.requestdetail.codecomments; import org.apache.wicket.model.IModel; import org.apache.wicket.request.IRequestHandler; @@ -7,14 +7,14 @@ import org.apache.wicket.request.cycle.IRequestCycleListener; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.VisitManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.comment.CodeCommentFilter; -import com.turbodev.server.web.component.comment.CodeCommentListPanel; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.VisitManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.comment.CodeCommentFilter; +import io.onedev.server.web.component.comment.CodeCommentListPanel; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class RequestCodeCommentsPage extends RequestDetailPage { @@ -110,7 +110,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage { @Override public void onEndRequest(RequestCycle cycle) { if (SecurityUtils.getUser() != null) { - TurboDev.getInstance(VisitManager.class).visitPullRequestCodeComments(SecurityUtils.getUser(), getPullRequest()); + OneDev.getInstance(VisitManager.class).visitPullRequestCodeComments(SecurityUtils.getUser(), getPullRequest()); } } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java index f2fadd26ae..6dc3a02e50 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.mergepreview; +package io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview; import java.io.Serializable; import java.util.Collection; @@ -22,18 +22,18 @@ import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.MergePreview; -import com.turbodev.server.util.diff.WhitespaceOption; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.component.diff.revision.RevisionDiffPanel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.websocket.CommitIndexedRegion; -import com.turbodev.server.web.websocket.PageDataChanged; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.MergePreview; +import io.onedev.server.util.diff.WhitespaceOption; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.component.diff.revision.RevisionDiffPanel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.websocket.CommitIndexedRegion; +import io.onedev.server.web.websocket.PageDataChanged; +import io.onedev.server.web.websocket.WebSocketRegion; @SuppressWarnings("serial") public class MergePreviewPage extends RequestDetailPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java index 1862d3f99c..804fda0f69 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/MergePreviewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.mergepreview; +package io.onedev.server.web.page.project.pullrequest.requestdetail.mergepreview; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/mergepreview/merge-preview.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java index c515effdaa..38773ee001 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/PullRequestActivity.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview; import java.io.Serializable; import java.util.Date; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java index c9ced06951..c868a86753 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview; import java.util.ArrayList; import java.util.Arrays; @@ -33,39 +33,39 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.joda.time.DateTime; import com.google.common.collect.Lists; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestCommentManager; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.PullRequestReference; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.model.PullRequestWatch; -import com.turbodev.server.model.User; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.model.support.MergeStrategy; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.requestreviewer.ReviewerListPanel; -import com.turbodev.server.web.component.verification.RequiredVerificationsPanel; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity.CommentedActivity; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity.OpenedActivity; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity.ReferencedActivity; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity.RequestCommentDeleted; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity.StatusChangeActivity; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity.UpdatedActivity; -import com.turbodev.server.web.page.project.pullrequest.requestlist.RequestListPage; -import com.turbodev.server.web.util.ConfirmOnClick; -import com.turbodev.server.web.websocket.PageDataChanged; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestCommentManager; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.PullRequestReference; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.model.PullRequestWatch; +import io.onedev.server.model.User; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.model.support.MergeStrategy; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.requestreviewer.ReviewerListPanel; +import io.onedev.server.web.component.verification.RequiredVerificationsPanel; +import io.onedev.server.web.page.project.pullrequest.requestdetail.RequestDetailPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.CommentedActivity; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.OpenedActivity; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.ReferencedActivity; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.RequestCommentDeleted; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.StatusChangeActivity; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity.UpdatedActivity; +import io.onedev.server.web.page.project.pullrequest.requestlist.RequestListPage; +import io.onedev.server.web.util.ConfirmOnClick; +import io.onedev.server.web.websocket.PageDataChanged; @SuppressWarnings("serial") public class RequestOverviewPage extends RequestDetailPage { @@ -346,7 +346,7 @@ public class RequestOverviewPage extends RequestDetailPage { comment.setRequest(getPullRequest()); comment.setUser(getLoginUser()); comment.setContent(input.getModelObject()); - TurboDev.getInstance(PullRequestCommentManager.class).save(comment); + OneDev.getInstance(PullRequestCommentManager.class).save(comment); input.setModelObject(""); target.add(addComment); @@ -417,7 +417,7 @@ public class RequestOverviewPage extends RequestDetailPage { @Override public void onClick() { - TurboDev.getInstance(PullRequestManager.class).check(getPullRequest()); + OneDev.getInstance(PullRequestManager.class).check(getPullRequest()); Session.get().success("Pull request is synchronized"); } @@ -427,7 +427,7 @@ public class RequestOverviewPage extends RequestDetailPage { @Override public void onClick() { PullRequest request = getPullRequest(); - TurboDev.getInstance(PullRequestManager.class).delete(request); + OneDev.getInstance(PullRequestManager.class).delete(request); Session.get().success("Pull request #" + request.getNumber() + " is deleted"); setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getProject())); } @@ -474,7 +474,7 @@ public class RequestOverviewPage extends RequestDetailPage { @Override protected void onUpdate(AjaxRequestTarget target) { - TurboDev.getInstance(PullRequestManager.class).saveMergeStrategy(getPullRequest()); + OneDev.getInstance(PullRequestManager.class).saveMergeStrategy(getPullRequest()); send(getPage(), Broadcast.BREADTH, new PageDataChanged(target)); } @@ -578,7 +578,7 @@ public class RequestOverviewPage extends RequestDetailPage { @Override protected void onUpdate(AjaxRequestTarget target) { PullRequestWatch watch = getPullRequest().getWatch(getLoginUser()); - Dao dao = TurboDev.getInstance(Dao.class); + Dao dao = OneDev.getInstance(Dao.class); if (optionModel.getObject() == WatchStatus.WATCHING) { if (watch != null) { watch.setIgnore(false); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java index e96650d0be..11f5961ab4 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/RequestOverviewResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java index 13110f604f..d8f6928286 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/SinceChangesLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview; import java.util.Date; @@ -8,11 +8,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; -import com.turbodev.server.web.websocket.PageDataChanged; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.pullrequest.requestdetail.changes.RequestChangesPage; +import io.onedev.server.web.websocket.PageDataChanged; @SuppressWarnings("serial") public class SinceChangesLink extends ViewStateAwarePageLink { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java index a1cbb4808e..082418196f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedActivity.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import java.util.Date; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestCommentManager; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestCommentManager; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; @SuppressWarnings("serial") public class CommentedActivity implements PullRequestActivity { @@ -32,7 +32,7 @@ public class CommentedActivity implements PullRequestActivity { } public PullRequestComment getComment() { - return TurboDev.getInstance(PullRequestCommentManager.class).load(commentId); + return OneDev.getInstance(PullRequestCommentManager.class).load(commentId); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java index b2c14c19b5..f4ebb9835d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/CommentedPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -16,25 +16,24 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.hibernate.StaleStateException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestCommentManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestComment; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.markdown.ContentVersionSupport; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; -import com.turbodev.server.web.util.ajaxlistener.ConfirmListener; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestCommentManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestComment; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.markdown.ContentVersionSupport; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; +import io.onedev.server.web.util.ajaxlistener.ConfirmListener; @SuppressWarnings("serial") class CommentedPanel extends GenericPanel { @@ -94,7 +93,7 @@ class CommentedPanel extends GenericPanel { @Override public void setObject(String object) { getComment().setContent(object); - TurboDev.getInstance(PullRequestCommentManager.class).save(getComment()); + OneDev.getInstance(PullRequestCommentManager.class).save(getComment()); } }, contentVersionSuppport)); @@ -146,7 +145,7 @@ class CommentedPanel extends GenericPanel { if (comment.getVersion() != lastVersion) throw new StaleStateException(""); comment.setContent(input.getModelObject()); - TurboDev.getInstance(PullRequestCommentManager.class).save(comment); + OneDev.getInstance(PullRequestCommentManager.class).save(comment); Component viewer = newViewer(); editor.replaceWith(viewer); @@ -194,7 +193,7 @@ class CommentedPanel extends GenericPanel { @Override public void onClick(AjaxRequestTarget target) { - TurboDev.getInstance(PullRequestCommentManager.class).delete(getComment()); + OneDev.getInstance(PullRequestCommentManager.class).delete(getComment()); send(CommentedPanel.this, Broadcast.BUBBLE, new RequestCommentDeleted(target)); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java index bfe551e05a..88aef7c8c3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedActivity.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import java.util.Date; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.PullRequest; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; @SuppressWarnings("serial") public class OpenedActivity implements PullRequestActivity { @@ -32,7 +32,7 @@ public class OpenedActivity implements PullRequestActivity { } public PullRequest getRequest() { - return TurboDev.getInstance(PullRequestManager.class).load(requestId); + return OneDev.getInstance(PullRequestManager.class).load(requestId); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java index e8084c2fc0..8874ea5e89 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/OpenedPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import org.apache.commons.lang3.StringUtils; import org.apache.wicket.Component; @@ -15,23 +15,22 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.hibernate.StaleStateException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.markdown.ContentVersionSupport; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.markdown.ContentVersionSupport; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; @SuppressWarnings("serial") class OpenedPanel extends GenericPanel { @@ -72,7 +71,7 @@ class OpenedPanel extends GenericPanel { @Override public void setObject(String object) { getPullRequest().setDescription(object); - TurboDev.getInstance(PullRequestManager.class).save(getPullRequest()); + OneDev.getInstance(PullRequestManager.class).save(getPullRequest()); } }, contentVersionSupport)); @@ -132,7 +131,7 @@ class OpenedPanel extends GenericPanel { if (getPullRequest().getVersion() != lastVersion) throw new StaleStateException(""); getPullRequest().setDescription(input.getModelObject()); - TurboDev.getInstance(Dao.class).persist(getPullRequest()); + OneDev.getInstance(Dao.class).persist(getPullRequest()); Component viewer = newViewer(); editor.replaceWith(viewer); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java index 8c76057feb..9e9e203022 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedActivity.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import java.util.Date; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestReferenceManager; -import com.turbodev.server.model.PullRequestReference; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestReferenceManager; +import io.onedev.server.model.PullRequestReference; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; @SuppressWarnings("serial") public class ReferencedActivity implements PullRequestActivity { @@ -32,7 +32,7 @@ public class ReferencedActivity implements PullRequestActivity { } private PullRequestReference getReference() { - return TurboDev.getInstance(PullRequestReferenceManager.class).load(referenceId); + return OneDev.getInstance(PullRequestReferenceManager.class).load(referenceId); } @Override public Date getDate() { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java index f7bc06ce42..b87ac30b78 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/ReferencedPanel.java @@ -1,19 +1,19 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.GenericPanel; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestReference; -import com.turbodev.server.model.User; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.requeststatus.RequestStatusPanel; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.util.DateUtils; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestReference; +import io.onedev.server.model.User; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.requeststatus.RequestStatusPanel; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.util.DateUtils; @SuppressWarnings("serial") class ReferencedPanel extends GenericPanel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java similarity index 57% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java index 0f97b69cd9..1d504c4221 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/RequestCommentDeleted.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import org.apache.wicket.ajax.AjaxRequestTarget; -import com.turbodev.server.web.util.AjaxPayload; +import io.onedev.server.web.util.AjaxPayload; public class RequestCommentDeleted extends AjaxPayload { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java similarity index 66% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java index a298df5095..201093c075 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangeActivity.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import java.util.Date; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; @SuppressWarnings("serial") public class StatusChangeActivity implements PullRequestActivity { @@ -32,7 +32,7 @@ public class StatusChangeActivity implements PullRequestActivity { } public PullRequestStatusChange getStatusChange() { - return TurboDev.getInstance(PullRequestStatusChangeManager.class).load(statusChangeId); + return OneDev.getInstance(PullRequestStatusChangeManager.class).load(statusChangeId); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java index 167065ea08..88bd5167c6 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/StatusChangePanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import org.apache.commons.lang3.StringUtils; import org.apache.wicket.Component; @@ -17,25 +17,24 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.hibernate.StaleStateException; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.PullRequestStatusChangeManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestStatusChange; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.comment.CommentInput; -import com.turbodev.server.web.component.comment.ProjectAttachmentSupport; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.markdown.AttachmentSupport; -import com.turbodev.server.web.component.markdown.ContentVersionSupport; -import com.turbodev.server.web.component.markdown.MarkdownViewer; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.ajaxlistener.ConfirmLeaveListener; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.manager.PullRequestStatusChangeManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestStatusChange; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.comment.CommentInput; +import io.onedev.server.web.component.comment.ProjectAttachmentSupport; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.markdown.AttachmentSupport; +import io.onedev.server.web.component.markdown.ContentVersionSupport; +import io.onedev.server.web.component.markdown.MarkdownViewer; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.SinceChangesLink; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener; @SuppressWarnings("serial") class StatusChangePanel extends GenericPanel { @@ -76,7 +75,7 @@ class StatusChangePanel extends GenericPanel { @Override public void setObject(String object) { getStatusChange().setNote(object); - TurboDev.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange()); + OneDev.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange()); } }, contentVersionSupport)); @@ -137,7 +136,7 @@ class StatusChangePanel extends GenericPanel { if (getStatusChange().getVersion() != lastVersion) throw new StaleStateException(""); getStatusChange().setNote(input.getModelObject()); - TurboDev.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange()); + OneDev.getInstance(PullRequestStatusChangeManager.class).save(getStatusChange()); Component viewer = newViewer(); editor.replaceWith(viewer); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java index 694780f0ba..5ace59ecf3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedActivity.java @@ -1,14 +1,14 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import java.util.Date; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; +import io.onedev.server.OneDev; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.PullRequestActivity; @SuppressWarnings("serial") public class UpdatedActivity implements PullRequestActivity { @@ -32,7 +32,7 @@ public class UpdatedActivity implements PullRequestActivity { } public PullRequestUpdate getUpdate() { - return TurboDev.getInstance(Dao.class).load(PullRequestUpdate.class, updateId); + return OneDev.getInstance(Dao.class).load(PullRequestUpdate.class, updateId); } @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java index b5c613f179..687713aa81 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/activity/UpdatedPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.activity; +package io.onedev.server.web.page.project.pullrequest.requestdetail.overview.activity; import java.util.List; import java.util.Map; @@ -18,21 +18,21 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.revwalk.RevCommit; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequestUpdate; -import com.turbodev.server.util.Verification; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.commitmessage.ExpandableCommitMessagePanel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequestUpdate; +import io.onedev.server.util.Verification; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.commitmessage.ExpandableCommitMessagePanel; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; @SuppressWarnings("serial") class UpdatedPanel extends GenericPanel { @@ -90,7 +90,7 @@ class UpdatedPanel extends GenericPanel { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class) + return OneDev.getInstance(VerificationManager.class) .getVerifications(projectModel.getObject(), commitHash); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/overview/request-overview.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/request-detail.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/request-detail.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestdetail/request-detail.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestdetail/request-detail.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.html rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.java index aa1132786c..d431bdef95 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestlist; +package io.onedev.server.web.page.project.pullrequest.requestlist; import java.util.ArrayList; import java.util.Date; @@ -31,30 +31,30 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.datatable.HistoryAwarePagingNavigator; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.BranchLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.menu.MenuItem; -import com.turbodev.server.web.component.menu.MenuLink; -import com.turbodev.server.web.component.requeststatus.RequestStatusPanel; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.pullrequest.newrequest.NewRequestPage; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.page.project.pullrequest.requestlist.SearchOption.Status; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.BranchLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.menu.MenuItem; +import io.onedev.server.web.component.menu.MenuLink; +import io.onedev.server.web.component.requeststatus.RequestStatusPanel; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.pullrequest.newrequest.NewRequestPage; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.page.project.pullrequest.requestlist.SearchOption.Status; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class RequestListPage extends ProjectPage { @@ -139,7 +139,7 @@ public class RequestListPage extends ProjectPage { }); - User currentUser = TurboDev.getInstance(UserManager.class).getCurrent(); + User currentUser = OneDev.getInstance(UserManager.class).getCurrent(); if (currentUser != null) { String userName = currentUser.getName(); menuItems.add(new MenuItem() { @@ -345,13 +345,13 @@ public class RequestListPage extends ProjectPage { EntityCriteria criteria = searchOption.getCriteria(page.getProject()); criteria.addOrder(sortOption.getOrder()); - return TurboDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator(); + return OneDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator(); } @Override public long size() { ProjectPage page = (ProjectPage) getPage(); - return TurboDev.getInstance(Dao.class).count(searchOption.getCriteria(page.getProject())); + return OneDev.getInstance(Dao.class).count(searchOption.getCriteria(page.getProject())); } @Override @@ -361,7 +361,7 @@ public class RequestListPage extends ProjectPage { @Override protected PullRequest load() { - return TurboDev.getInstance(Dao.class).load(PullRequest.class, pullRequestId); + return OneDev.getInstance(Dao.class).load(PullRequest.class, pullRequestId); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java index 0f790c25e1..53b1231d40 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/RequestListResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestlist; +package io.onedev.server.web.page.project.pullrequest.requestlist; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/SearchOption.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SearchOption.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/SearchOption.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SearchOption.java index 8eefae495d..fdf73b1700 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/SearchOption.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SearchOption.java @@ -1,7 +1,7 @@ -package com.turbodev.server.web.page.project.pullrequest.requestlist; +package io.onedev.server.web.page.project.pullrequest.requestlist; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofTarget; -import static com.turbodev.server.model.PullRequest.CriterionHelper.ofTargetProject; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget; +import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject; import java.io.Serializable; import java.util.Date; @@ -11,13 +11,13 @@ import javax.validation.constraints.NotNull; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.support.ProjectAndBranch; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.util.editable.annotation.BranchChoice; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.UserChoice; +import io.onedev.server.model.Project; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.support.ProjectAndBranch; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.util.editable.annotation.BranchChoice; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.UserChoice; @SuppressWarnings("serial") @Editable diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/SortOption.java b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SortOption.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/SortOption.java rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SortOption.java index f84b322ed6..c8a0792611 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/SortOption.java +++ b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/SortOption.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.pullrequest.requestlist; +package io.onedev.server.web.page.project.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.turbodev.utils.WordUtils; +import io.onedev.utils.WordUtils; public class SortOption implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/request-list.css b/web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/request-list.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/pullrequest/requestlist/request-list.css rename to web/src/main/java/io/onedev/server/web/page/project/pullrequest/requestlist/request-list.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java index 0d68266c62..b420d5f9c8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting; +package io.onedev.server.web.page.project.setting; import java.util.ArrayList; import java.util.List; @@ -8,16 +8,16 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.OnDomReadyHeaderItem; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.sidebar.SidebarPanel; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage; -import com.turbodev.server.web.page.project.setting.branchprotection.BranchProtectionPage; -import com.turbodev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage; -import com.turbodev.server.web.page.project.setting.general.GeneralSettingPage; -import com.turbodev.server.web.page.project.setting.tagprotection.TagProtectionPage; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.sidebar.SidebarPanel; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage; +import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage; +import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage; +import io.onedev.server.web.page.project.setting.general.GeneralSettingPage; +import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage; @SuppressWarnings("serial") public abstract class ProjectSettingPage extends ProjectPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingResourceReference.java index cf354ab6ac..d52e179256 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting; +package io.onedev.server.web.page.project.setting; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTab.java b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTab.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTab.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTab.java index af528e1bd1..62a9ee9e0c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTab.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTab.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.project.setting; +package io.onedev.server.web.page.project.setting; import org.apache.wicket.Component; import org.apache.wicket.model.Model; -import com.turbodev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTab; @SuppressWarnings("serial") public class ProjectSettingTab extends PageTab { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.html b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.java b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.java index 979aa0956f..825db28e0d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/ProjectSettingTabLink.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingTabLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting; +package io.onedev.server.web.page.project.setting; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; @SuppressWarnings("serial") public class ProjectSettingTabLink extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java index e361cf5e1f..da5587b284 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/authorization/ProjectAuthorizationsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.authorization; +package io.onedev.server.web.page.project.setting.authorization; import java.util.ArrayList; import java.util.Collection; @@ -36,38 +36,38 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.UserAuthorizationManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.datatable.SelectionColumn; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel; -import com.turbodev.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; -import com.turbodev.server.web.component.select2.SelectToAddChoice; -import com.turbodev.server.web.component.userchoice.AbstractUserChoiceProvider; -import com.turbodev.server.web.component.userchoice.UserChoiceResourceReference; -import com.turbodev.server.web.page.project.setting.ProjectSettingPage; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.UserAuthorizationManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.datatable.SelectionColumn; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel; +import io.onedev.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.server.web.component.select2.SelectToAddChoice; +import io.onedev.server.web.component.userchoice.AbstractUserChoiceProvider; +import io.onedev.server.web.component.userchoice.UserChoiceResourceReference; +import io.onedev.server.web.page.project.setting.ProjectSettingPage; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public class ProjectAuthorizationsPage extends ProjectSettingPage { @@ -87,7 +87,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { protected Map load() { Map authorizations = new HashMap<>(); for (UserAuthorizationFacade authorization: - TurboDev.getInstance(CacheManager.class).getUserAuthorizations().values()) { + OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) { if (authorization.getProjectId().equals(getProject().getId())) authorizations.put(authorization.getUserId(), authorization); } @@ -106,7 +106,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { userAuthorizations.put(User.ROOT_ID, ProjectPrivilege.ADMIN); usersAuthorizedFromOtherSources.add(User.ROOT_ID); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); Set adminGroupIds = new HashSet<>(); for (GroupFacade group: cacheManager.getGroups().values()) { if (group.isAdministrator()) @@ -231,7 +231,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { public void query(String term, int page, Response response) { List notAuthorized = new ArrayList<>(); - for (UserFacade user: TurboDev.getInstance(CacheManager.class).getUsers().values()) { + for (UserFacade user: OneDev.getInstance(CacheManager.class).getUsers().values()) { if (!getUserAuthorizations().containsKey(user.getId())) notAuthorized.add(user); } @@ -256,17 +256,17 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { super.onInitialize(); getSettings().setPlaceholder("Add user..."); - getSettings().setFormatResult("turbodev.server.userChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.userChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.userChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.userChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.userChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.userChoiceFormatter.escapeMarkup"); } @Override protected void onSelect(AjaxRequestTarget target, UserFacade selection) { UserAuthorization authorization = new UserAuthorization(); authorization.setProject(getProject()); - authorization.setUser(TurboDev.getInstance(UserManager.class).load(selection.getId())); - TurboDev.getInstance(UserAuthorizationManager.class).save(authorization); + authorization.setUser(OneDev.getInstance(UserManager.class).load(selection.getId())); + OneDev.getInstance(UserAuthorizationManager.class).save(authorization); target.add(authorizationsTable); Session.get().success("User added"); } @@ -286,7 +286,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { public void onClick(AjaxRequestTarget target) { Collection authorizationsToDelete = new HashSet<>(); Map explicitUserAuthorizations = getExplicitUserAuthorizations(); - UserAuthorizationManager userAuthorizationManager = TurboDev.getInstance(UserAuthorizationManager.class); + UserAuthorizationManager userAuthorizationManager = OneDev.getInstance(UserAuthorizationManager.class); for (IModel model: selectionColumn.getSelections()) { UserAuthorizationFacade authorization = explicitUserAuthorizations.get(model.getObject()); if (authorization != null) { @@ -336,7 +336,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { @Override public void populateItem(Item> cellItem, String componentId, IModel rowModel) { Fragment fragment = new Fragment(componentId, "userFrag", ProjectAuthorizationsPage.this); - User user = TurboDev.getInstance(UserManager.class).load(rowModel.getObject()); + User user = OneDev.getInstance(UserManager.class).load(rowModel.getObject()); fragment.add(new AvatarLink("avatarLink", user)); fragment.add(new UserLink("nameLink", user)); cellItem.add(fragment); @@ -381,12 +381,12 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { UserAuthorizationFacade userAuthorizationFacade = explicitUserAuthorizations.get(userId); UserAuthorizationManager userAuthorizationManager = - TurboDev.getInstance(UserAuthorizationManager.class); + OneDev.getInstance(UserAuthorizationManager.class); UserAuthorization userAuthorization; if (userAuthorizationFacade == null) { userAuthorization = new UserAuthorization(); userAuthorization.setProject(getProject()); - userAuthorization.setUser(TurboDev.getInstance(UserManager.class).load(userId)); + userAuthorization.setUser(OneDev.getInstance(UserManager.class).load(userId)); } else { userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId()); } @@ -433,7 +433,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { @Override protected Component newContent(String id, FloatingPanel dropdown) { Long userId = rowModel.getObject(); - User user = TurboDev.getInstance(UserManager.class).load(userId); + User user = OneDev.getInstance(UserManager.class).load(userId); return new PrivilegeSourcePanel(id, user, getProject(), getUserAuthorizations().get(userId)); } @@ -448,7 +448,7 @@ public class ProjectAuthorizationsPage extends ProjectSettingPage { private List getUserIds() { List userIds = new ArrayList<>(getUserAuthorizations().keySet()); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); return MatchScoreUtils.filterAndSort(userIds, new MatchScoreProvider() { @Override diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java index afb194ac4a..2cb1f1b631 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.branchprotection; +package io.onedev.server.web.page.project.setting.branchprotection; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -6,10 +6,9 @@ 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.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.web.editable.BeanContext; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.web.editable.BeanContext; @SuppressWarnings("serial") abstract class BranchProtectionEditor extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java index 6820b1c231..7097b9dbe8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.branchprotection; +package io.onedev.server.web.page.project.setting.branchprotection; import java.util.List; @@ -12,12 +12,12 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.web.behavior.sortable.SortBehavior; -import com.turbodev.server.web.behavior.sortable.SortPosition; -import com.turbodev.server.web.page.project.setting.ProjectSettingPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.web.behavior.sortable.SortBehavior; +import io.onedev.server.web.behavior.sortable.SortPosition; +import io.onedev.server.web.page.project.setting.ProjectSettingPage; @SuppressWarnings("serial") public class BranchProtectionPage extends ProjectSettingPage { @@ -50,14 +50,14 @@ public class BranchProtectionPage extends ProjectSettingPage { @Override protected void onDelete(AjaxRequestTarget target) { getProject().getBranchProtections().remove(item.getIndex()); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); target.add(container); } @Override protected void onSave(AjaxRequestTarget target, BranchProtection protection) { getProject().getBranchProtections().set(item.getIndex(), protection); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); } }); @@ -72,7 +72,7 @@ public class BranchProtectionPage extends ProjectSettingPage { List protections = getProject().getBranchProtections(); BranchProtection protection = protections.get(from.getItemIndex()); protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection)); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); target.add(container); } @@ -95,7 +95,7 @@ public class BranchProtectionPage extends ProjectSettingPage { @Override protected void onSave(AjaxRequestTarget target, BranchProtection protection) { getProject().getBranchProtections().add(protection); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); container.replace(newAddNewFrag()); target.add(container); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java index 03f9bd53a5..6c015cd462 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.branchprotection; +package io.onedev.server.web.page.project.setting.branchprotection; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -10,9 +10,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; -import com.turbodev.server.model.support.BranchProtection; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.util.ajaxlistener.ConfirmListener; +import io.onedev.server.model.support.BranchProtection; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.util.ajaxlistener.ConfirmListener; @SuppressWarnings("serial") abstract class BranchProtectionPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html index 609c47f9c6..79a2313fc7 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html @@ -6,7 +6,7 @@
    - Check this to tell TurboDev how to transform commit message for displaying. + Check this to tell OneDev how to transform commit message for displaying. This is normally used to transform issues keys in the commit message to issue links
    diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java similarity index 68% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java index 65401274cb..dd8ef4366d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.commitmessagetransform; +package io.onedev.server.web.page.project.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.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.CommitMessageTransformSetting; -import com.turbodev.server.web.editable.PropertyDescriptor; -import com.turbodev.server.web.editable.reflection.ReflectionPropertyEditor; -import com.turbodev.server.web.page.project.setting.ProjectSettingPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.CommitMessageTransformSetting; +import io.onedev.server.web.editable.PropertyDescriptor; +import io.onedev.server.web.editable.reflection.ReflectionPropertyEditor; +import io.onedev.server.web.page.project.setting.ProjectSettingPage; @SuppressWarnings("serial") public class CommitMessageTransformPage extends ProjectSettingPage { @@ -31,7 +31,7 @@ public class CommitMessageTransformPage extends ProjectSettingPage { @Override protected void onSubmit() { super.onSubmit(); - TurboDev.getInstance(ProjectManager.class).save(getProject()); + OneDev.getInstance(ProjectManager.class).save(getProject()); Session.get().success("Commit message transform setting is updated"); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/general/GeneralSettingPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/general/GeneralSettingPage.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/general/GeneralSettingPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java similarity index 78% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/general/GeneralSettingPage.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java index 985c846e7c..cda63bd44e 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/general/GeneralSettingPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.general; +package io.onedev.server.web.page.project.setting.general; import java.io.Serializable; @@ -9,15 +9,15 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.web.component.confirmdelete.ConfirmDeleteProjectModal; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.server.web.page.project.setting.ProjectSettingPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.web.component.confirmdelete.ConfirmDeleteProjectModal; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.server.web.page.project.setting.ProjectSettingPage; @SuppressWarnings("serial") public class GeneralSettingPage extends ProjectSettingPage { @@ -66,7 +66,7 @@ public class GeneralSettingPage extends ProjectSettingPage { super.onSubmit(); Project project = getProject(); - ProjectManager projectManager = TurboDev.getInstance(ProjectManager.class); + ProjectManager projectManager = OneDev.getInstance(ProjectManager.class); Project projectWithSameName = projectManager.find(project.getName()); if (projectWithSameName != null && !projectWithSameName.equals(project)) { String errorMessage = "This name has already been used by another project"; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css b/web/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/project-setting.css rename to web/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java index f667ab26fd..c9df04c2b9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.tagprotection; +package io.onedev.server.web.page.project.setting.tagprotection; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -6,10 +6,9 @@ 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.turbodev.server.model.support.TagProtection; -import com.turbodev.server.web.editable.BeanContext; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.web.editable.BeanContext; @SuppressWarnings("serial") abstract class TagProtectionEditor extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPage.html b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPage.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPage.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java index 62e97bea24..447ad170fc 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.tagprotection; +package io.onedev.server.web.page.project.setting.tagprotection; import java.util.List; @@ -12,12 +12,12 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.web.behavior.sortable.SortBehavior; -import com.turbodev.server.web.behavior.sortable.SortPosition; -import com.turbodev.server.web.page.project.setting.ProjectSettingPage; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.web.behavior.sortable.SortBehavior; +import io.onedev.server.web.behavior.sortable.SortPosition; +import io.onedev.server.web.page.project.setting.ProjectSettingPage; @SuppressWarnings("serial") public class TagProtectionPage extends ProjectSettingPage { @@ -50,14 +50,14 @@ public class TagProtectionPage extends ProjectSettingPage { @Override protected void onDelete(AjaxRequestTarget target) { getProject().getTagProtections().remove(item.getIndex()); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); target.add(container); } @Override protected void onSave(AjaxRequestTarget target, TagProtection protection) { getProject().getTagProtections().set(item.getIndex(), protection); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); } }); @@ -72,7 +72,7 @@ public class TagProtectionPage extends ProjectSettingPage { List protections = getProject().getTagProtections(); TagProtection protection = protections.get(from.getItemIndex()); protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection)); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); target.add(container); } @@ -95,7 +95,7 @@ public class TagProtectionPage extends ProjectSettingPage { @Override protected void onSave(AjaxRequestTarget target, TagProtection protection) { getProject().getTagProtections().add(protection); - TurboDev.getInstance(ProjectManager.class).save(getProject(), null); + OneDev.getInstance(ProjectManager.class).save(getProject(), null); container.replace(newAddNewFrag()); target.add(container); } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java index b7d7d671e9..ad9b501e89 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.setting.tagprotection; +package io.onedev.server.web.page.project.setting.tagprotection; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -10,9 +10,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.util.ajaxlistener.ConfirmListener; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.util.ajaxlistener.ConfirmListener; @SuppressWarnings("serial") abstract class TagProtectionPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ContributionListPanel.html b/web/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ContributionListPanel.html rename to web/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ContributionListPanel.java b/web/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ContributionListPanel.java rename to web/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java index cfa9ba7891..d3978617c9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/ContributionListPanel.java +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/ContributionListPanel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.stats; +package io.onedev.server.web.page.project.stats; import java.util.ArrayList; import java.util.Iterator; @@ -17,8 +17,8 @@ import org.apache.wicket.markup.repeater.Item; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.util.DateUtils; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.util.DateUtils; @SuppressWarnings("serial") class ContributionListPanel extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/DayContribution.java b/web/src/main/java/io/onedev/server/web/page/project/stats/DayContribution.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/DayContribution.java rename to web/src/main/java/io/onedev/server/web/page/project/stats/DayContribution.java index 1d7a5dfecd..b11d5a0bea 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/DayContribution.java +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/DayContribution.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.project.stats; +package io.onedev.server.web.page.project.stats; import java.io.Serializable; -import com.turbodev.server.git.Contribution; -import com.turbodev.server.util.Day; +import io.onedev.server.git.Contribution; +import io.onedev.server.util.Day; class DayContribution implements Serializable, Comparable { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectContribsPage.html b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectContribsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectContribsPage.java b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectContribsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java index ae9884917f..470162120c 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectContribsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectContribsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.stats; +package io.onedev.server.web.page.project.stats; import java.util.ArrayList; import java.util.Collections; @@ -21,16 +21,15 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.Contribution; -import com.turbodev.server.git.Contributor; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.util.Day; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.link.UserLink; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.Contribution; +import io.onedev.server.git.Contributor; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.util.Day; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.link.UserLink; @SuppressWarnings("serial") public class ProjectContribsPage extends ProjectStatsPage { @@ -40,7 +39,7 @@ public class ProjectContribsPage extends ProjectStatsPage { @Override protected List load() { - Map map = TurboDev.getInstance(CommitInfoManager.class).getOverallContributions(getProject()); + Map map = OneDev.getInstance(CommitInfoManager.class).getOverallContributions(getProject()); return sort(map); } @@ -134,7 +133,7 @@ public class ProjectContribsPage extends ProjectStatsPage { toDay = overallContributions.get(size-1).getDay(); } - return TurboDev.getInstance(CommitInfoManager.class) + return OneDev.getInstance(CommitInfoManager.class) .getTopContributors(getProject(), 100, Contribution.Type.valueOf(orderBy), fromDay, toDay); } else { return new ArrayList<>(); @@ -167,7 +166,7 @@ public class ProjectContribsPage extends ProjectStatsPage { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript("turbodev.server.stats.contribs.onDomReady();")); + response.render(OnDomReadyHeaderItem.forScript("onedev.server.stats.contribs.onDomReady();")); } } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsPage.html b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsPage.java b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java index 61022f968f..b7fb8c713b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.stats; +package io.onedev.server.web.page.project.stats; import java.util.ArrayList; import java.util.List; @@ -11,12 +11,12 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.PageTabLink; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.component.tabbable.Tabbable; -import com.turbodev.server.web.page.project.ProjectPage; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTabLink; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.component.tabbable.Tabbable; +import io.onedev.server.web.page.project.ProjectPage; @SuppressWarnings("serial") public abstract class ProjectStatsPage extends ProjectPage { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java index c93452d3da..a93922ee59 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/ProjectStatsResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/ProjectStatsResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.stats; +package io.onedev.server.web.page.project.stats; 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.turbodev.server.web.asset.chart.ChartResourceReference; -import com.turbodev.server.web.page.base.BaseDependentResourceReference; +import io.onedev.server.web.asset.chart.ChartResourceReference; +import io.onedev.server.web.page.base.BaseDependentResourceReference; public class ProjectStatsResourceReference extends BaseDependentResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/SourceLinesPage.html b/web/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/SourceLinesPage.html rename to web/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/SourceLinesPage.java b/web/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/SourceLinesPage.java rename to web/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java index dd85338577..10e0bcb515 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/SourceLinesPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/SourceLinesPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.stats; +package io.onedev.server.web.page.project.stats; import java.util.ArrayList; import java.util.Collections; @@ -25,12 +25,12 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.LineStats; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.util.Day; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.util.DateUtils; +import io.onedev.server.OneDev; +import io.onedev.server.git.LineStats; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.util.Day; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.util.DateUtils; @SuppressWarnings("serial") public class SourceLinesPage extends ProjectStatsPage { @@ -39,7 +39,7 @@ public class SourceLinesPage extends ProjectStatsPage { @Override protected LineStats load() { - return TurboDev.getInstance(CommitInfoManager.class).getLineStats(getProject()); + return OneDev.getInstance(CommitInfoManager.class).getLineStats(getProject()); } }; @@ -158,7 +158,7 @@ public class SourceLinesPage extends ProjectStatsPage { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(OnDomReadyHeaderItem.forScript("turbodev.server.stats.lineStats.onDomReady();")); + response.render(OnDomReadyHeaderItem.forScript("onedev.server.stats.lineStats.onDomReady();")); } } diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/project-stats.css b/web/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/project-stats.css rename to web/src/main/java/io/onedev/server/web/page/project/stats/project-stats.css diff --git a/web/src/main/java/com/turbodev/server/web/page/project/stats/project-stats.js b/web/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/project/stats/project-stats.js rename to web/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js index 4190d74b0d..c95a89b677 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/stats/project-stats.js +++ b/web/src/main/java/io/onedev/server/web/page/project/stats/project-stats.js @@ -1,4 +1,4 @@ -turbodev.server.stats = { +onedev.server.stats = { contribs: { onDomReady: function() { diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.html b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.html rename to web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java rename to web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java index 836875b150..f6b0b7e70b 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.tags; +package io.onedev.server.web.page.project.tags; import java.util.Iterator; import java.util.List; @@ -34,34 +34,33 @@ import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; import org.eclipse.jgit.revwalk.RevTag; -import com.turbodev.utils.StringUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.TagProtection; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.Verification; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.contributorpanel.ContributorPanel; -import com.turbodev.server.web.component.datatable.HistoryAwarePagingNavigator; -import com.turbodev.server.web.component.link.ArchiveMenuLink; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.modal.ModalLink; -import com.turbodev.server.web.component.modal.ModalPanel; -import com.turbodev.server.web.component.revisionpicker.RevisionPicker; -import com.turbodev.server.web.component.verification.VerificationStatusPanel; -import com.turbodev.server.web.page.project.NoCommitsPage; -import com.turbodev.server.web.page.project.ProjectPage; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.commit.CommitDetailPage; -import com.turbodev.server.web.util.PagingHistorySupport; -import com.turbodev.server.web.util.ajaxlistener.ConfirmListener; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.TagProtection; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.Verification; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.contributorpanel.ContributorPanel; +import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator; +import io.onedev.server.web.component.link.ArchiveMenuLink; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.modal.ModalLink; +import io.onedev.server.web.component.modal.ModalPanel; +import io.onedev.server.web.component.revisionpicker.RevisionPicker; +import io.onedev.server.web.component.verification.VerificationStatusPanel; +import io.onedev.server.web.page.project.NoCommitsPage; +import io.onedev.server.web.page.project.ProjectPage; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.commit.CommitDetailPage; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.server.web.util.ajaxlistener.ConfirmListener; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public class ProjectTagsPage extends ProjectPage { @@ -258,7 +257,7 @@ public class ProjectTagsPage extends ProjectPage { PageableListView tagsView; tagsContainer.add(tagsView = new PageableListView("tags", tagsModel, - com.turbodev.server.web.WebConstants.PAGE_SIZE) { + io.onedev.server.web.WebConstants.PAGE_SIZE) { @Override protected void populateItem(ListItem item) { @@ -278,7 +277,7 @@ public class ProjectTagsPage extends ProjectPage { @Override protected Map load() { - return TurboDev.getInstance(VerificationManager.class).getVerifications(getProject(), commitHash); + return OneDev.getInstance(VerificationManager.class).getVerifications(getProject(), commitHash); } })); diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsResourceReference.java b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsResourceReference.java index 98aa5d0bd1..d0b4c93b0a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/project/tags/ProjectTagsResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.project.tags; +package io.onedev.server.web.page.project.tags; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/project/tags/project-tags.css b/web/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/project/tags/project-tags.css rename to web/src/main/java/io/onedev/server/web/page/project/tags/project-tags.css diff --git a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.html b/web/src/main/java/io/onedev/server/web/page/security/ForgetPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.html rename to web/src/main/java/io/onedev/server/web/page/security/ForgetPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java b/web/src/main/java/io/onedev/server/web/page/security/ForgetPage.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java rename to web/src/main/java/io/onedev/server/web/page/security/ForgetPage.java index af791795b4..ccbf8b42c3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/security/ForgetPage.java +++ b/web/src/main/java/io/onedev/server/web/page/security/ForgetPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.security; +package io.onedev.server.web.page.security; import java.io.Serializable; import java.util.Arrays; @@ -12,19 +12,18 @@ import org.hibernate.validator.constraints.NotEmpty; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.web.behavior.testform.TestFormBehavior; -import com.turbodev.server.web.behavior.testform.TestResult; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.page.base.BasePage; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.web.behavior.testform.TestFormBehavior; +import io.onedev.server.web.behavior.testform.TestResult; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public class ForgetPage extends BasePage { @@ -51,7 +50,7 @@ public class ForgetPage extends BasePage { @Override protected TestResult test() { - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); User user = userManager.findByName(bean.getUserNameOrEmailAddress()); if (user == null) { user = userManager.findByEmail(bean.getUserNameOrEmailAddress()); @@ -59,13 +58,13 @@ public class ForgetPage extends BasePage { if (user == null) { return new TestResult.Failed("No user found with name or email: " + bean.getUserNameOrEmailAddress()); } else { - ConfigManager configManager = TurboDev.getInstance(ConfigManager.class); + ConfigManager configManager = OneDev.getInstance(ConfigManager.class); if (configManager.getMailSetting() != null) { String password = RandomStringUtils.random(10, true, true); user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password)); userManager.save(user); - MailManager mailManager = TurboDev.getInstance(MailManager.class); + MailManager mailManager = OneDev.getInstance(MailManager.class); try { String mailBody = String.format("Dear %s, " + "

    " @@ -73,11 +72,11 @@ public class ForgetPage extends BasePage { + "%s

    " + "Please login and change the password in your earliest convenience." + "

    " - + "-- Sent by TurboDev", + + "-- Sent by OneDev", user.getDisplayName(), user.getName(), password); mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user.getEmail()), - "Your TurboDev password has been reset", mailBody); + "Your OneDev password has been reset", mailBody); return new TestResult.Successful("Please check your email " + user.getEmail() + " for the reset password."); } catch (Exception e) { logger.error("Error sending password reset email", e); diff --git a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html b/web/src/main/java/io/onedev/server/web/page/security/LoginPage.html similarity index 97% rename from web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html rename to web/src/main/java/io/onedev/server/web/page/security/LoginPage.html index 57225b6013..2c89d5348e 100644 --- a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.html +++ b/web/src/main/java/io/onedev/server/web/page/security/LoginPage.html @@ -1,6 +1,6 @@

    -

    TurboDev Login

    +

    OneDev Login

    diff --git a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.java b/web/src/main/java/io/onedev/server/web/page/security/LoginPage.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/security/LoginPage.java rename to web/src/main/java/io/onedev/server/web/page/security/LoginPage.java index ba1ac1fb56..9fb51dbf88 100644 --- a/web/src/main/java/com/turbodev/server/web/page/security/LoginPage.java +++ b/web/src/main/java/io/onedev/server/web/page/security/LoginPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.security; +package io.onedev.server.web.page.security; import java.util.Arrays; @@ -17,17 +17,16 @@ import org.apache.wicket.model.IModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.MailManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.web.WebSession; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.base.BasePage; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.MailManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.web.WebSession; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public class LoginPage extends BasePage { @@ -59,34 +58,34 @@ public class LoginPage extends BasePage { String feedback = null; - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); if (userName != null) { User user = userManager.findByName(userName); if (user != null && user.getPassword() != null && user.getPassword().startsWith("@hash^prefix@")) { - String hashAlgorithmChangeMessage = "TurboDev password hash algorithm has been changed for security reason."; + String hashAlgorithmChangeMessage = "OneDev password hash algorithm has been changed for security reason."; if (user.isRoot()) { feedback = hashAlgorithmChangeMessage + " Please reset administrator password by running " - + "reset_admin_password command from TurboDev bin directory"; + + "reset_admin_password command from OneDev bin directory"; } else { String password = RandomStringUtils.random(10, true, true); user.setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(password)); userManager.save(user); - ConfigManager configManager = TurboDev.getInstance(ConfigManager.class); + ConfigManager configManager = OneDev.getInstance(ConfigManager.class); if (configManager.getMailSetting() != null) { - MailManager mailManager = TurboDev.getInstance(MailManager.class); + MailManager mailManager = OneDev.getInstance(MailManager.class); try { String mailBody = String.format("Dear %s, " + "

    " + hashAlgorithmChangeMessage + " As a result of this, password of your user \"%s\" has been reset to:
    " + "%s

    " - + "-- Sent by TurboDev", + + "-- Sent by OneDev", user.getDisplayName(), user.getName(), password); mailManager.sendMail(configManager.getMailSetting(), Arrays.asList(user.getEmail()), - "Your TurboDev password has been reset", mailBody); + "Your OneDev password has been reset", mailBody); feedback = hashAlgorithmChangeMessage + " As a result of this, password of your user has been reset and sent to " + "address " + user.getEmail(); @@ -95,12 +94,12 @@ public class LoginPage extends BasePage { feedback = hashAlgorithmChangeMessage + " Since the reset password can not be been sent to your mail box " + "due to mail error (check server log for details). Please " - + "contact TurboDev administrator to reset your password manually"; + + "contact OneDev administrator to reset your password manually"; } } else { feedback = hashAlgorithmChangeMessage + " The reset password can not be sent as mail setting is not defined. " - + "Please contact TurboDev administrator to reset your password manually"; + + "Please contact OneDev administrator to reset your password manually"; } } } @@ -179,12 +178,12 @@ public class LoginPage extends BasePage { @Override protected void onConfigure() { super.onConfigure(); - setVisible(TurboDev.getInstance(ConfigManager.class).getMailSetting() != null); + setVisible(OneDev.getInstance(ConfigManager.class).getMailSetting() != null); } }); - boolean enableSelfRegister = TurboDev.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister(); + boolean enableSelfRegister = OneDev.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister(); add(new ViewStateAwarePageLink("registerUser", RegisterPage.class).setVisible(enableSelfRegister)); } diff --git a/web/src/main/java/com/turbodev/server/web/page/security/LoginResourceReference.java b/web/src/main/java/io/onedev/server/web/page/security/LoginResourceReference.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/page/security/LoginResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/security/LoginResourceReference.java index e37bc6479f..3d7af853bd 100644 --- a/web/src/main/java/com/turbodev/server/web/page/security/LoginResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/security/LoginResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.security; +package io.onedev.server.web.page.security; import org.apache.wicket.request.resource.CssResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/page/security/LogoutPage.java b/web/src/main/java/io/onedev/server/web/page/security/LogoutPage.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/security/LogoutPage.java rename to web/src/main/java/io/onedev/server/web/page/security/LogoutPage.java index 5db6002f29..a80da62c98 100644 --- a/web/src/main/java/com/turbodev/server/web/page/security/LogoutPage.java +++ b/web/src/main/java/io/onedev/server/web/page/security/LogoutPage.java @@ -1,10 +1,10 @@ -package com.turbodev.server.web.page.security; +package io.onedev.server.web.page.security; import org.apache.wicket.RestartResponseException; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.WebSession; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.WebSession; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public class LogoutPage extends BasePage { diff --git a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.html b/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.html rename to web/src/main/java/io/onedev/server/web/page/security/RegisterPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java b/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java rename to web/src/main/java/io/onedev/server/web/page/security/RegisterPage.java index 3afb3b136d..f341ee637f 100644 --- a/web/src/main/java/com/turbodev/server/web/page/security/RegisterPage.java +++ b/web/src/main/java/io/onedev/server/web/page/security/RegisterPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.security; +package io.onedev.server.web.page.security; import org.apache.shiro.authc.credential.PasswordService; import org.apache.shiro.authz.UnauthenticatedException; @@ -7,25 +7,25 @@ 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.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.page.base.BasePage; -import com.turbodev.server.web.page.project.ProjectListPage; -import com.turbodev.server.web.page.user.AvatarEditPage; -import com.turbodev.server.web.page.user.UserPage; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.page.base.BasePage; +import io.onedev.server.web.page.project.ProjectListPage; +import io.onedev.server.web.page.user.AvatarEditPage; +import io.onedev.server.web.page.user.UserPage; @SuppressWarnings("serial") public class RegisterPage extends BasePage { public RegisterPage() { - if (!TurboDev.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister()) + if (!OneDev.getInstance(ConfigManager.class).getSecuritySetting().isEnableSelfRegister()) throw new UnauthenticatedException("User self-register is disabled"); if (getLoginUser() != null) throw new IllegalStateException("Can not sign up a user while signed in"); @@ -44,7 +44,7 @@ public class RegisterPage extends BasePage { protected void onSubmit() { super.onSubmit(); - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); User userWithSameName = userManager.findByName(user.getName()); if (userWithSameName != null) { editor.getErrorContext(new PathSegment.Property("name")) diff --git a/web/src/main/java/com/turbodev/server/web/page/security/login.css b/web/src/main/java/io/onedev/server/web/page/security/login.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/security/login.css rename to web/src/main/java/io/onedev/server/web/page/security/login.css diff --git a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.html b/web/src/main/java/io/onedev/server/web/page/test/TestPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/test/TestPage.html rename to web/src/main/java/io/onedev/server/web/page/test/TestPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.java b/web/src/main/java/io/onedev/server/web/page/test/TestPage.java similarity index 60% rename from web/src/main/java/com/turbodev/server/web/page/test/TestPage.java rename to web/src/main/java/io/onedev/server/web/page/test/TestPage.java index b328e20317..f4557125f8 100644 --- a/web/src/main/java/com/turbodev/server/web/page/test/TestPage.java +++ b/web/src/main/java/io/onedev/server/web/page/test/TestPage.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.test; +package io.onedev.server.web.page.test; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.web.page.base.BasePage; @SuppressWarnings("serial") public class TestPage extends BasePage { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html b/web/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.html rename to web/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java b/web/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java rename to web/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java index 4f289da5c7..335ef80136 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/AvatarEditPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/AvatarEditPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.Collection; @@ -14,14 +14,13 @@ import org.apache.wicket.model.PropertyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.lang.Bytes; -import com.turbodev.server.TurboDev; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.component.avatar.Avatar; -import com.turbodev.server.web.component.avatar.AvatarChanged; -import com.turbodev.server.web.component.dropzonefield.DropzoneField; -import com.turbodev.server.web.util.avatar.AvatarManager; - import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; +import io.onedev.server.OneDev; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.component.avatar.Avatar; +import io.onedev.server.web.component.avatar.AvatarChanged; +import io.onedev.server.web.component.dropzonefield.DropzoneField; +import io.onedev.server.web.util.avatar.AvatarManager; @SuppressWarnings("serial") public class AvatarEditPage extends UserPage { @@ -67,7 +66,7 @@ public class AvatarEditPage extends UserPage { protected void onSubmit(AjaxRequestTarget target, Form form) { super.onSubmit(target, form); FileUpload upload = uploads.iterator().next(); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); avatarManager.useAvatar(userModel.getObject(), upload); send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject())); target.add(form); @@ -80,13 +79,13 @@ public class AvatarEditPage extends UserPage { @Override protected void onConfigure() { super.onConfigure(); - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); setVisible(avatarManager.getUploaded(userModel.getObject().getFacade()).exists()); } @Override public void onClick(AjaxRequestTarget target) { - AvatarManager avatarManager = TurboDev.getInstance(AvatarManager.class); + AvatarManager avatarManager = OneDev.getInstance(AvatarManager.class); avatarManager.useAvatar(userModel.getObject(), null); target.add(form); send(getPage(), Broadcast.BREADTH, new AvatarChanged(target, userModel.getObject())); diff --git a/web/src/main/java/com/turbodev/server/web/page/user/CurrentPassword.java b/web/src/main/java/io/onedev/server/web/page/user/CurrentPassword.java similarity index 90% rename from web/src/main/java/com/turbodev/server/web/page/user/CurrentPassword.java rename to web/src/main/java/io/onedev/server/web/page/user/CurrentPassword.java index 0dd30e5bfd..a99b46bae2 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/CurrentPassword.java +++ b/web/src/main/java/io/onedev/server/web/page/user/CurrentPassword.java @@ -1,11 +1,11 @@ /* - * Copyright TurboDev Inc., + * Copyright OneDev Inc., * Date: 2008-2-28 * All rights reserved. * * Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $ */ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/web/src/main/java/com/turbodev/server/web/page/user/CurrentPasswordValidator.java b/web/src/main/java/io/onedev/server/web/page/user/CurrentPasswordValidator.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/page/user/CurrentPasswordValidator.java rename to web/src/main/java/io/onedev/server/web/page/user/CurrentPasswordValidator.java index 31261773a3..72ae20fbb5 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/CurrentPasswordValidator.java +++ b/web/src/main/java/io/onedev/server/web/page/user/CurrentPasswordValidator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; @@ -6,8 +6,8 @@ import javax.validation.ConstraintValidatorContext; import org.apache.shiro.authc.AuthenticationToken; import org.apache.shiro.authc.UsernamePasswordToken; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.util.WicketUtils; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.util.WicketUtils; public class CurrentPasswordValidator implements ConstraintValidator { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/NewUserPage.html b/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/NewUserPage.html rename to web/src/main/java/io/onedev/server/web/page/user/NewUserPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/NewUserPage.java b/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/page/user/NewUserPage.java rename to web/src/main/java/io/onedev/server/web/page/user/NewUserPage.java index b6b482d04e..3b12c78e8d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/NewUserPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/NewUserPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.List; @@ -14,17 +14,17 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.page.layout.LayoutPage; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.page.layout.LayoutPage; @SuppressWarnings("serial") public class NewUserPage extends LayoutPage { @@ -45,7 +45,7 @@ public class NewUserPage extends LayoutPage { protected void onSubmit() { super.onSubmit(); - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); User userWithSameName = userManager.findByName(user.getName()); if (userWithSameName != null) { editor.getErrorContext(new PathSegment.Property("name")) diff --git a/web/src/main/java/com/turbodev/server/web/page/user/PasswordEditBean.java b/web/src/main/java/io/onedev/server/web/page/user/PasswordEditBean.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/page/user/PasswordEditBean.java rename to web/src/main/java/io/onedev/server/web/page/user/PasswordEditBean.java index da748cb7d0..45428e4efe 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/PasswordEditBean.java +++ b/web/src/main/java/io/onedev/server/web/page/user/PasswordEditBean.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Password; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Password; @Editable public class PasswordEditBean implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/PasswordEditPage.html b/web/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/PasswordEditPage.html rename to web/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/PasswordEditPage.java b/web/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java similarity index 79% rename from web/src/main/java/com/turbodev/server/web/page/user/PasswordEditPage.java rename to web/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java index 1ea0f7e6c4..88b4176e1a 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/PasswordEditPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/PasswordEditPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.HashSet; import java.util.Set; @@ -8,11 +8,11 @@ import org.apache.wicket.Session; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.editable.BeanContext; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.editable.BeanContext; @SuppressWarnings("serial") public class PasswordEditPage extends UserPage { @@ -39,7 +39,7 @@ public class PasswordEditPage extends UserPage { protected void onSubmit() { super.onSubmit(); getUser().setPassword(AppLoader.getInstance(PasswordService.class).encryptPassword(bean.getNewPassword())); - TurboDev.getInstance(UserManager.class).save(getUser(), null); + OneDev.getInstance(UserManager.class).save(getUser(), null); Session.get().success("Password has been changed"); bean.setOldPassword(null); diff --git a/web/src/main/java/com/turbodev/server/web/page/user/TaskListPage.html b/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.html similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/user/TaskListPage.html rename to web/src/main/java/io/onedev/server/web/page/user/TaskListPage.html index 20b3d12b9b..dce5558ac9 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/TaskListPage.html +++ b/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.html @@ -4,7 +4,7 @@

    No tasks found
    - TurboDev will remove tasks automatically after you complete them. However you can also delete selected tasks manually here. + OneDev will remove tasks automatically after you complete them. However you can also delete selected tasks manually here.
    diff --git a/web/src/main/java/com/turbodev/server/web/page/user/TaskListPage.java b/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/user/TaskListPage.java rename to web/src/main/java/io/onedev/server/web/page/user/TaskListPage.java index 22e9fe47fb..fe7c9f5cb6 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/TaskListPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/TaskListPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.ArrayList; import java.util.List; @@ -18,22 +18,22 @@ import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.model.PullRequestTask; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.component.datatable.EntityDataProvider; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.datatable.SelectionColumn; -import com.turbodev.server.web.component.link.BranchLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; -import com.turbodev.server.web.util.DateUtils; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.model.PullRequest; +import io.onedev.server.model.PullRequestTask; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.component.datatable.EntityDataProvider; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.datatable.SelectionColumn; +import io.onedev.server.web.component.link.BranchLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.web.util.DateUtils; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class TaskListPage extends UserPage { @@ -170,7 +170,7 @@ public class TaskListPage extends UserPage { getSession().warn("Please select tasks to delete"); } else { for (IModel model: selectionColumn.getSelections()) - TurboDev.getInstance(Dao.class).remove(model.getObject()); + OneDev.getInstance(Dao.class).remove(model.getObject()); } setResponsePage(TaskListPage.class, TaskListPage.paramsOf(getUser())); } diff --git a/web/src/main/java/com/turbodev/server/web/page/user/TokenGenerateBean.java b/web/src/main/java/io/onedev/server/web/page/user/TokenGenerateBean.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/page/user/TokenGenerateBean.java rename to web/src/main/java/io/onedev/server/web/page/user/TokenGenerateBean.java index cf1de8645e..dde1406298 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/TokenGenerateBean.java +++ b/web/src/main/java/io/onedev/server/web/page/user/TokenGenerateBean.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import com.turbodev.server.util.editable.annotation.Editable; -import com.turbodev.server.util.editable.annotation.Password; +import io.onedev.server.util.editable.annotation.Editable; +import io.onedev.server.util.editable.annotation.Password; @Editable public class TokenGenerateBean implements Serializable { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/TokenGeneratePage.html b/web/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.html similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/user/TokenGeneratePage.html rename to web/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.html index 2bc300166b..908762a14d 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/TokenGeneratePage.html +++ b/web/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.html @@ -1,7 +1,7 @@
    -
    Access token can be used to provide access to TurboDev in some third-party +
    Access token can be used to provide access to OneDev in some third-party applications not supporting http basic authentication
    diff --git a/web/src/main/java/com/turbodev/server/web/page/user/TokenGeneratePage.java b/web/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/user/TokenGeneratePage.java rename to web/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java index 3c38269bac..87c42090db 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/TokenGeneratePage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/TokenGeneratePage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import org.apache.shiro.codec.Base64; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -7,10 +7,9 @@ import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.behavior.clipboard.CopyClipboardBehavior; -import com.turbodev.server.web.editable.BeanContext; - +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.behavior.clipboard.CopyClipboardBehavior; +import io.onedev.server.web.editable.BeanContext; import jersey.repackaged.com.google.common.collect.Sets; @SuppressWarnings("serial") diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserAuthorizationsPage.html b/web/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/UserAuthorizationsPage.html rename to web/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserAuthorizationsPage.java b/web/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/page/user/UserAuthorizationsPage.java rename to web/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.java index a45db57657..29e0e6d3ea 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserAuthorizationsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserAuthorizationsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.ArrayList; import java.util.Collection; @@ -35,35 +35,35 @@ import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.manager.UserAuthorizationManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.UserAuthorization; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.permission.SystemAdministration; -import com.turbodev.server.util.facade.GroupAuthorizationFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.util.facade.ProjectFacade; -import com.turbodev.server.util.facade.UserAuthorizationFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.datatable.SelectionColumn; -import com.turbodev.server.web.component.floating.FloatingPanel; -import com.turbodev.server.web.component.link.DropdownLink; -import com.turbodev.server.web.component.projectchoice.AbstractProjectChoiceProvider; -import com.turbodev.server.web.component.projectchoice.ProjectChoiceResourceReference; -import com.turbodev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel; -import com.turbodev.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; -import com.turbodev.server.web.component.select2.SelectToAddChoice; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.manager.UserAuthorizationManager; +import io.onedev.server.model.Project; +import io.onedev.server.model.UserAuthorization; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.permission.SystemAdministration; +import io.onedev.server.util.facade.GroupAuthorizationFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.util.facade.ProjectFacade; +import io.onedev.server.util.facade.UserAuthorizationFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.datatable.SelectionColumn; +import io.onedev.server.web.component.floating.FloatingPanel; +import io.onedev.server.web.component.link.DropdownLink; +import io.onedev.server.web.component.projectchoice.AbstractProjectChoiceProvider; +import io.onedev.server.web.component.projectchoice.ProjectChoiceResourceReference; +import io.onedev.server.web.component.projectprivilege.privilegeselection.PrivilegeSelectionPanel; +import io.onedev.server.web.component.projectprivilege.privilegesource.PrivilegeSourcePanel; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.server.web.component.select2.SelectToAddChoice; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public class UserAuthorizationsPage extends UserPage { @@ -83,7 +83,7 @@ public class UserAuthorizationsPage extends UserPage { protected Map load() { Map authorizations = new HashMap<>(); for (UserAuthorizationFacade authorization: - TurboDev.getInstance(CacheManager.class).getUserAuthorizations().values()) { + OneDev.getInstance(CacheManager.class).getUserAuthorizations().values()) { if (authorization.getUserId().equals(getUser().getId())) authorizations.put(authorization.getProjectId(), authorization); } @@ -98,7 +98,7 @@ public class UserAuthorizationsPage extends UserPage { protected Map load() { Map projectAuthorizations = new HashMap<>(); Collection projectsAuthorizedFromOtherSources = new HashSet<>(); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); if (getUser().asSubject().isPermitted(new SystemAdministration())) { for (ProjectFacade project: cacheManager.getProjects().values()) { @@ -213,7 +213,7 @@ public class UserAuthorizationsPage extends UserPage { public void query(String term, int page, Response response) { List notAuthorizedProjects = new ArrayList<>(); - for (ProjectFacade project: TurboDev.getInstance(CacheManager.class).getProjects().values()) { + for (ProjectFacade project: OneDev.getInstance(CacheManager.class).getProjects().values()) { if (!getProjectAuthorizations().containsKey(project.getId())) notAuthorizedProjects.add(project); } @@ -241,17 +241,17 @@ public class UserAuthorizationsPage extends UserPage { super.onInitialize(); getSettings().setPlaceholder("Add project..."); - getSettings().setFormatResult("turbodev.server.projectChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.projectChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.projectChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.projectChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.projectChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.projectChoiceFormatter.escapeMarkup"); } @Override protected void onSelect(AjaxRequestTarget target, ProjectFacade selection) { UserAuthorization authorization = new UserAuthorization(); authorization.setUser(getUser()); - authorization.setProject(TurboDev.getInstance(ProjectManager.class).load(selection.getId())); - TurboDev.getInstance(UserAuthorizationManager.class).save(authorization); + authorization.setProject(OneDev.getInstance(ProjectManager.class).load(selection.getId())); + OneDev.getInstance(UserAuthorizationManager.class).save(authorization); target.add(authorizationsTable); Session.get().success("Project added"); } @@ -271,7 +271,7 @@ public class UserAuthorizationsPage extends UserPage { public void onClick(AjaxRequestTarget target) { Collection authorizationsToDelete = new HashSet<>(); Map explicitProjectAuthorizations = getExplicitProjectAuthorizations(); - UserAuthorizationManager userAuthorizationManager = TurboDev.getInstance(UserAuthorizationManager.class); + UserAuthorizationManager userAuthorizationManager = OneDev.getInstance(UserAuthorizationManager.class); for (IModel model: selectionColumn.getSelections()) { UserAuthorizationFacade authorization = explicitProjectAuthorizations.get(model.getObject()); if (authorization != null) { @@ -321,7 +321,7 @@ public class UserAuthorizationsPage extends UserPage { public void populateItem(Item> cellItem, String componentId, IModel rowModel) { Fragment fragment = new Fragment(componentId, "projectFrag", UserAuthorizationsPage.this); - Project project = TurboDev.getInstance(ProjectManager.class).load(rowModel.getObject()); + Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject()); String projectName = project.getName(); fragment.add(new BookmarkablePageLink("project", ProjectBlobPage.class, ProjectBlobPage.paramsOf(project)) { @@ -372,13 +372,13 @@ public class UserAuthorizationsPage extends UserPage { UserAuthorizationFacade userAuthorizationFacade = explicitProjectAuthorizations.get(projectId); UserAuthorizationManager userAuthorizationManager = - TurboDev.getInstance(UserAuthorizationManager.class); + OneDev.getInstance(UserAuthorizationManager.class); UserAuthorization userAuthorization; if (userAuthorizationFacade == null) { userAuthorization = new UserAuthorization(); userAuthorization.setUser(getUser()); userAuthorization.setProject( - TurboDev.getInstance(ProjectManager.class).load(projectId)); + OneDev.getInstance(ProjectManager.class).load(projectId)); } else { userAuthorization = userAuthorizationManager.load(userAuthorizationFacade.getId()); } @@ -418,7 +418,7 @@ public class UserAuthorizationsPage extends UserPage { @Override protected Component newContent(String id, FloatingPanel dropdown) { - Project project = TurboDev.getInstance(ProjectManager.class).load(rowModel.getObject()); + Project project = OneDev.getInstance(ProjectManager.class).load(rowModel.getObject()); return new PrivilegeSourcePanel(id, getUser(), project, getProjectAuthorizations().get(project.getId())); } @@ -434,7 +434,7 @@ public class UserAuthorizationsPage extends UserPage { private List getProjectIds() { List projectIds = new ArrayList<>(getProjectAuthorizations().keySet()); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); return MatchScoreUtils.filterAndSort(projectIds, new MatchScoreProvider() { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserListPage.html b/web/src/main/java/io/onedev/server/web/page/user/UserListPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/UserListPage.html rename to web/src/main/java/io/onedev/server/web/page/user/UserListPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserListPage.java b/web/src/main/java/io/onedev/server/web/page/user/UserListPage.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/page/user/UserListPage.java rename to web/src/main/java/io/onedev/server/web/page/user/UserListPage.java index f82f8dbc39..270b2379d1 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserListPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserListPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.ArrayList; import java.util.Iterator; @@ -27,21 +27,21 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.avatar.AvatarLink; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.link.UserLink; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.util.ConfirmOnClick; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.avatar.AvatarLink; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.link.UserLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.util.ConfirmOnClick; +import io.onedev.server.web.util.PagingHistorySupport; @SuppressWarnings("serial") public class UserListPage extends LayoutPage { @@ -145,7 +145,7 @@ public class UserListPage extends LayoutPage { @Override public void onClick() { - TurboDev.getInstance(UserManager.class).delete(rowModel.getObject()); + OneDev.getInstance(UserManager.class).delete(rowModel.getObject()); } @Override @@ -167,12 +167,12 @@ public class UserListPage extends LayoutPage { public Iterator iterator(long first, long count) { EntityCriteria criteria = getCriteria(); criteria.addOrder(Order.asc("name")); - return TurboDev.getInstance(UserManager.class).findRange(criteria, (int)first, (int)count).iterator(); + return OneDev.getInstance(UserManager.class).findRange(criteria, (int)first, (int)count).iterator(); } @Override public long size() { - return TurboDev.getInstance(UserManager.class).count(getCriteria()); + return OneDev.getInstance(UserManager.class).count(getCriteria()); } @Override @@ -182,7 +182,7 @@ public class UserListPage extends LayoutPage { @Override protected User load() { - return TurboDev.getInstance(UserManager.class).load(id); + return OneDev.getInstance(UserManager.class).load(id); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserMembershipsPage.html b/web/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/UserMembershipsPage.html rename to web/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserMembershipsPage.java b/web/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.java similarity index 77% rename from web/src/main/java/com/turbodev/server/web/page/user/UserMembershipsPage.java rename to web/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.java index a5c4af8869..d303767e73 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserMembershipsPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserMembershipsPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.ArrayList; import java.util.Collection; @@ -32,28 +32,28 @@ import org.hibernate.criterion.MatchMode; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; -import com.turbodev.utils.matchscore.MatchScoreProvider; -import com.turbodev.utils.matchscore.MatchScoreUtils; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.CacheManager; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.manager.MembershipManager; -import com.turbodev.server.model.Membership; -import com.turbodev.server.persistence.dao.EntityCriteria; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.GroupFacade; -import com.turbodev.server.util.facade.MembershipFacade; -import com.turbodev.server.web.WebConstants; -import com.turbodev.server.web.behavior.OnTypingDoneBehavior; -import com.turbodev.server.web.component.datatable.HistoryAwareDataTable; -import com.turbodev.server.web.component.datatable.SelectionColumn; -import com.turbodev.server.web.component.groupchoice.AbstractGroupChoiceProvider; -import com.turbodev.server.web.component.groupchoice.GroupChoiceResourceReference; -import com.turbodev.server.web.component.select2.Response; -import com.turbodev.server.web.component.select2.ResponseFiller; -import com.turbodev.server.web.component.select2.SelectToAddChoice; -import com.turbodev.server.web.page.group.GroupProfilePage; -import com.turbodev.server.web.util.PagingHistorySupport; +import io.onedev.server.OneDev; +import io.onedev.server.manager.CacheManager; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.manager.MembershipManager; +import io.onedev.server.model.Membership; +import io.onedev.server.persistence.dao.EntityCriteria; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.GroupFacade; +import io.onedev.server.util.facade.MembershipFacade; +import io.onedev.server.web.WebConstants; +import io.onedev.server.web.behavior.OnTypingDoneBehavior; +import io.onedev.server.web.component.datatable.HistoryAwareDataTable; +import io.onedev.server.web.component.datatable.SelectionColumn; +import io.onedev.server.web.component.groupchoice.AbstractGroupChoiceProvider; +import io.onedev.server.web.component.groupchoice.GroupChoiceResourceReference; +import io.onedev.server.web.component.select2.Response; +import io.onedev.server.web.component.select2.ResponseFiller; +import io.onedev.server.web.component.select2.SelectToAddChoice; +import io.onedev.server.web.page.group.GroupProfilePage; +import io.onedev.server.web.util.PagingHistorySupport; +import io.onedev.utils.matchscore.MatchScoreProvider; +import io.onedev.utils.matchscore.MatchScoreUtils; @SuppressWarnings("serial") public class UserMembershipsPage extends UserPage { @@ -100,7 +100,7 @@ public class UserMembershipsPage extends UserPage { @Override public void query(String term, int page, Response response) { List notMembersOf = new ArrayList<>(); - CacheManager cacheManager = TurboDev.getInstance(CacheManager.class); + CacheManager cacheManager = OneDev.getInstance(CacheManager.class); Set groupIds = new HashSet<>(); for (MembershipFacade membership: cacheManager.getMemberships().values()) { if (membership.getUserId().equals(getUser().getId())) @@ -132,17 +132,17 @@ public class UserMembershipsPage extends UserPage { super.onInitialize(); getSettings().setPlaceholder("Add group..."); - getSettings().setFormatResult("turbodev.server.groupChoiceFormatter.formatResult"); - getSettings().setFormatSelection("turbodev.server.groupChoiceFormatter.formatSelection"); - getSettings().setEscapeMarkup("turbodev.server.groupChoiceFormatter.escapeMarkup"); + getSettings().setFormatResult("onedev.server.groupChoiceFormatter.formatResult"); + getSettings().setFormatSelection("onedev.server.groupChoiceFormatter.formatSelection"); + getSettings().setEscapeMarkup("onedev.server.groupChoiceFormatter.escapeMarkup"); } @Override protected void onSelect(AjaxRequestTarget target, GroupFacade selection) { Membership membership = new Membership(); membership.setUser(getUser()); - membership.setGroup(TurboDev.getInstance(GroupManager.class).load(selection.getId())); - TurboDev.getInstance(MembershipManager.class).save(membership); + membership.setGroup(OneDev.getInstance(GroupManager.class).load(selection.getId())); + OneDev.getInstance(MembershipManager.class).save(membership); target.add(membershipsTable); Session.get().success("Group added"); } @@ -170,7 +170,7 @@ public class UserMembershipsPage extends UserPage { for (IModel model: selectionColumn.getSelections()) { membershipsToDelete.add(model.getObject()); } - TurboDev.getInstance(MembershipManager.class).delete(membershipsToDelete); + OneDev.getInstance(MembershipManager.class).delete(membershipsToDelete); target.add(membershipsTable); selectionColumn.getSelections().clear(); target.add(this); @@ -235,13 +235,13 @@ public class UserMembershipsPage extends UserPage { public Iterator iterator(long first, long count) { EntityCriteria criteria = getCriteria(); criteria.addOrder(Order.desc("id")); - return TurboDev.getInstance(MembershipManager.class).findRange(criteria, (int)first, + return OneDev.getInstance(MembershipManager.class).findRange(criteria, (int)first, (int)count).iterator(); } @Override public long size() { - return TurboDev.getInstance(MembershipManager.class).count(getCriteria()); + return OneDev.getInstance(MembershipManager.class).count(getCriteria()); } @Override @@ -251,7 +251,7 @@ public class UserMembershipsPage extends UserPage { @Override protected Membership load() { - return TurboDev.getInstance(MembershipManager.class).load(id); + return OneDev.getInstance(MembershipManager.class).load(id); } }; diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.html b/web/src/main/java/io/onedev/server/web/page/user/UserPage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/UserPage.html rename to web/src/main/java/io/onedev/server/web/page/user/UserPage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java b/web/src/main/java/io/onedev/server/web/page/user/UserPage.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/page/user/UserPage.java rename to web/src/main/java/io/onedev/server/web/page/user/UserPage.java index d855563979..ac439955f3 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserPage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserPage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.util.ArrayList; import java.util.List; @@ -14,19 +14,19 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.request.mapper.parameter.PageParameters; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.ComponentRenderer; -import com.turbodev.server.web.component.avatar.Avatar; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; -import com.turbodev.server.web.component.sidebar.SidebarPanel; -import com.turbodev.server.web.component.tabbable.PageTab; -import com.turbodev.server.web.component.tabbable.Tab; -import com.turbodev.server.web.page.layout.LayoutPage; -import com.turbodev.server.web.util.model.EntityModel; -import com.turbodev.utils.StringUtils; +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.ComponentRenderer; +import io.onedev.server.web.component.avatar.Avatar; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.sidebar.SidebarPanel; +import io.onedev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.Tab; +import io.onedev.server.web.page.layout.LayoutPage; +import io.onedev.server.web.util.model.EntityModel; +import io.onedev.utils.StringUtils; @SuppressWarnings("serial") public abstract class UserPage extends LayoutPage { @@ -38,7 +38,7 @@ public abstract class UserPage extends LayoutPage { public UserPage(PageParameters params) { super(params); - User user = TurboDev.getInstance(UserManager.class).load(params.get(PARAM_USER).toLong()); + User user = OneDev.getInstance(UserManager.class).load(params.get(PARAM_USER).toLong()); userModel = new EntityModel(user); } diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserProfilePage.html b/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/UserProfilePage.html rename to web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserProfilePage.java b/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/page/user/UserProfilePage.java rename to web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java index 46d330f1f4..db6c16b8ac 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserProfilePage.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserProfilePage.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import java.io.Serializable; @@ -10,15 +10,16 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import com.google.common.collect.Sets; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.UserManager; -import com.turbodev.server.model.User; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.editable.BeanContext; -import com.turbodev.server.web.editable.BeanDescriptor; -import com.turbodev.server.web.editable.BeanEditor; -import com.turbodev.server.web.editable.PathSegment; -import com.turbodev.server.web.util.ConfirmOnClick; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.UserManager; +import io.onedev.server.model.User; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.editable.BeanContext; +import io.onedev.server.web.editable.BeanDescriptor; +import io.onedev.server.web.editable.BeanEditor; +import io.onedev.server.web.editable.PathSegment; +import io.onedev.server.web.util.ConfirmOnClick; @SuppressWarnings("serial") public class UserProfilePage extends UserPage { @@ -64,7 +65,7 @@ public class UserProfilePage extends UserPage { super.onSubmit(); User user = getUser(); - UserManager userManager = TurboDev.getInstance(UserManager.class); + UserManager userManager = OneDev.getInstance(UserManager.class); User userWithSameName = userManager.findByName(user.getName()); if (userWithSameName != null && !userWithSameName.equals(user)) { editor.getErrorContext(new PathSegment.Property("name")) @@ -96,7 +97,7 @@ public class UserProfilePage extends UserPage { @Override public void onClick() { - TurboDev.getInstance(UserManager.class).delete(getUser()); + OneDev.getInstance(UserManager.class).delete(getUser()); setResponsePage(UserListPage.class); } diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserResourceReference.java b/web/src/main/java/io/onedev/server/web/page/user/UserResourceReference.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/page/user/UserResourceReference.java rename to web/src/main/java/io/onedev/server/web/page/user/UserResourceReference.java index 2ff0945273..b5593b8626 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserResourceReference.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; -import com.turbodev.server.web.page.base.BaseDependentCssResourceReference; +import io.onedev.server.web.page.base.BaseDependentCssResourceReference; public class UserResourceReference extends BaseDependentCssResourceReference { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserTab.java b/web/src/main/java/io/onedev/server/web/page/user/UserTab.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/page/user/UserTab.java rename to web/src/main/java/io/onedev/server/web/page/user/UserTab.java index 224b273f67..b5a5b4cd25 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserTab.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserTab.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import org.apache.wicket.Component; import org.apache.wicket.model.Model; -import com.turbodev.server.web.component.tabbable.PageTab; +import io.onedev.server.web.component.tabbable.PageTab; @SuppressWarnings("serial") public class UserTab extends PageTab { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.html b/web/src/main/java/io/onedev/server/web/page/user/UserTabLink.html similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.html rename to web/src/main/java/io/onedev/server/web/page/user/UserTabLink.html diff --git a/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.java b/web/src/main/java/io/onedev/server/web/page/user/UserTabLink.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.java rename to web/src/main/java/io/onedev/server/web/page/user/UserTabLink.java index 4ea969d797..4819c9d7f1 100644 --- a/web/src/main/java/com/turbodev/server/web/page/user/UserTabLink.java +++ b/web/src/main/java/io/onedev/server/web/page/user/UserTabLink.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.page.user; +package io.onedev.server.web.page.user; import org.apache.wicket.behavior.AttributeAppender; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -6,7 +6,7 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.markup.html.panel.Panel; -import com.turbodev.server.web.component.link.ViewStateAwarePageLink; +import io.onedev.server.web.component.link.ViewStateAwarePageLink; @SuppressWarnings("serial") public class UserTabLink extends Panel { diff --git a/web/src/main/java/com/turbodev/server/web/page/user/user.css b/web/src/main/java/io/onedev/server/web/page/user/user.css similarity index 100% rename from web/src/main/java/com/turbodev/server/web/page/user/user.css rename to web/src/main/java/io/onedev/server/web/page/user/user.css diff --git a/web/src/main/java/com/turbodev/server/web/util/AbsoluteUrlRenderer.java b/web/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/util/AbsoluteUrlRenderer.java rename to web/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java index 00f4188610..de0b035ef4 100644 --- a/web/src/main/java/com/turbodev/server/web/util/AbsoluteUrlRenderer.java +++ b/web/src/main/java/io/onedev/server/web/util/AbsoluteUrlRenderer.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import org.apache.wicket.request.Request; import org.apache.wicket.request.Url; @@ -7,7 +7,8 @@ import org.apache.wicket.request.Url.StringMode; import org.apache.wicket.util.string.Strings; import com.google.common.collect.Lists; -import com.turbodev.server.web.util.mapper.PathAwareUrl; + +import io.onedev.server.web.util.mapper.PathAwareUrl; public class AbsoluteUrlRenderer extends UrlRenderer { diff --git a/web/src/main/java/com/turbodev/server/web/util/AjaxPayload.java b/web/src/main/java/io/onedev/server/web/util/AjaxPayload.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/util/AjaxPayload.java rename to web/src/main/java/io/onedev/server/web/util/AjaxPayload.java index 4c4e491f5d..92fd6a4ded 100644 --- a/web/src/main/java/com/turbodev/server/web/util/AjaxPayload.java +++ b/web/src/main/java/io/onedev/server/web/util/AjaxPayload.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; diff --git a/web/src/main/java/com/turbodev/server/web/util/ConfirmOnClick.java b/web/src/main/java/io/onedev/server/web/util/ConfirmOnClick.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/util/ConfirmOnClick.java rename to web/src/main/java/io/onedev/server/web/util/ConfirmOnClick.java index c076d52e2b..558c06d2bf 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ConfirmOnClick.java +++ b/web/src/main/java/io/onedev/server/web/util/ConfirmOnClick.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.wicket.AttributeModifier; diff --git a/web/src/main/java/com/turbodev/server/web/util/DateUtils.java b/web/src/main/java/io/onedev/server/web/util/DateUtils.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/util/DateUtils.java rename to web/src/main/java/io/onedev/server/web/util/DateUtils.java index 63956f0e31..7b4d8ca676 100644 --- a/web/src/main/java/com/turbodev/server/web/util/DateUtils.java +++ b/web/src/main/java/io/onedev/server/web/util/DateUtils.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import java.util.Date; import org.joda.time.DateTime; import org.ocpsoft.prettytime.PrettyTime; -import com.turbodev.server.web.WebConstants; +import io.onedev.server.web.WebConstants; public class DateUtils extends org.apache.commons.lang3.time.DateUtils { diff --git a/web/src/main/java/com/turbodev/server/web/util/MissingReferencesMarker.java b/web/src/main/java/io/onedev/server/web/util/MissingReferencesMarker.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/util/MissingReferencesMarker.java rename to web/src/main/java/io/onedev/server/web/util/MissingReferencesMarker.java index e01807d0d7..2e8bbdd948 100644 --- a/web/src/main/java/com/turbodev/server/web/util/MissingReferencesMarker.java +++ b/web/src/main/java/io/onedev/server/web/util/MissingReferencesMarker.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import java.io.IOException; @@ -12,11 +12,11 @@ import org.jsoup.nodes.Element; import org.jsoup.nodes.Node; import org.jsoup.select.NodeVisitor; -import com.turbodev.utils.PathUtils; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.utils.PathUtils; /** * This visitor marks missing blob references in the document diff --git a/web/src/main/java/com/turbodev/server/web/util/PagingHistorySupport.java b/web/src/main/java/io/onedev/server/web/util/PagingHistorySupport.java similarity index 86% rename from web/src/main/java/com/turbodev/server/web/util/PagingHistorySupport.java rename to web/src/main/java/io/onedev/server/web/util/PagingHistorySupport.java index e80a22c751..250bdf0887 100644 --- a/web/src/main/java/com/turbodev/server/web/util/PagingHistorySupport.java +++ b/web/src/main/java/io/onedev/server/web/util/PagingHistorySupport.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/util/SuggestionUtils.java b/web/src/main/java/io/onedev/server/web/util/SuggestionUtils.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/util/SuggestionUtils.java rename to web/src/main/java/io/onedev/server/web/util/SuggestionUtils.java index 5327212f00..a91afb0a7d 100644 --- a/web/src/main/java/com/turbodev/server/web/util/SuggestionUtils.java +++ b/web/src/main/java/io/onedev/server/web/util/SuggestionUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import java.util.ArrayList; import java.util.HashMap; @@ -8,23 +8,24 @@ import java.util.List; import java.util.Map; import java.util.Set; -import com.turbodev.codeassist.InputSuggestion; -import com.turbodev.utils.Range; -import com.turbodev.utils.stringmatch.PatternApplied; -import com.turbodev.utils.stringmatch.WildcardUtils; +import io.onedev.codeassist.InputSuggestion; +import io.onedev.server.OneDev; +import io.onedev.server.git.GitUtils; +import io.onedev.server.git.RefInfo; +import io.onedev.server.manager.CommitInfoManager; +import io.onedev.server.manager.GroupManager; +import io.onedev.server.manager.VerificationManager; +import io.onedev.server.model.Group; +import io.onedev.server.model.Project; +import io.onedev.server.security.ProjectPrivilege; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.server.web.behavior.inputassist.InputAssistBehavior; +import io.onedev.utils.Range; +import io.onedev.utils.stringmatch.PatternApplied; +import io.onedev.utils.stringmatch.WildcardUtils; + import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.git.RefInfo; -import com.turbodev.server.manager.CommitInfoManager; -import com.turbodev.server.manager.GroupManager; -import com.turbodev.server.manager.VerificationManager; -import com.turbodev.server.model.Group; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.ProjectPrivilege; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.UserFacade; -import com.turbodev.server.web.behavior.inputassist.InputAssistBehavior; public class SuggestionUtils { @@ -76,7 +77,7 @@ public class SuggestionUtils { public static List suggestGroup(String matchWith) { String lowerCaseMatchWith = matchWith.toLowerCase(); List suggestions = new ArrayList<>(); - for (Group group: TurboDev.getInstance(GroupManager.class).findAll()) { + for (Group group: OneDev.getInstance(GroupManager.class).findAll()) { String name = group.getName(); int index = name.toLowerCase().indexOf(lowerCaseMatchWith); if (index != -1) { @@ -91,7 +92,7 @@ public class SuggestionUtils { String lowerCaseMatchWith = matchWith.toLowerCase(); int numSuggestions = 0; List suggestions = new ArrayList<>(); - for (String verificationName: TurboDev.getInstance(VerificationManager.class).getVerificationNames(project)) { + for (String verificationName: OneDev.getInstance(VerificationManager.class).getVerificationNames(project)) { int index = verificationName.toLowerCase().indexOf(lowerCaseMatchWith); if (index != -1 && numSuggestions++ suggestPath(Project project, String matchWith) { - CommitInfoManager commitInfoManager = TurboDev.getInstance(CommitInfoManager.class); + CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class); return suggestPath(commitInfoManager.getFiles(project), matchWith); } diff --git a/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java b/web/src/main/java/io/onedev/server/web/util/WicketUtils.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/util/WicketUtils.java rename to web/src/main/java/io/onedev/server/web/util/WicketUtils.java index 1ea4da52fc..ddb377c60a 100644 --- a/web/src/main/java/com/turbodev/server/web/util/WicketUtils.java +++ b/web/src/main/java/io/onedev/server/web/util/WicketUtils.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util; +package io.onedev.server.web.util; import javax.annotation.Nullable; import javax.servlet.http.HttpServletRequest; @@ -13,7 +13,7 @@ import org.apache.wicket.protocol.ws.api.registry.PageIdKey; import org.apache.wicket.request.Url; import org.apache.wicket.request.cycle.RequestCycle; -import com.turbodev.server.web.websocket.PageKey; +import io.onedev.server.web.websocket.PageKey; public class WicketUtils { diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java index 3ae8292d59..fc12520bba 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/AjaxLoadingOverlay.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import java.io.Serializable; diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java index 6f2506b4ea..7904344b12 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/CompositeAjaxCallListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import org.apache.wicket.Component; import org.apache.wicket.ajax.attributes.IAjaxCallListener; diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/ConfirmLeaveListener.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmLeaveListener.java similarity index 84% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/ConfirmLeaveListener.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmLeaveListener.java index c4ef686f1a..e32ec3b10b 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/ConfirmLeaveListener.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmLeaveListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import org.apache.wicket.Component; import org.apache.wicket.ajax.attributes.IAjaxCallListener; @@ -22,9 +22,9 @@ public class ConfirmLeaveListener implements IAjaxCallListener { @Override public CharSequence getPrecondition(Component component) { if (dirtyContainer != null) - return String.format("return turbodev.server.form.confirmLeave('%s');", dirtyContainer.getMarkupId(true)); + return String.format("return onedev.server.form.confirmLeave('%s');", dirtyContainer.getMarkupId(true)); else - return "return turbodev.server.form.confirmLeave();"; + return "return onedev.server.form.confirmLeave();"; } @Override diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/ConfirmListener.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmListener.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/ConfirmListener.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmListener.java index 38339b8e62..982f209ccd 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/ConfirmListener.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/ConfirmListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import org.apache.commons.lang3.StringEscapeUtils; import org.apache.wicket.Component; diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/IndicateLoadingListener.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/IndicateLoadingListener.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/IndicateLoadingListener.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/IndicateLoadingListener.java index b43c3b3887..24469c7ace 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/IndicateLoadingListener.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/IndicateLoadingListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import org.apache.wicket.Component; import org.apache.wicket.ajax.attributes.IAjaxCallListener; diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/IndicateWorkingListener.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/IndicateWorkingListener.java similarity index 95% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/IndicateWorkingListener.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/IndicateWorkingListener.java index dbd86c887b..eb6699aaf7 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/IndicateWorkingListener.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/IndicateWorkingListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import org.apache.wicket.Component; import org.apache.wicket.ajax.attributes.IAjaxCallListener; @@ -6,7 +6,7 @@ import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; -import com.turbodev.server.web.behavior.AbstractPostAjaxBehavior; +import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; /** * Show global ajax loading indicator right away instead of using a timer. diff --git a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/TrackViewStateListener.java b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/TrackViewStateListener.java similarity index 72% rename from web/src/main/java/com/turbodev/server/web/util/ajaxlistener/TrackViewStateListener.java rename to web/src/main/java/io/onedev/server/web/util/ajaxlistener/TrackViewStateListener.java index ec6d004228..0890fb2cf2 100644 --- a/web/src/main/java/com/turbodev/server/web/util/ajaxlistener/TrackViewStateListener.java +++ b/web/src/main/java/io/onedev/server/web/util/ajaxlistener/TrackViewStateListener.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.ajaxlistener; +package io.onedev.server.web.util.ajaxlistener; import org.apache.wicket.Component; import org.apache.wicket.ajax.attributes.IAjaxCallListener; @@ -18,11 +18,11 @@ public class TrackViewStateListener implements IAjaxCallListener { @Override public CharSequence getBeforeHandler(Component component) { - String script = "turbodev.server.viewState.getFromViewAndSetToHistory();"; + String script = "onedev.server.viewState.getFromViewAndSetToHistory();"; if (carryOver) { - script += "turbodev.server.viewState.carryOver = turbodev.server.viewState.getFromHistory();"; + script += "onedev.server.viewState.carryOver = onedev.server.viewState.getFromHistory();"; } else { - script += "turbodev.server.viewState.carryOver = undefined;"; + script += "onedev.server.viewState.carryOver = undefined;"; } return script; } @@ -55,8 +55,8 @@ public class TrackViewStateListener implements IAjaxCallListener { @Override public CharSequence getCompleteHandler(Component component) { return "" - + "if (turbodev.server.viewState.carryOver)" - + " turbodev.server.viewState.setToView(turbodev.server.viewState.carryOver);"; + + "if (onedev.server.viewState.carryOver)" + + " onedev.server.viewState.setToView(onedev.server.viewState.carryOver);"; } @Override diff --git a/web/src/main/java/com/turbodev/server/web/util/avatar/AvatarGenerator.java b/web/src/main/java/io/onedev/server/web/util/avatar/AvatarGenerator.java similarity index 99% rename from web/src/main/java/com/turbodev/server/web/util/avatar/AvatarGenerator.java rename to web/src/main/java/io/onedev/server/web/util/avatar/AvatarGenerator.java index 6717b97831..a39bb6670a 100644 --- a/web/src/main/java/com/turbodev/server/web/util/avatar/AvatarGenerator.java +++ b/web/src/main/java/io/onedev/server/web/util/avatar/AvatarGenerator.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.avatar; +package io.onedev.server.web.util.avatar; import java.awt.Color; import java.awt.Font; diff --git a/web/src/main/java/com/turbodev/server/web/util/avatar/AvatarManager.java b/web/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/util/avatar/AvatarManager.java rename to web/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java index d21c3fc9b5..3f0551fa65 100644 --- a/web/src/main/java/com/turbodev/server/web/util/avatar/AvatarManager.java +++ b/web/src/main/java/io/onedev/server/web/util/avatar/AvatarManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.avatar; +package io.onedev.server.web.util.avatar; import java.io.File; @@ -7,8 +7,8 @@ import javax.annotation.Nullable; import org.apache.wicket.markup.html.form.upload.FileUpload; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.server.model.User; -import com.turbodev.server.util.facade.UserFacade; +import io.onedev.server.model.User; +import io.onedev.server.util.facade.UserFacade; public interface AvatarManager { diff --git a/web/src/main/java/com/turbodev/server/web/util/avatar/DefaultAvatarManager.java b/web/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java similarity index 87% rename from web/src/main/java/com/turbodev/server/web/util/avatar/DefaultAvatarManager.java rename to web/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java index 6962467693..8d2d282818 100644 --- a/web/src/main/java/com/turbodev/server/web/util/avatar/DefaultAvatarManager.java +++ b/web/src/main/java/io/onedev/server/web/util/avatar/DefaultAvatarManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.avatar; +package io.onedev.server.web.util.avatar; import java.awt.image.BufferedImage; import java.io.File; @@ -15,18 +15,19 @@ import org.apache.commons.codec.binary.Hex; import org.apache.wicket.markup.html.form.upload.FileUpload; import org.eclipse.jgit.lib.PersonIdent; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.utils.FileUtils; -import com.turbodev.utils.LockUtils; -import com.turbodev.utils.StringUtils; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.OneDev; +import io.onedev.server.manager.ConfigManager; +import io.onedev.server.model.User; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.util.facade.UserFacade; +import io.onedev.utils.FileUtils; +import io.onedev.utils.LockUtils; +import io.onedev.utils.StringUtils; + import com.google.common.base.Splitter; import com.google.common.base.Throwables; import com.google.common.collect.Iterables; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ConfigManager; -import com.turbodev.server.model.User; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.util.facade.UserFacade; @Singleton public class DefaultAvatarManager implements AvatarManager { @@ -46,7 +47,7 @@ public class DefaultAvatarManager implements AvatarManager { @Override public String getAvatarUrl(@Nullable UserFacade user) { if (user == null) { - return AVATARS_BASE_URL + "turbodev.png"; + return AVATARS_BASE_URL + "onedev.png"; } else if (user.getId() == null) { return AVATARS_BASE_URL + "default.png"; } else { @@ -91,8 +92,8 @@ public class DefaultAvatarManager implements AvatarManager { @Override public String getAvatarUrl(PersonIdent person) { - if (person.getEmailAddress().length() == 0 && person.getName().equals(TurboDev.NAME)) - return AVATARS_BASE_URL + "turbodev.png"; + if (person.getEmailAddress().length() == 0 && person.getName().equals(OneDev.NAME)) + return AVATARS_BASE_URL + "onedev.png"; else if (configManager.getSystemSetting().isGravatarEnabled()) return Gravatar.getURL(person.getEmailAddress(), GRAVATAR_SIZE); else diff --git a/web/src/main/java/com/turbodev/server/web/util/avatar/Gravatar.java b/web/src/main/java/io/onedev/server/web/util/avatar/Gravatar.java similarity index 99% rename from web/src/main/java/com/turbodev/server/web/util/avatar/Gravatar.java rename to web/src/main/java/io/onedev/server/web/util/avatar/Gravatar.java index c0b9383d47..c55129e30c 100644 --- a/web/src/main/java/com/turbodev/server/web/util/avatar/Gravatar.java +++ b/web/src/main/java/io/onedev/server/web/util/avatar/Gravatar.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.avatar; +package io.onedev.server.web.util.avatar; import java.io.UnsupportedEncodingException; import java.math.BigInteger; diff --git a/web/src/main/java/io/onedev/server/web/util/commitmessagetransform/CommitMessageTransformer.java b/web/src/main/java/io/onedev/server/web/util/commitmessagetransform/CommitMessageTransformer.java new file mode 100644 index 0000000000..838248f076 --- /dev/null +++ b/web/src/main/java/io/onedev/server/web/util/commitmessagetransform/CommitMessageTransformer.java @@ -0,0 +1,11 @@ +package io.onedev.server.web.util.commitmessagetransform; + +import io.onedev.launcher.loader.ExtensionPoint; +import io.onedev.server.model.Project; + +@ExtensionPoint +public interface CommitMessageTransformer { + + String transform(Project project, String commitMessage); + +} diff --git a/web/src/main/java/com/turbodev/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java b/web/src/main/java/io/onedev/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java similarity index 71% rename from web/src/main/java/com/turbodev/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java rename to web/src/main/java/io/onedev/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java index 0be38f51f1..32763ca502 100644 --- a/web/src/main/java/com/turbodev/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java +++ b/web/src/main/java/io/onedev/server/web/util/commitmessagetransform/PatternCommitMessageTransformer.java @@ -1,9 +1,9 @@ -package com.turbodev.server.web.util.commitmessagetransform; +package io.onedev.server.web.util.commitmessagetransform; import javax.inject.Singleton; -import com.turbodev.server.model.Project; -import com.turbodev.server.model.support.CommitMessageTransformSetting; +import io.onedev.server.model.Project; +import io.onedev.server.model.support.CommitMessageTransformSetting; @Singleton public class PatternCommitMessageTransformer implements CommitMessageTransformer { diff --git a/web/src/main/java/com/turbodev/server/web/util/mapper/TurboDevPageMapper.java b/web/src/main/java/io/onedev/server/web/util/mapper/OneDevPageMapper.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/util/mapper/TurboDevPageMapper.java rename to web/src/main/java/io/onedev/server/web/util/mapper/OneDevPageMapper.java index e6f26c4878..7609eccbf9 100644 --- a/web/src/main/java/com/turbodev/server/web/util/mapper/TurboDevPageMapper.java +++ b/web/src/main/java/io/onedev/server/web/util/mapper/OneDevPageMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.mapper; +package io.onedev.server.web.util.mapper; import org.apache.wicket.core.request.mapper.MountedMapper; import org.apache.wicket.request.Url; @@ -7,9 +7,9 @@ import org.apache.wicket.request.mapper.info.PageComponentInfo; import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder; import org.apache.wicket.request.mapper.parameter.PageParameters; -public class TurboDevPageMapper extends MountedMapper { +public class OneDevPageMapper extends MountedMapper { - public TurboDevPageMapper(String mountPath, Class pageClass) { + public OneDevPageMapper(String mountPath, Class pageClass) { super(mountPath, pageClass); } diff --git a/web/src/main/java/com/turbodev/server/web/util/mapper/TurboDevResourceMapper.java b/web/src/main/java/io/onedev/server/web/util/mapper/OneDevResourceMapper.java similarity index 74% rename from web/src/main/java/com/turbodev/server/web/util/mapper/TurboDevResourceMapper.java rename to web/src/main/java/io/onedev/server/web/util/mapper/OneDevResourceMapper.java index e8138f2e96..b0d5bffbf3 100644 --- a/web/src/main/java/com/turbodev/server/web/util/mapper/TurboDevResourceMapper.java +++ b/web/src/main/java/io/onedev/server/web/util/mapper/OneDevResourceMapper.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.mapper; +package io.onedev.server.web.util.mapper; import org.apache.wicket.core.request.mapper.ResourceMapper; import org.apache.wicket.request.Url; @@ -6,9 +6,9 @@ import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.ResourceReference; -public class TurboDevResourceMapper extends ResourceMapper { +public class OneDevResourceMapper extends ResourceMapper { - public TurboDevResourceMapper(String path, ResourceReference resourceReference) { + public OneDevResourceMapper(String path, ResourceReference resourceReference) { super(path, resourceReference); } diff --git a/web/src/main/java/com/turbodev/server/web/util/mapper/PathAwareUrl.java b/web/src/main/java/io/onedev/server/web/util/mapper/PathAwareUrl.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/util/mapper/PathAwareUrl.java rename to web/src/main/java/io/onedev/server/web/util/mapper/PathAwareUrl.java index 5789b224fe..dea0b87794 100644 --- a/web/src/main/java/com/turbodev/server/web/util/mapper/PathAwareUrl.java +++ b/web/src/main/java/io/onedev/server/web/util/mapper/PathAwareUrl.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.mapper; +package io.onedev.server.web.util.mapper; import java.nio.charset.Charset; diff --git a/web/src/main/java/com/turbodev/server/web/util/markdown/MentionProcessor.java b/web/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java similarity index 69% rename from web/src/main/java/com/turbodev/server/web/util/markdown/MentionProcessor.java rename to web/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java index a29c5c0167..c62985b2c1 100644 --- a/web/src/main/java/com/turbodev/server/web/util/markdown/MentionProcessor.java +++ b/web/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.util.markdown; +package io.onedev.server.web.util.markdown; import org.apache.wicket.request.cycle.RequestCycle; import org.jsoup.nodes.Document; -import com.turbodev.server.model.User; -import com.turbodev.server.util.markdown.MarkdownProcessor; -import com.turbodev.server.util.markdown.MentionParser; -import com.turbodev.server.web.page.user.UserProfilePage; +import io.onedev.server.model.User; +import io.onedev.server.util.markdown.MarkdownProcessor; +import io.onedev.server.util.markdown.MentionParser; +import io.onedev.server.web.page.user.UserProfilePage; public class MentionProcessor extends MentionParser implements MarkdownProcessor { diff --git a/web/src/main/java/com/turbodev/server/web/util/markdown/PullRequestProcessor.java b/web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java similarity index 64% rename from web/src/main/java/com/turbodev/server/web/util/markdown/PullRequestProcessor.java rename to web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java index 10dd749baf..f1e21e7a63 100644 --- a/web/src/main/java/com/turbodev/server/web/util/markdown/PullRequestProcessor.java +++ b/web/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java @@ -1,12 +1,12 @@ -package com.turbodev.server.web.util.markdown; +package io.onedev.server.web.util.markdown; import org.apache.wicket.request.cycle.RequestCycle; import org.jsoup.nodes.Document; -import com.turbodev.server.model.PullRequest; -import com.turbodev.server.util.markdown.MarkdownProcessor; -import com.turbodev.server.util.markdown.PullRequestParser; -import com.turbodev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; +import io.onedev.server.model.PullRequest; +import io.onedev.server.util.markdown.MarkdownProcessor; +import io.onedev.server.util.markdown.PullRequestParser; +import io.onedev.server.web.page.project.pullrequest.requestdetail.overview.RequestOverviewPage; public class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor { diff --git a/web/src/main/java/com/turbodev/server/web/util/markdown/RelativeUrlProcessor.java b/web/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/util/markdown/RelativeUrlProcessor.java rename to web/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java index c5bb43932f..164a0f3b4e 100644 --- a/web/src/main/java/com/turbodev/server/web/util/markdown/RelativeUrlProcessor.java +++ b/web/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.markdown; +package io.onedev.server.web.util.markdown; import java.io.IOException; import java.net.URLDecoder; @@ -14,16 +14,17 @@ import org.jsoup.nodes.Node; import org.jsoup.select.NodeTraversor; import org.jsoup.select.NodeVisitor; -import com.turbodev.utils.PathUtils; import com.google.common.base.Charsets; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.markdown.MarkdownProcessor; -import com.turbodev.server.web.page.project.blob.ProjectBlobPage; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext; -import com.turbodev.server.web.page.project.blob.render.BlobRenderContext.Mode; + +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.markdown.MarkdownProcessor; +import io.onedev.server.web.page.project.blob.ProjectBlobPage; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext; +import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; +import io.onedev.utils.PathUtils; public class RelativeUrlProcessor implements MarkdownProcessor { diff --git a/web/src/main/java/com/turbodev/server/web/util/model/AffinalProjectsModel.java b/web/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java similarity index 67% rename from web/src/main/java/com/turbodev/server/web/util/model/AffinalProjectsModel.java rename to web/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java index 1de217d051..5b086629b3 100644 --- a/web/src/main/java/com/turbodev/server/web/util/model/AffinalProjectsModel.java +++ b/web/src/main/java/io/onedev/server/web/util/model/AffinalProjectsModel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.model; +package io.onedev.server.web.util.model; import java.util.Collection; import java.util.Iterator; @@ -6,10 +6,10 @@ import java.util.List; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.server.TurboDev; -import com.turbodev.server.model.Project; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.security.SecurityUtils; +import io.onedev.server.OneDev; +import io.onedev.server.model.Project; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.security.SecurityUtils; @SuppressWarnings("serial") public class AffinalProjectsModel extends LoadableDetachableModel> { @@ -22,7 +22,7 @@ public class AffinalProjectsModel extends LoadableDetachableModel load() { - Project project = TurboDev.getInstance(Dao.class).load(Project.class, projectId); + Project project = OneDev.getInstance(Dao.class).load(Project.class, projectId); List affinals = project.getForkRoot().getForkDescendants(); for (Iterator it = affinals.iterator(); it.hasNext();) { if (!SecurityUtils.canRead(it.next())) diff --git a/web/src/main/java/com/turbodev/server/web/util/model/CommitRefsModel.java b/web/src/main/java/io/onedev/server/web/util/model/CommitRefsModel.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/util/model/CommitRefsModel.java rename to web/src/main/java/io/onedev/server/web/util/model/CommitRefsModel.java index 9c7a33c346..24000566e3 100644 --- a/web/src/main/java/com/turbodev/server/web/util/model/CommitRefsModel.java +++ b/web/src/main/java/io/onedev/server/web/util/model/CommitRefsModel.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.model; +package io.onedev.server.web.util.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.turbodev.server.git.RefInfo; -import com.turbodev.server.model.Project; +import io.onedev.server.git.RefInfo; +import io.onedev.server.model.Project; public class CommitRefsModel extends LoadableDetachableModel>> { diff --git a/web/src/main/java/com/turbodev/server/web/util/model/EntityModel.java b/web/src/main/java/io/onedev/server/web/util/model/EntityModel.java similarity index 80% rename from web/src/main/java/com/turbodev/server/web/util/model/EntityModel.java rename to web/src/main/java/io/onedev/server/web/util/model/EntityModel.java index 7764252c6e..eb6e412a92 100644 --- a/web/src/main/java/com/turbodev/server/web/util/model/EntityModel.java +++ b/web/src/main/java/io/onedev/server/web/util/model/EntityModel.java @@ -1,13 +1,13 @@ -package com.turbodev.server.web.util.model; +package io.onedev.server.web.util.model; import javax.annotation.Nullable; import org.apache.wicket.model.LoadableDetachableModel; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.utils.ClassUtils; -import com.turbodev.server.model.AbstractEntity; -import com.turbodev.server.persistence.dao.Dao; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.model.AbstractEntity; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.utils.ClassUtils; public class EntityModel extends LoadableDetachableModel { diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/ArchiveResource.java b/web/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/util/resource/ArchiveResource.java rename to web/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java index 796ef993b2..18ae9964ad 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/ArchiveResource.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/ArchiveResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import java.io.IOException; import java.io.UnsupportedEncodingException; @@ -19,10 +19,11 @@ import org.eclipse.jgit.archive.ZipFormat; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; public class ArchiveResource extends AbstractResource { @@ -46,7 +47,7 @@ public class ArchiveResource extends AbstractResource { if (StringUtils.isBlank(projectName)) throw new IllegalArgumentException("project name has to be specified"); - Project project = TurboDev.getInstance(ProjectManager.class).find(projectName); + Project project = OneDev.getInstance(ProjectManager.class).find(projectName); if (project == null) throw new EntityNotFoundException("Unable to find project " + projectName); diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/ArchiveResourceReference.java b/web/src/main/java/io/onedev/server/web/util/resource/ArchiveResourceReference.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/util/resource/ArchiveResourceReference.java rename to web/src/main/java/io/onedev/server/web/util/resource/ArchiveResourceReference.java index 43883bba41..63faaeeeef 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/ArchiveResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/ArchiveResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.java b/web/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java similarity index 85% rename from web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.java rename to web/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java index 2fdc508725..286b2d0617 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResource.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/AttachmentResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import java.io.File; import java.io.FileInputStream; @@ -15,12 +15,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.AbstractResource; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.manager.AttachmentManager; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; -import com.turbodev.server.util.facade.ProjectFacade; + +import io.onedev.server.OneDev; +import io.onedev.server.manager.AttachmentManager; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; +import io.onedev.server.util.facade.ProjectFacade; public class AttachmentResource extends AbstractResource { @@ -40,7 +41,7 @@ public class AttachmentResource extends AbstractResource { if (StringUtils.isBlank(projectName)) throw new IllegalArgumentException("project name has to be specified"); - Project project = TurboDev.getInstance(ProjectManager.class).find(projectName); + Project project = OneDev.getInstance(ProjectManager.class).find(projectName); if (project == null) throw new EntityNotFoundException("Unable to find project " + projectName); @@ -85,7 +86,7 @@ public class AttachmentResource extends AbstractResource { } private static File getAttachmentDir(ProjectFacade project, String uuid) { - return TurboDev.getInstance(AttachmentManager.class).getAttachmentDir(project, uuid); + return OneDev.getInstance(AttachmentManager.class).getAttachmentDir(project, uuid); } public static PageParameters paramsOf(ProjectFacade project, String attachmentDirUUID, String attachmentName) { diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResourceReference.java b/web/src/main/java/io/onedev/server/web/util/resource/AttachmentResourceReference.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResourceReference.java rename to web/src/main/java/io/onedev/server/web/util/resource/AttachmentResourceReference.java index d5a9feabe3..55fb4f1e69 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/AttachmentResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/AttachmentResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/RawBlobResource.java b/web/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/util/resource/RawBlobResource.java rename to web/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java index a2c59deb8f..14d0806100 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/RawBlobResource.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/RawBlobResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import java.io.ByteArrayInputStream; import java.io.IOException; @@ -20,13 +20,14 @@ import org.apache.wicket.request.resource.AbstractResource; import com.google.common.base.Charsets; import com.google.common.base.Preconditions; -import com.turbodev.server.TurboDev; -import com.turbodev.server.git.Blob; -import com.turbodev.server.git.BlobIdent; -import com.turbodev.server.git.GitUtils; -import com.turbodev.server.manager.ProjectManager; -import com.turbodev.server.model.Project; -import com.turbodev.server.security.SecurityUtils; + +import io.onedev.server.OneDev; +import io.onedev.server.git.Blob; +import io.onedev.server.git.BlobIdent; +import io.onedev.server.git.GitUtils; +import io.onedev.server.manager.ProjectManager; +import io.onedev.server.model.Project; +import io.onedev.server.security.SecurityUtils; public class RawBlobResource extends AbstractResource { @@ -48,7 +49,7 @@ public class RawBlobResource extends AbstractResource { if (StringUtils.isBlank(projectName)) throw new IllegalArgumentException("project name has to be specified"); - Project project = TurboDev.getInstance(ProjectManager.class).find(projectName); + Project project = OneDev.getInstance(ProjectManager.class).find(projectName); if (project == null) throw new EntityNotFoundException("Unable to find project " + projectName); diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/RawBlobResourceReference.java b/web/src/main/java/io/onedev/server/web/util/resource/RawBlobResourceReference.java similarity index 88% rename from web/src/main/java/com/turbodev/server/web/util/resource/RawBlobResourceReference.java rename to web/src/main/java/io/onedev/server/web/util/resource/RawBlobResourceReference.java index 6d5066b209..a0c17a5460 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/RawBlobResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/RawBlobResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/ServerLogResource.java b/web/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java similarity index 91% rename from web/src/main/java/com/turbodev/server/web/util/resource/ServerLogResource.java rename to web/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java index efea47022c..e1726712ba 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/ServerLogResource.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/ServerLogResource.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import java.io.File; import java.io.IOException; @@ -11,11 +11,12 @@ import org.apache.shiro.authz.UnauthorizedException; import org.apache.tika.mime.MimeTypes; import org.apache.wicket.request.resource.AbstractResource; -import com.turbodev.launcher.bootstrap.Bootstrap; -import com.turbodev.utils.FileUtils; +import io.onedev.launcher.bootstrap.Bootstrap; +import io.onedev.server.security.SecurityUtils; +import io.onedev.utils.FileUtils; + import com.google.common.base.Charsets; import com.google.common.base.Joiner; -import com.turbodev.server.security.SecurityUtils; public class ServerLogResource extends AbstractResource { diff --git a/web/src/main/java/com/turbodev/server/web/util/resource/ServerLogResourceReference.java b/web/src/main/java/io/onedev/server/web/util/resource/ServerLogResourceReference.java similarity index 89% rename from web/src/main/java/com/turbodev/server/web/util/resource/ServerLogResourceReference.java rename to web/src/main/java/io/onedev/server/web/util/resource/ServerLogResourceReference.java index 77760115d1..741165f75a 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resource/ServerLogResourceReference.java +++ b/web/src/main/java/io/onedev/server/web/util/resource/ServerLogResourceReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resource; +package io.onedev.server.web.util.resource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; diff --git a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java b/web/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java rename to web/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java index eaf8448da6..52694aa5a9 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java +++ b/web/src/main/java/io/onedev/server/web/util/resourcebundle/BundleAwareResourceReferenceFactory.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resourcebundle; +package io.onedev.server.web.util.resourcebundle; import java.util.ArrayList; import java.util.List; @@ -15,7 +15,7 @@ import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.ResourceReference.Key; import org.apache.wicket.resource.bundles.ConcatResourceBundleReference; -import com.turbodev.utils.PathUtils; +import io.onedev.utils.PathUtils; /* * When css is bundled, and its access url can be changed (unless its resource is annotated with @ResourceBundle), diff --git a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java b/web/src/main/java/io/onedev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java similarity index 93% rename from web/src/main/java/com/turbodev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java rename to web/src/main/java/io/onedev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java index 30f6e0feff..6e8c89dc8b 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java +++ b/web/src/main/java/io/onedev/server/web/util/resourcebundle/CachedDependenciesConcatResourceBundleReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resourcebundle; +package io.onedev.server.web.util.resourcebundle; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java b/web/src/main/java/io/onedev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java similarity index 97% rename from web/src/main/java/com/turbodev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java rename to web/src/main/java/io/onedev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java index fb0490850b..3d21f8cd51 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java +++ b/web/src/main/java/io/onedev/server/web/util/resourcebundle/JavaScriptConcatResourceBundleReference.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resourcebundle; +package io.onedev.server.web.util.resourcebundle; import java.io.IOException; import java.util.List; diff --git a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/ResourceBundle.java b/web/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundle.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/util/resourcebundle/ResourceBundle.java rename to web/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundle.java index 19f7725f30..98a90f85bb 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/ResourceBundle.java +++ b/web/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundle.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resourcebundle; +package io.onedev.server.web.util.resourcebundle; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/ResourceBundleReferences.java b/web/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/util/resourcebundle/ResourceBundleReferences.java rename to web/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java index 53e9f876ec..6efac513da 100644 --- a/web/src/main/java/com/turbodev/server/web/util/resourcebundle/ResourceBundleReferences.java +++ b/web/src/main/java/io/onedev/server/web/util/resourcebundle/ResourceBundleReferences.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.util.resourcebundle; +package io.onedev.server.web.util.resourcebundle; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -26,9 +26,9 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.resource.bundles.ConcatResourceBundleReference; -import com.turbodev.utils.ClassUtils; -import com.turbodev.utils.DependencyAware; -import com.turbodev.utils.DependencyUtils; +import io.onedev.utils.ClassUtils; +import io.onedev.utils.DependencyAware; +import io.onedev.utils.DependencyUtils; public class ResourceBundleReferences { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/CodeCommentChangeBroadcaster.java b/web/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/websocket/CodeCommentChangeBroadcaster.java rename to web/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.java index 9cd3570a96..6280ab3ba4 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/CodeCommentChangeBroadcaster.java +++ b/web/src/main/java/io/onedev/server/web/websocket/CodeCommentChangeBroadcaster.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.event.codecomment.CodeCommentEvent; -import com.turbodev.server.web.util.WicketUtils; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.codecomment.CodeCommentEvent; +import io.onedev.server.web.util.WicketUtils; @Singleton public class CodeCommentChangeBroadcaster { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/CodeCommentChangedRegion.java b/web/src/main/java/io/onedev/server/web/websocket/CodeCommentChangedRegion.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/websocket/CodeCommentChangedRegion.java rename to web/src/main/java/io/onedev/server/web/websocket/CodeCommentChangedRegion.java index bc386737c4..a308f249b7 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/CodeCommentChangedRegion.java +++ b/web/src/main/java/io/onedev/server/web/websocket/CodeCommentChangedRegion.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.web.websocket.WebSocketRegion; public class CodeCommentChangedRegion implements WebSocketRegion { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/CommitIndexedBroadcaster.java b/web/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java similarity index 70% rename from web/src/main/java/com/turbodev/server/web/websocket/CommitIndexedBroadcaster.java rename to web/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java index 12bc82e0d2..370a1021fd 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/CommitIndexedBroadcaster.java +++ b/web/src/main/java/io/onedev/server/web/websocket/CommitIndexedBroadcaster.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.search.CommitIndexed; -import com.turbodev.server.web.websocket.WebSocketManager; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.search.CommitIndexed; +import io.onedev.server.web.websocket.WebSocketManager; @Singleton public class CommitIndexedBroadcaster { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/CommitIndexedRegion.java b/web/src/main/java/io/onedev/server/web/websocket/CommitIndexedRegion.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/websocket/CommitIndexedRegion.java rename to web/src/main/java/io/onedev/server/web/websocket/CommitIndexedRegion.java index 92a74fecd9..e3f5f16c5a 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/CommitIndexedRegion.java +++ b/web/src/main/java/io/onedev/server/web/websocket/CommitIndexedRegion.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import org.eclipse.jgit.lib.ObjectId; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.web.websocket.WebSocketRegion; public class CommitIndexedRegion implements WebSocketRegion { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/CompositeRegion.java b/web/src/main/java/io/onedev/server/web/websocket/CompositeRegion.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/websocket/CompositeRegion.java rename to web/src/main/java/io/onedev/server/web/websocket/CompositeRegion.java index b39ec04649..8c0c4f3bce 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/CompositeRegion.java +++ b/web/src/main/java/io/onedev/server/web/websocket/CompositeRegion.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import java.util.Collection; diff --git a/web/src/main/java/com/turbodev/server/web/websocket/DefaultWebSocketManager.java b/web/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/websocket/DefaultWebSocketManager.java rename to web/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java index b3ab988888..b67f285bb7 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/DefaultWebSocketManager.java +++ b/web/src/main/java/io/onedev/server/web/websocket/DefaultWebSocketManager.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import java.io.IOException; import java.util.Collection; @@ -20,9 +20,9 @@ import org.apache.wicket.protocol.ws.api.registry.PageIdKey; import org.apache.wicket.protocol.ws.api.registry.SimpleWebSocketConnectionRegistry; import org.eclipse.jetty.websocket.api.WebSocketPolicy; -import com.turbodev.server.persistence.annotation.Sessional; -import com.turbodev.server.persistence.dao.Dao; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.persistence.annotation.Sessional; +import io.onedev.server.persistence.dao.Dao; +import io.onedev.server.web.page.base.BasePage; @Singleton public class DefaultWebSocketManager implements WebSocketManager { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/PageDataChanged.java b/web/src/main/java/io/onedev/server/web/websocket/PageDataChanged.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/websocket/PageDataChanged.java rename to web/src/main/java/io/onedev/server/web/websocket/PageDataChanged.java index 1dfd5b8f34..b48e2393fd 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/PageDataChanged.java +++ b/web/src/main/java/io/onedev/server/web/websocket/PageDataChanged.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import org.apache.wicket.core.request.handler.IPartialPageRequestHandler; -import com.turbodev.server.web.util.AjaxPayload; +import io.onedev.server.web.util.AjaxPayload; public class PageDataChanged extends AjaxPayload { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/PageKey.java b/web/src/main/java/io/onedev/server/web/websocket/PageKey.java similarity index 96% rename from web/src/main/java/com/turbodev/server/web/websocket/PageKey.java rename to web/src/main/java/io/onedev/server/web/websocket/PageKey.java index 37c5a678ca..914834d407 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/PageKey.java +++ b/web/src/main/java/io/onedev/server/web/websocket/PageKey.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; diff --git a/web/src/main/java/com/turbodev/server/web/websocket/PullRequestChangeBroadcaster.java b/web/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/websocket/PullRequestChangeBroadcaster.java rename to web/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.java index 5226b85573..1735be2c0e 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/PullRequestChangeBroadcaster.java +++ b/web/src/main/java/io/onedev/server/web/websocket/PullRequestChangeBroadcaster.java @@ -1,11 +1,11 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.event.pullrequest.PullRequestEvent; -import com.turbodev.server.web.util.WicketUtils; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.event.pullrequest.PullRequestEvent; +import io.onedev.server.web.util.WicketUtils; @Singleton public class PullRequestChangeBroadcaster { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/PullRequestChangedRegion.java b/web/src/main/java/io/onedev/server/web/websocket/PullRequestChangedRegion.java similarity index 82% rename from web/src/main/java/com/turbodev/server/web/websocket/PullRequestChangedRegion.java rename to web/src/main/java/io/onedev/server/web/websocket/PullRequestChangedRegion.java index a8d2fb0baa..a41c9ef5ff 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/PullRequestChangedRegion.java +++ b/web/src/main/java/io/onedev/server/web/websocket/PullRequestChangedRegion.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.web.websocket.WebSocketRegion; public class PullRequestChangedRegion implements WebSocketRegion { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/RecentRenderRequest.java b/web/src/main/java/io/onedev/server/web/websocket/RecentRenderRequest.java similarity index 92% rename from web/src/main/java/com/turbodev/server/web/websocket/RecentRenderRequest.java rename to web/src/main/java/io/onedev/server/web/websocket/RecentRenderRequest.java index 5b725cc74b..7c145ada43 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/RecentRenderRequest.java +++ b/web/src/main/java/io/onedev/server/web/websocket/RecentRenderRequest.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import java.util.Date; diff --git a/web/src/main/java/com/turbodev/server/web/websocket/TaskChangeBroadcaster.java b/web/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.java similarity index 73% rename from web/src/main/java/com/turbodev/server/web/websocket/TaskChangeBroadcaster.java rename to web/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.java index 8d96b286bb..17992fbd9d 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/TaskChangeBroadcaster.java +++ b/web/src/main/java/io/onedev/server/web/websocket/TaskChangeBroadcaster.java @@ -1,13 +1,13 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import javax.inject.Inject; import javax.inject.Singleton; -import com.turbodev.launcher.loader.Listen; -import com.turbodev.server.model.PullRequestTask; -import com.turbodev.server.persistence.dao.EntityPersisted; -import com.turbodev.server.persistence.dao.EntityRemoved; -import com.turbodev.server.web.websocket.WebSocketManager; +import io.onedev.launcher.loader.Listen; +import io.onedev.server.model.PullRequestTask; +import io.onedev.server.persistence.dao.EntityPersisted; +import io.onedev.server.persistence.dao.EntityRemoved; +import io.onedev.server.web.websocket.WebSocketManager; @Singleton public class TaskChangeBroadcaster { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/TaskChangedRegion.java b/web/src/main/java/io/onedev/server/web/websocket/TaskChangedRegion.java similarity index 81% rename from web/src/main/java/com/turbodev/server/web/websocket/TaskChangedRegion.java rename to web/src/main/java/io/onedev/server/web/websocket/TaskChangedRegion.java index a805a35475..d883efd9b6 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/TaskChangedRegion.java +++ b/web/src/main/java/io/onedev/server/web/websocket/TaskChangedRegion.java @@ -1,6 +1,6 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; -import com.turbodev.server.web.websocket.WebSocketRegion; +import io.onedev.server.web.websocket.WebSocketRegion; public class TaskChangedRegion implements WebSocketRegion { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketConnection.java b/web/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/websocket/WebSocketConnection.java rename to web/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java index 6695194f60..5010035278 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketConnection.java +++ b/web/src/main/java/io/onedev/server/web/websocket/WebSocketConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import java.io.IOException; import java.nio.ByteBuffer; diff --git a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketFilter.java b/web/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.java similarity index 98% rename from web/src/main/java/com/turbodev/server/web/websocket/WebSocketFilter.java rename to web/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.java index 0255e1ce91..528044ed1c 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketFilter.java +++ b/web/src/main/java/io/onedev/server/web/websocket/WebSocketFilter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import java.io.IOException; diff --git a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketManager.java b/web/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java similarity index 83% rename from web/src/main/java/com/turbodev/server/web/websocket/WebSocketManager.java rename to web/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java index 58cb3fb082..ccc39f3e5d 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketManager.java +++ b/web/src/main/java/io/onedev/server/web/websocket/WebSocketManager.java @@ -1,8 +1,8 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import javax.annotation.Nullable; -import com.turbodev.server.web.page.base.BasePage; +import io.onedev.server.web.page.base.BasePage; public interface WebSocketManager { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketProcessor.java b/web/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java similarity index 94% rename from web/src/main/java/com/turbodev/server/web/websocket/WebSocketProcessor.java rename to web/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java index 968c734995..1f72098efa 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketProcessor.java +++ b/web/src/main/java/io/onedev/server/web/websocket/WebSocketProcessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; import org.apache.shiro.subject.Subject; import org.apache.shiro.util.ThreadContext; @@ -27,9 +27,9 @@ import org.eclipse.jetty.websocket.servlet.ServletUpgradeResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.launcher.loader.AppLoader; -import com.turbodev.server.TurboDev; -import com.turbodev.server.persistence.UnitOfWork; +import io.onedev.launcher.loader.AppLoader; +import io.onedev.server.OneDev; +import io.onedev.server.persistence.UnitOfWork; /** * An {@link org.apache.wicket.protocol.ws.api.IWebSocketProcessor processor} that integrates with @@ -75,7 +75,7 @@ public class WebSocketProcessor extends AbstractWebSocketProcessor implements We } private void run(Runnable runnable) { - if (TurboDev.getInstance().isReady()) { + if (OneDev.getInstance().isReady()) { UnitOfWork unitOfWork = AppLoader.getInstance(UnitOfWork.class); unitOfWork.begin(); try { diff --git a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketRegion.java b/web/src/main/java/io/onedev/server/web/websocket/WebSocketRegion.java similarity index 65% rename from web/src/main/java/com/turbodev/server/web/websocket/WebSocketRegion.java rename to web/src/main/java/io/onedev/server/web/websocket/WebSocketRegion.java index 33cf4c53ff..a29170e217 100644 --- a/web/src/main/java/com/turbodev/server/web/websocket/WebSocketRegion.java +++ b/web/src/main/java/io/onedev/server/web/websocket/WebSocketRegion.java @@ -1,4 +1,4 @@ -package com.turbodev.server.web.websocket; +package io.onedev.server.web.websocket; public interface WebSocketRegion { boolean contains(WebSocketRegion region); diff --git a/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java index d5d5c6678c..a853824f5f 100644 --- a/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java +++ b/web/src/main/java/org/apache/wicket/protocol/ws/api/AbstractWebSocketProcessor.java @@ -65,7 +65,7 @@ import org.apache.wicket.util.string.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.turbodev.server.web.websocket.WebSocketManager; +import io.onedev.server.web.websocket.WebSocketManager; /** * The base implementation of IWebSocketProcessor. Provides the common logic diff --git a/web/src/main/java/org/eclipse/jetty/server/Response.java b/web/src/main/java/org/eclipse/jetty/server/Response.java index 85c1270b80..3e47894d7c 100644 --- a/web/src/main/java/org/eclipse/jetty/server/Response.java +++ b/web/src/main/java/org/eclipse/jetty/server/Response.java @@ -657,7 +657,7 @@ public class Response implements HttpServletResponse /* * The new http spec now allows to redirect to relative urls. So we comment * out below section to avoid wrongly prepending http scheme to the url if - * TurboDev running with http protocol is exposed to outside as https prococol + * OneDev running with http protocol is exposed to outside as https prococol * via reverse proxy */ diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/ResourceBundleReferencesTest.java b/web/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.java similarity index 77% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/ResourceBundleReferencesTest.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.java index 84cb11be48..7712c8b4bf 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/ResourceBundleReferencesTest.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/ResourceBundleReferencesTest.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle; +package io.onedev.web.util.resourcebundle; import org.apache.wicket.markup.head.CssReferenceHeaderItem; import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem; @@ -6,18 +6,19 @@ import org.apache.wicket.request.resource.CssResourceReference; import org.junit.Assert; import org.junit.Test; -import com.turbodev.web.util.resourcebundle.testdata.a.Js1ResourceReferenceA; -import com.turbodev.web.util.resourcebundle.testdata.a.Js2ResourceReferenceA; -import com.turbodev.web.util.resourcebundle.testdata.a.Js3ResourceReferenceA; -import com.turbodev.web.util.resourcebundle.testdata.b.Js1ResourceReferenceB; -import com.turbodev.web.util.resourcebundle.testdata.b.Js2ResourceReferenceB; -import com.turbodev.web.util.resourcebundle.testdata.b.Js3ResourceReferenceB; -import com.turbodev.web.util.resourcebundle.testdata.c.Js1ResourceReferenceC; -import com.turbodev.web.util.resourcebundle.testdata.c.Js2ResourceReferenceC; -import com.turbodev.web.util.resourcebundle.testdata.c.Js3ResourceReferenceC; -import com.turbodev.web.util.resourcebundle.testdata.c.Js4ResourceReferenceC; +import io.onedev.server.web.util.resourcebundle.ResourceBundleReferences; +import io.onedev.web.util.resourcebundle.testdata.a.Js1ResourceReferenceA; +import io.onedev.web.util.resourcebundle.testdata.a.Js2ResourceReferenceA; +import io.onedev.web.util.resourcebundle.testdata.a.Js3ResourceReferenceA; +import io.onedev.web.util.resourcebundle.testdata.b.Js1ResourceReferenceB; +import io.onedev.web.util.resourcebundle.testdata.b.Js2ResourceReferenceB; +import io.onedev.web.util.resourcebundle.testdata.b.Js3ResourceReferenceB; +import io.onedev.web.util.resourcebundle.testdata.c.Js1ResourceReferenceC; +import io.onedev.web.util.resourcebundle.testdata.c.Js2ResourceReferenceC; +import io.onedev.web.util.resourcebundle.testdata.c.Js3ResourceReferenceC; +import io.onedev.web.util.resourcebundle.testdata.c.Js4ResourceReferenceC; + import com.google.common.collect.Lists; -import com.turbodev.server.web.util.resourcebundle.ResourceBundleReferences; public class ResourceBundleReferencesTest { diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js1ResourceReferenceA.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js1ResourceReferenceA.java similarity index 83% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js1ResourceReferenceA.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js1ResourceReferenceA.java index 7d6ff1d585..3d36caad01 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js1ResourceReferenceA.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js1ResourceReferenceA.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.a; +package io.onedev.web.util.resourcebundle.testdata.a; import org.apache.wicket.request.resource.JavaScriptResourceReference; diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js2ResourceReferenceA.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js2ResourceReferenceA.java similarity index 92% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js2ResourceReferenceA.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js2ResourceReferenceA.java index afae74e23b..387551ee84 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js2ResourceReferenceA.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js2ResourceReferenceA.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.a; +package io.onedev.web.util.resourcebundle.testdata.a; import java.util.ArrayList; import java.util.List; diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js3ResourceReferenceA.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js3ResourceReferenceA.java similarity index 92% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js3ResourceReferenceA.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js3ResourceReferenceA.java index 7b9df38156..5d6172455d 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/a/Js3ResourceReferenceA.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/a/Js3ResourceReferenceA.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.a; +package io.onedev.web.util.resourcebundle.testdata.a; import java.util.ArrayList; import java.util.List; diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java similarity index 70% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java index 32d4bddbef..f37adadc1d 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js1ResourceReferenceB.java @@ -1,8 +1,8 @@ -package com.turbodev.web.util.resourcebundle.testdata.b; +package io.onedev.web.util.resourcebundle.testdata.b; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.server.web.util.resourcebundle.ResourceBundle; +import io.onedev.server.web.util.resourcebundle.ResourceBundle; @ResourceBundle public class Js1ResourceReferenceB extends JavaScriptResourceReference { diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js2ResourceReferenceB.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js2ResourceReferenceB.java similarity index 92% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js2ResourceReferenceB.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js2ResourceReferenceB.java index a1a45b4bc3..c53dbf7a86 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js2ResourceReferenceB.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js2ResourceReferenceB.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.b; +package io.onedev.web.util.resourcebundle.testdata.b; import java.util.ArrayList; import java.util.List; diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java similarity index 84% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java index 2a5b688269..4bc83f80e4 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/b/Js3ResourceReferenceB.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.b; +package io.onedev.web.util.resourcebundle.testdata.b; import java.util.ArrayList; import java.util.List; @@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.server.web.util.resourcebundle.ResourceBundle; +import io.onedev.server.web.util.resourcebundle.ResourceBundle; @ResourceBundle public class Js3ResourceReferenceB extends JavaScriptResourceReference { diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js1ResourceReferenceC.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js1ResourceReferenceC.java similarity index 92% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js1ResourceReferenceC.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js1ResourceReferenceC.java index 26381fa861..55a044a2e8 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js1ResourceReferenceC.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js1ResourceReferenceC.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.c; +package io.onedev.web.util.resourcebundle.testdata.c; import java.util.ArrayList; import java.util.List; diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java similarity index 88% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java index 87b0518bdd..22cd5f997a 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js2ResourceReferenceC.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.c; +package io.onedev.web.util.resourcebundle.testdata.c; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.server.web.util.resourcebundle.ResourceBundle; +import io.onedev.server.web.util.resourcebundle.ResourceBundle; @ResourceBundle public class Js2ResourceReferenceC extends JavaScriptResourceReference { diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js3ResourceReferenceC.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js3ResourceReferenceC.java similarity index 94% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js3ResourceReferenceC.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js3ResourceReferenceC.java index 40810362bc..cf8e4c853f 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js3ResourceReferenceC.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js3ResourceReferenceC.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.c; +package io.onedev.web.util.resourcebundle.testdata.c; import java.util.ArrayList; import java.util.List; diff --git a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java similarity index 88% rename from web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java rename to web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java index ca100c5c36..f323d47a0e 100644 --- a/web/src/test/java/com/turbodev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java +++ b/web/src/test/java/io/onedev/web/util/resourcebundle/testdata/c/Js4ResourceReferenceC.java @@ -1,4 +1,4 @@ -package com.turbodev.web.util.resourcebundle.testdata.c; +package io.onedev.web.util.resourcebundle.testdata.c; import java.util.ArrayList; import java.util.List; @@ -9,7 +9,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.request.resource.CssResourceReference; import org.apache.wicket.request.resource.JavaScriptResourceReference; -import com.turbodev.server.web.util.resourcebundle.ResourceBundle; +import io.onedev.server.web.util.resourcebundle.ResourceBundle; @ResourceBundle public class Js4ResourceReferenceC extends JavaScriptResourceReference {