archive-gh-me/onedev
1
0
Fork 0
mirror of https://github.com/theonedev/onedev.git synced 2025-12-08 18:26:30 +00:00
Code Issues Projects Releases Wiki Activity

Use new name OneDev

Browse Source
This commit is contained in:
Robin Shen 2018-03-06 20:59:05 +08:00
parent e154e0e3f7
commit 311630ebb6
2515 changed files with 7012 additions and 6885 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/pom.xml
View File

@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>server-core</artifactId>
<parent>
<groupId>com.turbodev</groupId>
<groupId>io.onedev</groupId>
<artifactId>server-parent</artifactId>
<version>1.0.1-build110</version>
<version>1.0.2-build111</version>
</parent>
<build>
<plugins>
<plugin>
<groupId>com.turbodev</groupId>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
</plugin>
<plugin>
@ -136,7 +136,7 @@
<artifactId>unbescape</artifactId>
</dependency>
<dependency>
<groupId>com.turbodev</groupId>
<groupId>io.onedev</groupId>
<artifactId>launcher-loader</artifactId>
<version>1.0.0</version>
</dependency>
@ -170,12 +170,12 @@
<artifactId>tika-core</artifactId>
</dependency>
<dependency>
<groupId>com.turbodev</groupId>
<groupId>io.onedev</groupId>
<artifactId>jsymbol</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>com.turbodev</groupId>
<groupId>io.onedev</groupId>
<artifactId>jsyntax</artifactId>
<version>1.0.0</version>
</dependency>
@ -215,7 +215,7 @@
<version>${flexmark.version}</version>
</dependency>
<dependency>
<groupId>com.turbodev</groupId>
<groupId>io.onedev</groupId>
<artifactId>jsyntax</artifactId>
<version>1.0.0</version>
</dependency>
@ -267,7 +267,7 @@
</dependency>
</dependencies>
<properties>
<moduleClass>com.turbodev.server.CoreModule</moduleClass>
<moduleClass>io.onedev.server.CoreModule</moduleClass>
<hibernate.version>5.2.10.Final</hibernate.version>
<shiro.version>1.4.0</shiro.version>
<jgit.version>4.7.0.201704051617-r</jgit.version>

5
core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarted.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.event.lifecycle;
public class SystemStarted {
}

5
core/src/main/java/com/turbodev/server/event/lifecycle/SystemStarting.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.event.lifecycle;
public class SystemStarting {
}

5
core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopped.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.event.lifecycle;
public class SystemStopped {
}

5
core/src/main/java/com/turbodev/server/event/lifecycle/SystemStopping.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.event.lifecycle;
public class SystemStopping {
}

10
core/src/main/java/com/turbodev/server/manager/BatchWorkManager.java
View File

@ -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);
}

12
core/src/main/java/com/turbodev/server/manager/CodeCommentRelationManager.java
View File

@ -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> {
CodeCommentRelation find(PullRequest request, CodeComment comment);
}

12
core/src/main/java/com/turbodev/server/manager/CodeCommentReplyManager.java
View File

@ -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<CodeCommentReply> {
void save(CodeCommentReply reply, CompareContext compareContext, PullRequest request);
}

8
core/src/main/java/com/turbodev/server/manager/PullRequestReferenceManager.java
View File

@ -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<PullRequestReference> {
}

8
core/src/main/java/com/turbodev/server/manager/PullRequestTaskManager.java
View File

@ -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<PullRequestTask> {
}

8
core/src/main/java/com/turbodev/server/manager/PullRequestWatchManager.java
View File

@ -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<PullRequestWatch> {
}

19
core/src/main/java/com/turbodev/server/manager/UserInfoManager.java
View File

@ -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);
}

5
core/src/main/java/com/turbodev/server/model/ModelLocator.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.model;
public class ModelLocator {
}

16
core/src/main/java/com/turbodev/server/model/support/submitter/Submitter.java
View File

@ -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);
}

10
core/src/main/java/com/turbodev/server/security/authenticator/ldap/GroupRetrieval.java
View File

@ -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 {
}

5
core/src/main/java/com/turbodev/server/util/jackson/DefaultView.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.util.jackson;
public class DefaultView {
}

5
core/src/main/java/com/turbodev/server/util/jackson/RestView.java
View File

@ -1,5 +0,0 @@
package com.turbodev.server.util.jackson;
public class RestView {
}

7
core/src/main/java/com/turbodev/server/util/validation/EntityValidator.java
View File

@ -1,7 +0,0 @@
package com.turbodev.server.util.validation;
import com.turbodev.server.model.AbstractEntity;
public interface EntityValidator {
void validate(AbstractEntity entity);
}

256
core/src/main/java/com/turbodev/server/CoreModule.java → core/src/main/java/io/onedev/server/CoreModule.java
View File

@ -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<? extends AbstractPlugin> getPluginClass() {
return TurboDev.class;
return OneDev.class;
}
}

6
core/src/main/java/com/turbodev/server/GitConfigProvider.java → core/src/main/java/io/onedev/server/GitConfigProvider.java
View File

@ -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<GitConfig> {

58
core/src/main/java/com/turbodev/server/TurboDev.java → core/src/main/java/io/onedev/server/OneDev.java
View File

@ -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> T getInstance(Class<T> 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();
}
}

14
core/src/main/java/com/turbodev/server/command/ApplyDBConstraintsCommand.java → core/src/main/java/io/onedev/server/command/ApplyDBConstraintsCommand.java
View File

@ -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 {

19
core/src/main/java/com/turbodev/server/command/BackupDBCommand.java → core/src/main/java/io/onedev/server/command/BackupDBCommand.java
View File

@ -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 {

14
core/src/main/java/com/turbodev/server/command/CheckDataVersionCommand.java → core/src/main/java/io/onedev/server/command/CheckDataVersionCommand.java
View File

@ -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 {

14
core/src/main/java/com/turbodev/server/command/CleanDBCommand.java → core/src/main/java/io/onedev/server/command/CleanDBCommand.java
View File

@ -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 {

2
core/src/main/java/com/turbodev/server/command/CommandNames.java → core/src/main/java/io/onedev/server/command/CommandNames.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.command;
package io.onedev.server.command;
public class CommandNames {

12
core/src/main/java/com/turbodev/server/command/DBDialectCommand.java → core/src/main/java/io/onedev/server/command/DBDialectCommand.java
View File

@ -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 {

18
core/src/main/java/com/turbodev/server/command/ResetAdminPasswordCommand.java → core/src/main/java/io/onedev/server/command/ResetAdminPasswordCommand.java
View File

@ -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 {

20
core/src/main/java/com/turbodev/server/command/RestoreDBCommand.java → core/src/main/java/io/onedev/server/command/RestoreDBCommand.java
View File

@ -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 {

54
core/src/main/java/com/turbodev/server/command/UpgradeCommand.java → core/src/main/java/io/onedev/server/command/UpgradeCommand.java
View File

@ -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, "<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"/>",
"<triggeringPolicy class=\"ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy\"><maxFileSize>1MB</maxFileSize></triggeringPolicy>");
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"),

2
core/src/main/java/com/turbodev/server/event/MarkdownAware.java → core/src/main/java/io/onedev/server/event/MarkdownAware.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.event;
package io.onedev.server.event;
import javax.annotation.Nullable;

4
core/src/main/java/com/turbodev/server/event/ProjectRenamed.java → core/src/main/java/io/onedev/server/event/ProjectRenamed.java
View File

@ -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 {

4
core/src/main/java/com/turbodev/server/event/RefUpdated.java → core/src/main/java/io/onedev/server/event/RefUpdated.java
View File

@ -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 {

10
core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentCreated.java → core/src/main/java/io/onedev/server/event/codecomment/CodeCommentCreated.java
View File

@ -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 {

10
core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentEvent.java → core/src/main/java/io/onedev/server/event/codecomment/CodeCommentEvent.java
View File

@ -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 {

10
core/src/main/java/com/turbodev/server/event/codecomment/CodeCommentReplied.java → core/src/main/java/io/onedev/server/event/codecomment/CodeCommentReplied.java
View File

@ -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 {

5
core/src/main/java/io/onedev/server/event/lifecycle/SystemStarted.java Normal file
View File

@ -0,0 +1,5 @@
package io.onedev.server.event.lifecycle;
public class SystemStarted {
}

5
core/src/main/java/io/onedev/server/event/lifecycle/SystemStarting.java Normal file
View File

@ -0,0 +1,5 @@
package io.onedev.server.event.lifecycle;
public class SystemStarting {
}

5
core/src/main/java/io/onedev/server/event/lifecycle/SystemStopped.java Normal file
View File

@ -0,0 +1,5 @@
package io.onedev.server.event.lifecycle;
public class SystemStopped {
}

5
core/src/main/java/io/onedev/server/event/lifecycle/SystemStopping.java Normal file
View File

@ -0,0 +1,5 @@
package io.onedev.server.event.lifecycle;
public class SystemStopping {
}

12
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentCreated.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentCreated.java
View File

@ -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 {

8
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentEvent.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentEvent.java
View File

@ -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 {

10
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCodeCommentReplied.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCodeCommentReplied.java
View File

@ -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 {

10
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestCommentCreated.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestCommentCreated.java
View File

@ -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 {

6
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestEvent.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestEvent.java
View File

@ -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 {

8
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestMergePreviewCalculated.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestMergePreviewCalculated.java
View File

@ -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 {

10
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestOpened.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestOpened.java
View File

@ -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 {

8
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestStatusChangeEvent.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestStatusChangeEvent.java
View File

@ -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 {

8
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestUpdated.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestUpdated.java
View File

@ -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 {

6
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationEvent.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationEvent.java
View File

@ -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 {

6
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationFailed.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationFailed.java
View File

@ -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 {

6
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationInError.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationInError.java
View File

@ -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 {

6
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationRunning.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationRunning.java
View File

@ -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 {

6
core/src/main/java/com/turbodev/server/event/pullrequest/PullRequestVerificationSucceeded.java → core/src/main/java/io/onedev/server/event/pullrequest/PullRequestVerificationSucceeded.java
View File

@ -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 {

4
core/src/main/java/com/turbodev/server/git/BlameBlock.java → core/src/main/java/io/onedev/server/git/BlameBlock.java
View File

@ -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 {

2
core/src/main/java/com/turbodev/server/git/BlameCommit.java → core/src/main/java/io/onedev/server/git/BlameCommit.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import static com.google.common.base.Preconditions.checkNotNull;

5
core/src/main/java/com/turbodev/server/git/Blob.java → core/src/main/java/io/onedev/server/git/Blob.java
View File

@ -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 {

13
core/src/main/java/com/turbodev/server/git/BlobChange.java → core/src/main/java/io/onedev/server/git/BlobChange.java
View File

@ -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 {

2
core/src/main/java/com/turbodev/server/git/BlobContent.java → core/src/main/java/io/onedev/server/git/BlobContent.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.Serializable;

11
core/src/main/java/com/turbodev/server/git/BlobEdits.java → core/src/main/java/io/onedev/server/git/BlobEdits.java
View File

@ -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 {

7
core/src/main/java/com/turbodev/server/git/BlobIdent.java → core/src/main/java/io/onedev/server/git/BlobIdent.java
View File

@ -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<BlobIdent> {

2
core/src/main/java/com/turbodev/server/git/BlobIdentFilter.java → core/src/main/java/io/onedev/server/git/BlobIdentFilter.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.Serializable;

2
core/src/main/java/com/turbodev/server/git/Contribution.java → core/src/main/java/io/onedev/server/git/Contribution.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.Serializable;

4
core/src/main/java/com/turbodev/server/git/Contributor.java → core/src/main/java/io/onedev/server/git/Contributor.java
View File

@ -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 {

52
core/src/main/java/com/turbodev/server/git/GitFilter.java → core/src/main/java/io/onedev/server/git/GitFilter.java
View File

@ -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");

17
core/src/main/java/com/turbodev/server/git/GitPostReceiveCallback.java → core/src/main/java/io/onedev/server/git/GitPostReceiveCallback.java
View File

@ -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

35
core/src/main/java/com/turbodev/server/git/GitPreReceiveCallback.java → core/src/main/java/io/onedev/server/git/GitPreReceiveCallback.java
View File

@ -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)) {

17
core/src/main/java/com/turbodev/server/git/GitUtils.java → core/src/main/java/io/onedev/server/git/GitUtils.java
View File

@ -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 {

4
core/src/main/java/com/turbodev/server/git/GitVersion.java → core/src/main/java/io/onedev/server/git/GitVersion.java
View File

@ -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<GitVersion> {

4
core/src/main/java/com/turbodev/server/git/LineStats.java → core/src/main/java/io/onedev/server/git/LineStats.java
View File

@ -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 {

2
core/src/main/java/com/turbodev/server/git/NameAndEmail.java → core/src/main/java/io/onedev/server/git/NameAndEmail.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.Serializable;

2
core/src/main/java/com/turbodev/server/git/Output.java → core/src/main/java/io/onedev/server/git/Output.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.IOException;

2
core/src/main/java/com/turbodev/server/git/RefInfo.java → core/src/main/java/io/onedev/server/git/RefInfo.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.IOException;
import java.util.Date;

2
core/src/main/java/com/turbodev/server/git/Submodule.java → core/src/main/java/io/onedev/server/git/Submodule.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git;
package io.onedev.server.git;
import java.io.Serializable;

7
core/src/main/java/com/turbodev/server/git/command/AdvertiseReceiveRefsCommand.java → core/src/main/java/io/onedev/server/git/command/AdvertiseReceiveRefsCommand.java
View File

@ -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<Void> {
private static final Logger logger = LoggerFactory.getLogger(AdvertiseReceiveRefsCommand.class);

7
core/src/main/java/com/turbodev/server/git/command/AdvertiseUploadRefsCommand.java → core/src/main/java/io/onedev/server/git/command/AdvertiseUploadRefsCommand.java
View File

@ -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<Void> {
private static final Logger logger = LoggerFactory.getLogger(AdvertiseUploadRefsCommand.class);

17
core/src/main/java/com/turbodev/server/git/command/BlameCommand.java → core/src/main/java/io/onedev/server/git/command/BlameCommand.java
View File

@ -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<Collection<BlameBlock>> {

7
core/src/main/java/com/turbodev/server/git/command/CloneCommand.java → core/src/main/java/io/onedev/server/git/command/CloneCommand.java
View File

@ -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<Void> {
private static final Logger logger = LoggerFactory.getLogger(CloneCommand.class);

7
core/src/main/java/com/turbodev/server/git/command/FetchCommand.java → core/src/main/java/io/onedev/server/git/command/FetchCommand.java
View File

@ -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<Void> {
private static final Logger logger = LoggerFactory.getLogger(FetchCommand.class);

2
core/src/main/java/com/turbodev/server/git/command/FileChange.java → core/src/main/java/io/onedev/server/git/command/FileChange.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git.command;
package io.onedev.server.git.command;
import java.io.Serializable;

16
core/src/main/java/com/turbodev/server/git/command/GitCommand.java → core/src/main/java/io/onedev/server/git/command/GitCommand.java
View File

@ -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<V> implements Callable<V> {
@ -74,7 +74,7 @@ public abstract class GitCommand<V> implements Callable<V> {
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;

5
core/src/main/java/com/turbodev/server/git/command/GitCommit.java → core/src/main/java/io/onedev/server/git/command/GitCommit.java
View File

@ -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 {

9
core/src/main/java/com/turbodev/server/git/command/IsAncestorCommand.java → core/src/main/java/io/onedev/server/git/command/IsAncestorCommand.java
View File

@ -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<Boolean> {
private static final Logger logger = LoggerFactory.getLogger(IsAncestorCommand.class);

7
core/src/main/java/com/turbodev/server/git/command/ListChangedFilesCommand.java → core/src/main/java/io/onedev/server/git/command/ListChangedFilesCommand.java
View File

@ -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<Collection<String>> {
private static final Logger logger = LoggerFactory.getLogger(ListChangedFilesCommand.class);

7
core/src/main/java/com/turbodev/server/git/command/ListFileChangesCommand.java → core/src/main/java/io/onedev/server/git/command/ListFileChangesCommand.java
View File

@ -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<Collection<FileChange>> {
private static final Logger logger = LoggerFactory.getLogger(ListFileChangesCommand.class);

9
core/src/main/java/com/turbodev/server/git/command/LogCommand.java → core/src/main/java/io/onedev/server/git/command/LogCommand.java
View File

@ -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<Void> {

7
core/src/main/java/com/turbodev/server/git/command/ReceiveCommand.java → core/src/main/java/io/onedev/server/git/command/ReceiveCommand.java
View File

@ -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<Void> {
private static final Logger logger = LoggerFactory.getLogger(ReceiveCommand.class);

6
core/src/main/java/com/turbodev/server/git/command/RevListCommand.java → core/src/main/java/io/onedev/server/git/command/RevListCommand.java
View File

@ -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<List<String>> {

7
core/src/main/java/com/turbodev/server/git/command/UploadCommand.java → core/src/main/java/io/onedev/server/git/command/UploadCommand.java
View File

@ -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<Void> {
private static final Logger logger = LoggerFactory.getLogger(UploadCommand.class);

12
core/src/main/java/com/turbodev/server/git/config/CurlConfig.java → core/src/main/java/io/onedev/server/git/config/CurlConfig.java
View File

@ -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.

10
core/src/main/java/com/turbodev/server/git/config/GitConfig.java → core/src/main/java/io/onedev/server/git/config/GitConfig.java
View File

@ -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.

4
core/src/main/java/com/turbodev/server/git/config/SpecifiedCurl.java → core/src/main/java/io/onedev/server/git/config/SpecifiedCurl.java
View File

@ -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 {

4
core/src/main/java/com/turbodev/server/git/config/SpecifiedGit.java → core/src/main/java/io/onedev/server/git/config/SpecifiedGit.java
View File

@ -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 {

4
core/src/main/java/com/turbodev/server/git/config/SystemCurl.java → core/src/main/java/io/onedev/server/git/config/SystemCurl.java
View File

@ -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 {

4
core/src/main/java/com/turbodev/server/git/config/SystemGit.java → core/src/main/java/io/onedev/server/git/config/SystemGit.java
View File

@ -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 {

2
core/src/main/java/com/turbodev/server/git/exception/GitException.java → core/src/main/java/io/onedev/server/git/exception/GitException.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git.exception;
package io.onedev.server.git.exception;
public class GitException extends RuntimeException {

2
core/src/main/java/com/turbodev/server/git/exception/NotFileException.java → core/src/main/java/io/onedev/server/git/exception/NotFileException.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git.exception;
package io.onedev.server.git.exception;
public class NotFileException extends GitException {

2
core/src/main/java/com/turbodev/server/git/exception/NotTreeException.java → core/src/main/java/io/onedev/server/git/exception/NotTreeException.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git.exception;
package io.onedev.server.git.exception;
public class NotTreeException extends GitException {

2
core/src/main/java/com/turbodev/server/git/exception/ObjectAlreadyExistsException.java → core/src/main/java/io/onedev/server/git/exception/ObjectAlreadyExistsException.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git.exception;
package io.onedev.server.git.exception;
public class ObjectAlreadyExistsException extends GitException {

2
core/src/main/java/com/turbodev/server/git/exception/ObjectNotFoundException.java → core/src/main/java/io/onedev/server/git/exception/ObjectNotFoundException.java
View File

@ -1,4 +1,4 @@
package com.turbodev.server.git.exception;
package io.onedev.server.git.exception;
public class ObjectNotFoundException extends GitException {

Some files were not shown because too many files have changed in this diff Show More