Skip to content

The Unified and Autonomous Development Platform

Fix issue #2 - Git LFS support

Robin Shencc272f20c871
diff --git a/pom.xml b/pom.xml
index 38495a5a72..acd61356c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
<version>1.0.5</version>
</parent>
<artifactId>server</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
<packaging>pom</packaging>
<build>
<finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
@@ -564,7 +564,7 @@
</repositories>
<properties>
<commons.version>2.0.14</commons.version>
- <agent.version>1.0.8</agent.version>
+ <agent.version>1.1.0</agent.version>
<slf4j.version>1.7.30</slf4j.version>
<logback.version>1.2.0</logback.version>
<antlr.version>4.7.2</antlr.version>
diff --git a/server-core/pom.xml b/server-core/pom.xml
index 32d9e9b419..b52491ad93 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<build>
<plugins>
diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java
index 41f80dbc01..ea9150c083 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -107,6 +107,7 @@ import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
+import io.onedev.server.entitymanager.GitLfsLockManager;
import io.onedev.server.entitymanager.GroupAuthorizationManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueChangeManager;
@@ -145,6 +146,7 @@ import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;
import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;
+import io.onedev.server.entitymanager.impl.DefaultGitLfsLockManager;
import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultGroupManager;
import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;
@@ -173,6 +175,7 @@ import io.onedev.server.entitymanager.impl.DefaultUserManager;
import io.onedev.server.entityreference.DefaultEntityReferenceManager;
import io.onedev.server.entityreference.EntityReferenceManager;
import io.onedev.server.git.GitFilter;
+import io.onedev.server.git.GitLfsFilter;
import io.onedev.server.git.GitSshCommandCreator;
import io.onedev.server.git.config.GitConfig;
import io.onedev.server.git.hookcallback.GitPostReceiveCallback;
@@ -256,6 +259,10 @@ import io.onedev.server.storage.DefaultStorageManager;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.tasklog.DefaultJobLogManager;
import io.onedev.server.tasklog.JobLogManager;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.concurrent.DefaultBatchWorkManager;
+import io.onedev.server.util.concurrent.DefaultWorkExecutor;
+import io.onedev.server.util.concurrent.WorkExecutor;
import io.onedev.server.util.jackson.ObjectMapperConfigurator;
import io.onedev.server.util.jackson.ObjectMapperProvider;
import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
@@ -268,10 +275,6 @@ import io.onedev.server.util.script.ScriptContribution;
import io.onedev.server.util.validation.DefaultEntityValidator;
import io.onedev.server.util.validation.EntityValidator;
import io.onedev.server.util.validation.ValidatorProvider;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.DefaultBatchWorkManager;
-import io.onedev.server.util.work.DefaultWorkExecutor;
-import io.onedev.server.util.work.WorkExecutor;
import io.onedev.server.util.xstream.CollectionConverter;
import io.onedev.server.util.xstream.HibernateProxyConverter;
import io.onedev.server.util.xstream.MapConverter;
@@ -302,7 +305,7 @@ import io.onedev.server.web.page.layout.AdministrationSettingContribution;
import io.onedev.server.web.page.layout.ContributedAdministrationSetting;
import io.onedev.server.web.page.layout.DefaultMainMenuCustomization;
import io.onedev.server.web.page.layout.MainMenuCustomization;
-import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
import io.onedev.server.web.page.project.setting.ContributedProjectSetting;
import io.onedev.server.web.page.project.setting.ProjectSettingContribution;
import io.onedev.server.web.page.test.TestPage;
@@ -384,13 +387,13 @@ public class CoreModule extends AbstractPluginModule {
bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);
bind(UserInfoManager.class).to(DefaultUserInfoManager.class);
bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);
+ bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
bind(GroupManager.class).to(DefaultGroupManager.class);
bind(MembershipManager.class).to(DefaultMembershipManager.class);
bind(PullRequestChangeManager.class).to(DefaultPullRequestChangeManager.class);
bind(CodeCommentReplyManager.class).to(DefaultCodeCommentReplyManager.class);
bind(AttachmentStorageManager.class).to(DefaultAttachmentStorageManager.class);
bind(PullRequestInfoManager.class).to(DefaultPullRequestInfoManager.class);
- bind(WorkExecutor.class).to(DefaultWorkExecutor.class);
bind(PullRequestNotificationManager.class);
bind(CommitNotificationManager.class);
bind(BuildNotificationManager.class);
@@ -415,6 +418,7 @@ public class CoreModule extends AbstractPluginModule {
bind(SshKeyManager.class).to(DefaultSshKeyManager.class);
bind(BuildMetricManager.class).to(DefaultBuildMetricManager.class);
bind(EntityReferenceManager.class).to(DefaultEntityReferenceManager.class);
+ bind(GitLfsLockManager.class).to(DefaultGitLfsLockManager.class);
bind(WebHookManager.class);
@@ -564,6 +568,7 @@ public class CoreModule extends AbstractPluginModule {
contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);
bind(GitConfig.class).toProvider(GitConfigProvider.class);
bind(GitFilter.class);
+ bind(GitLfsFilter.class);
bind(GitPreReceiveCallback.class);
bind(GitPostReceiveCallback.class);
contribute(SshCommandCreator.class, GitSshCommandCreator.class);
@@ -621,7 +626,7 @@ public class CoreModule extends AbstractPluginModule {
bind(CommitIndexedBroadcaster.class);
contributeFromPackage(DiffRenderer.class, DiffRenderer.class);
- contributeFromPackage(BlobRendererContribution.class, BlobRendererContribution.class);
+ contributeFromPackage(BlobRendererer.class, BlobRendererer.class);
contribute(Extension.class, new EmojiExtension());
contribute(Extension.class, new SourcePositionTrackExtension());
diff --git a/server-core/src/main/java/io/onedev/server/OneDev.java b/server-core/src/main/java/io/onedev/server/OneDev.java
index ddd35597cc..35c2e0ff9c 100644
--- a/server-core/src/main/java/io/onedev/server/OneDev.java
+++ b/server-core/src/main/java/io/onedev/server/OneDev.java
@@ -26,9 +26,9 @@ import org.slf4j.LoggerFactory;
import com.google.inject.Provider;
+import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AbstractPlugin;
import io.onedev.commons.loader.AppLoader;
-import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.ListenerRegistry;
import io.onedev.commons.loader.ManagedSerializedForm;
import io.onedev.commons.utils.command.Commandline;
@@ -50,6 +50,7 @@ import io.onedev.server.util.init.InitStage;
import io.onedev.server.util.init.ManualConfig;
import io.onedev.server.util.jetty.JettyLauncher;
import io.onedev.server.util.schedule.TaskScheduler;
+import oshi.SystemInfo;
public class OneDev extends AbstractPlugin implements Serializable {
@@ -74,7 +75,7 @@ public class OneDev extends AbstractPlugin implements Serializable {
private final ExecutorService executorService;
private volatile InitStage initStage;
-
+
// Some are injected via provider as instantiation might encounter problem during upgrade
@Inject
public OneDev(Provider<JettyLauncher> jettyLauncherProvider, PersistManager persistManager,
@@ -97,6 +98,9 @@ public class OneDev extends AbstractPlugin implements Serializable {
@Override
public void start() {
+ logger.info("cpu: " + new SystemInfo().getHardware().getProcessor().getLogicalProcessorCount());
+ logger.info("memory: " + new SystemInfo().getHardware().getMemory().getTotal()/1024/1024);
+
SecurityUtils.bindAsSystem();
System.setProperty("hsqldb.reconfig_logging", "false");
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index f233eb5022..cf4f81d37d 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -1087,4 +1087,52 @@ public class BuildSpec implements Serializable, Validatable {
}
}
+ @SuppressWarnings("unused")
+ private void migrate11(VersionedYamlDoc doc, Stack<Integer> versions) {
+ for (NodeTuple specTuple: doc.getValue()) {
+ String specObjectKey = ((ScalarNode)specTuple.getKeyNode()).getValue();
+ if (specObjectKey.equals("jobs")) {
+ SequenceNode jobsNode = (SequenceNode) specTuple.getValueNode();
+ for (Node jobsNodeItem: jobsNode.getValue()) {
+ MappingNode jobNode = (MappingNode) jobsNodeItem;
+ for (NodeTuple jobTuple: jobNode.getValue()) {
+ String jobTupleKey = ((ScalarNode)jobTuple.getKeyNode()).getValue();
+ if (jobTupleKey.equals("steps")) {
+ SequenceNode stepsNode = (SequenceNode) jobTuple.getValueNode();
+ for (Node stepsNodeItem: stepsNode.getValue()) {
+ MappingNode stepNode = (MappingNode) stepsNodeItem;
+ if (stepNode.getTag().getValue().equals("!CheckoutStep")) {
+ stepNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "withLfs"),
+ new ScalarNode(Tag.BOOL, "false")));
+ stepNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "withSubmodules"),
+ new ScalarNode(Tag.BOOL, "true")));
+ }
+ }
+ }
+ }
+ }
+ } else if (specObjectKey.equals("stepTemplates")) {
+ SequenceNode stepTemplatesNode = (SequenceNode) specTuple.getValueNode();
+ for (Node stepTemplatesNodeItem: stepTemplatesNode.getValue()) {
+ MappingNode stepTemplateNode = (MappingNode) stepTemplatesNodeItem;
+ for (NodeTuple stepTemplateTuple: stepTemplateNode.getValue()) {
+ String stepTemplateTupleKey = ((ScalarNode)stepTemplateTuple.getKeyNode()).getValue();
+ if (stepTemplateTupleKey.equals("steps")) {
+ SequenceNode stepsNode = (SequenceNode) stepTemplateTuple.getValueNode();
+ for (Node stepsNodeItem: stepsNode.getValue()) {
+ MappingNode stepNode = (MappingNode) stepsNodeItem;
+ if (stepNode.getTag().getValue().equals("!CheckoutStep")) {
+ stepNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "withLfs"),
+ new ScalarNode(Tag.BOOL, "false")));
+ stepNode.getValue().add(new NodeTuple(new ScalarNode(Tag.STR, "withSubmodules"),
+ new ScalarNode(Tag.BOOL, "true")));
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
index 276832a2e9..e1fb17da8b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java
@@ -418,276 +418,292 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
private JobExecution execute(Build build) {
+ Long buildId = build.getId();
+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());
+ Long buildNumber = build.getNumber();
+ String projectName = build.getProject().getName();
+ File projectGitDir = build.getProject().getGitDir();
+ BuildSpec buildSpec = build.getSpec();
+ Job job;
+
JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
Build.push(build);
try {
- String jobToken = UUID.randomUUID().toString();
- Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);
- TaskLogger jobLogger = logManager.newLogger(build, jobSecretsToMask);
-
- BuildSpec buildSpec = build.getSpec();
- Job job = build.getJob();
-
- JobExecutor executor = getJobExecutor(build, jobLogger);
- if (executor != null) {
- ObjectId commitId = ObjectId.fromString(build.getCommitHash());
- Long buildId = build.getId();
- Long buildNumber = build.getNumber();
- String projectName = build.getProject().getName();
- File projectGitDir = build.getProject().getGitDir();
+ job = build.getJob();
+ } finally {
+ Build.pop();
+ JobSecretAuthorizationContext.pop();
+ }
+
+ AtomicReference<JobExecution> executionRef = new AtomicReference<>(null);
+ executionRef.set(new JobExecution(executorService.submit(new Runnable() {
+
+ @Override
+ public void run() {
+ String jobToken = UUID.randomUUID().toString();
+ TaskLogger jobLogger = sessionManager.call(new Callable<TaskLogger>() {
- AtomicReference<JobExecution> executionRef = new AtomicReference<>(null);
- executionRef.set(new JobExecution(executorService.submit(new Runnable() {
+ @Override
+ public TaskLogger call() throws Exception {
+ Collection<String> jobSecretsToMask = Sets.newHashSet(jobToken);
+ return logManager.newLogger(buildManager.load(buildId), jobSecretsToMask);
+ }
+
+ });
+
+ JobExecutor executor = sessionManager.call(new Callable<JobExecutor>() {
@Override
- public void run() {
- AtomicInteger maxRetries = new AtomicInteger(0);
- AtomicInteger retryDelay = new AtomicInteger(0);
- List<CacheSpec> caches = new ArrayList<>();
- List<Service> services = new ArrayList<>();
- List<Action> actions = new ArrayList<>();
+ public JobExecutor call() throws Exception {
+ return getJobExecutor(buildManager.load(buildId), jobLogger);
+ }
+
+ });
+
+ if (executor != null) {
+ AtomicInteger maxRetries = new AtomicInteger(0);
+ AtomicInteger retryDelay = new AtomicInteger(0);
+ List<CacheSpec> caches = new ArrayList<>();
+ List<Service> services = new ArrayList<>();
+ List<Action> actions = new ArrayList<>();
+
+ sessionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
+ Build.push(build);
+ try {
+ VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
+
+ for (Step step: job.getSteps()) {
+ step = interpolator.interpolateProperties(step);
+ actions.add(step.getAction(build, jobToken, build.getParamCombination()));
+ }
+
+ for (CacheSpec cache: job.getCaches())
+ caches.add(interpolator.interpolateProperties(cache));
+
+ for (String serviceName: job.getRequiredServices()) {
+ Service service = buildSpec.getServiceMap().get(serviceName);
+ services.add(interpolator.interpolateProperties(service));
+ }
+ maxRetries.set(job.getMaxRetries());
+ retryDelay.set(job.getRetryDelay());
+ } finally {
+ Build.pop();
+ JobSecretAuthorizationContext.pop();
+ }
+ }
- sessionManager.run(new Runnable() {
+ });
+
+ AtomicInteger retried = new AtomicInteger(0);
+ while (true) {
+ JobContext jobContext = sessionManager.call(new Callable<JobContext> () {
@Override
- public void run() {
+ public JobContext call() throws Exception {
Build build = buildManager.load(buildId);
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
Build.push(build);
+ JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
try {
- VariableInterpolator interpolator = new VariableInterpolator(build, build.getParamCombination());
-
- for (Step step: job.getSteps()) {
- step = interpolator.interpolateProperties(step);
- actions.add(step.getAction(build, jobToken, build.getParamCombination()));
- }
-
- for (CacheSpec cache: job.getCaches())
- caches.add(interpolator.interpolateProperties(cache));
-
- for (String serviceName: job.getRequiredServices()) {
- Service service = buildSpec.getServiceMap().get(serviceName);
- services.add(interpolator.interpolateProperties(service));
- }
- maxRetries.set(job.getMaxRetries());
- retryDelay.set(job.getRetryDelay());
- } finally {
- Build.pop();
- JobSecretAuthorizationContext.pop();
- }
- }
-
- });
+ return new JobContext(projectName, buildNumber, projectGitDir,
+ actions, job.getCpuRequirement(), job.getMemoryRequirement(),
+ commitId, caches, executor.getCacheTTL(), retried.get(),
+ services, jobLogger) {
+
+ @Override
+ public void notifyJobRunning(Long agentId) {
+ transactionManager.run(new Runnable() {
- AtomicInteger retried = new AtomicInteger(0);
- while (true) {
- JobContext jobContext = sessionManager.call(new Callable<JobContext> () {
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ build.setStatus(Build.Status.RUNNING);
+ build.setRunningDate(new Date());
+ if (agentId != null)
+ build.setAgent(agentManager.load(agentId));
+ buildManager.save(build);
+ listenerRegistry.post(new BuildRunning(build));
+ }
+
+ });
+ }
- @Override
- public JobContext call() throws Exception {
- Build build = buildManager.load(buildId);
- Build.push(build);
- JobSecretAuthorizationContext.push(build.getJobSecretAuthorizationContext());
- try {
- return new JobContext(projectName, buildNumber, projectGitDir,
- actions, job.getCpuRequirement(), job.getMemoryRequirement(),
- commitId, caches, executor.getCacheTTL(), retried.get(),
- services, jobLogger) {
-
- @Override
- public void notifyJobRunning(Long agentId) {
- transactionManager.run(new Runnable() {
+ @Override
+ public void reportJobWorkspace(String jobWorkspace) {
+ transactionManager.run(new Runnable() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- build.setStatus(Build.Status.RUNNING);
- build.setRunningDate(new Date());
- if (agentId != null)
- build.setAgent(agentManager.load(agentId));
- buildManager.save(build);
- listenerRegistry.post(new BuildRunning(build));
- }
-
- });
- }
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ build.setJobWorkspace(jobWorkspace);
+ buildManager.save(build);
+ }
+
+ });
+ }
- @Override
- public void reportJobWorkspace(String jobWorkspace) {
- transactionManager.run(new Runnable() {
+ @Override
+ public Map<String, byte[]> doRunServerStep(List<Integer> stepPosition, File filesDir,
+ Map<String, String> placeholderValues, TaskLogger logger) {
+ return sessionManager.call(new Callable<Map<String, byte[]>>() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- build.setJobWorkspace(jobWorkspace);
- buildManager.save(build);
- }
+ @Override
+ public Map<String, byte[]> call() {
+ Executable entryExecutable = new CompositeExecutable(getActions());
- });
- }
+ LeafVisitor<LeafExecutable> visitor = new LeafVisitor<LeafExecutable>() {
- @Override
- public Map<String, byte[]> doRunServerStep(List<Integer> stepPosition, File filesDir,
- Map<String, String> placeholderValues, TaskLogger logger) {
- return sessionManager.call(new Callable<Map<String, byte[]>>() {
-
- @Override
- public Map<String, byte[]> call() {
- Executable entryExecutable = new CompositeExecutable(getActions());
+ @Override
+ public LeafExecutable visit(LeafExecutable executable, List<Integer> position) {
+ if (position.equals(stepPosition))
+ return executable;
+ else
+ return null;
+ }
- LeafVisitor<LeafExecutable> visitor = new LeafVisitor<LeafExecutable>() {
+ };
+
+ ServerExecutable serverExecutable = (ServerExecutable) entryExecutable.traverse(visitor, new ArrayList<>());
+ ServerStep serverStep = (ServerStep) serverExecutable.getStep();
+
+ serverStep = new EditableStringTransformer(new Function<String, String>() {
- @Override
- public LeafExecutable visit(LeafExecutable executable, List<Integer> position) {
- if (position.equals(stepPosition))
- return executable;
- else
- return null;
- }
-
- };
-
- ServerExecutable serverExecutable = (ServerExecutable) entryExecutable.traverse(visitor, new ArrayList<>());
- ServerStep serverStep = (ServerStep) serverExecutable.getStep();
+ @Override
+ public String apply(String t) {
+ return replacePlaceholders(t, placeholderValues);
+ }
- serverStep = new EditableStringTransformer(new Function<String, String>() {
+ }).transformProperties(serverStep, Interpolative.class);
- @Override
- public String apply(String t) {
- return replacePlaceholders(t, placeholderValues);
- }
-
- }).transformProperties(serverStep, Interpolative.class);
-
- return serverStep.run(buildManager.load(buildId), filesDir, logger);
- }
-
- });
- }
+ return serverStep.run(buildManager.load(buildId), filesDir, logger);
+ }
+
+ });
+ }
- @Override
- public void copyDependencies(File targetDir) {
- sessionManager.run(new Runnable() {
+ @Override
+ public void copyDependencies(File targetDir) {
+ sessionManager.run(new Runnable() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- for (BuildDependence dependence: build.getDependencies()) {
- if (dependence.getArtifacts() != null) {
- Build dependency = dependence.getDependency();
- LockUtils.read(dependency.getArtifactsLockKey(), new Callable<Void>() {
+ @Override
+ public void run() {
+ Build build = buildManager.load(buildId);
+ for (BuildDependence dependence: build.getDependencies()) {
+ if (dependence.getArtifacts() != null) {
+ Build dependency = dependence.getDependency();
+ LockUtils.read(dependency.getArtifactsLockKey(), new Callable<Void>() {
- @Override
- public Void call() throws Exception {
- File artifactsDir = dependency.getArtifactsDir();
- if (artifactsDir.exists()) {
- PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());
- int baseLen = artifactsDir.getAbsolutePath().length() + 1;
- for (File file: patternSet.listFiles(artifactsDir)) {
- try {
- FileUtils.copyFile(file, new File(targetDir, file.getAbsolutePath().substring(baseLen)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ @Override
+ public Void call() throws Exception {
+ File artifactsDir = dependency.getArtifactsDir();
+ if (artifactsDir.exists()) {
+ PatternSet patternSet = PatternSet.parse(dependence.getArtifacts());
+ int baseLen = artifactsDir.getAbsolutePath().length() + 1;
+ for (File file: patternSet.listFiles(artifactsDir)) {
+ try {
+ FileUtils.copyFile(file, new File(targetDir, file.getAbsolutePath().substring(baseLen)));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
}
- return null;
}
-
- });
- }
+ return null;
+ }
+
+ });
}
}
-
- });
- }
-
- };
- } finally {
- Build.pop();
- JobSecretAuthorizationContext.pop();
- }
+ }
+
+ });
+ }
+
+ };
+ } finally {
+ Build.pop();
+ JobSecretAuthorizationContext.pop();
}
-
- });
-
- jobContexts.put(jobToken, jobContext);
- logManager.registerLogger(jobToken, jobLogger);
+ }
- try {
- executor.execute(jobToken, jobContext);
- break;
- } catch (Throwable e) {
- if (e != null && ExceptionUtils.find(e, InterruptedException.class) != null) {
- throw e;
- } else {
- if (retried.getAndIncrement() < maxRetries.get() && sessionManager.call(new Callable<Boolean>() {
+ });
+
+ jobContexts.put(jobToken, jobContext);
+ logManager.registerLogger(jobToken, jobLogger);
+
+ try {
+ executor.execute(jobToken, jobContext);
+ break;
+ } catch (Throwable e) {
+ if (e != null && ExceptionUtils.find(e, InterruptedException.class) != null) {
+ throw e;
+ } else {
+ if (retried.getAndIncrement() < maxRetries.get() && sessionManager.call(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() {
+ RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());
+ return retryCondition.matches(buildManager.load(buildId));
+ }
+
+ })) {
+ log(e, jobLogger);
+ jobLogger.warning("Job will be retried after a while...");
+ transactionManager.run(new Runnable() {
@Override
- public Boolean call() {
- RetryCondition retryCondition = RetryCondition.parse(job, job.getRetryCondition());
- return retryCondition.matches(buildManager.load(buildId));
+ public void run() {
+ Build build = buildManager.load(buildId);
+ build.setRunningDate(null);
+ build.setPendingDate(null);
+ build.setRetryDate(new Date());
+ build.setStatus(Build.Status.WAITING);
+ listenerRegistry.post(new BuildRetrying(build));
+ buildManager.save(build);
}
- })) {
- log(e, jobLogger);
- jobLogger.warning("Job will be retried after a while...");
- transactionManager.run(new Runnable() {
+ });
+ try {
+ Thread.sleep(retryDelay.get() * (long)(Math.pow(2, retried.get())) * 1000L);
+ } catch (InterruptedException e2) {
+ throw new RuntimeException(e2);
+ }
+ transactionManager.run(new Runnable() {
- @Override
- public void run() {
- Build build = buildManager.load(buildId);
- build.setRunningDate(null);
- build.setPendingDate(null);
- build.setRetryDate(new Date());
- build.setStatus(Build.Status.WAITING);
- listenerRegistry.post(new BuildRetrying(build));
- buildManager.save(build);
- }
-
- });
- try {
- Thread.sleep(retryDelay.get() * (long)(Math.pow(2, retried.get())) * 1000L);
- } catch (InterruptedException e2) {
- throw new RuntimeException(e2);
+ @Override
+ public void run() {
+ JobExecution execution = executionRef.get();
+ if (execution != null)
+ execution.updateBeginTime();
+ Build build = buildManager.load(buildId);
+ build.setPendingDate(new Date());
+ build.setStatus(Build.Status.PENDING);
+ listenerRegistry.post(new BuildPending(build));
+ buildManager.save(build);
}
- transactionManager.run(new Runnable() {
-
- @Override
- public void run() {
- JobExecution execution = executionRef.get();
- if (execution != null)
- execution.updateBeginTime();
- Build build = buildManager.load(buildId);
- build.setPendingDate(new Date());
- build.setStatus(Build.Status.PENDING);
- listenerRegistry.post(new BuildPending(build));
- buildManager.save(build);
- }
-
- });
- } else {
- throw e;
- }
+
+ });
+ } else {
+ throw e;
}
- } finally {
- jobContexts.remove(jobToken);
- logManager.deregisterLogger(jobToken);
- jobContext.onJobFinished();
}
+ } finally {
+ jobContexts.remove(jobToken);
+ logManager.deregisterLogger(jobToken);
+ jobContext.onJobFinished();
}
- }
-
- }), job.getTimeout() * 1000L));
-
- return executionRef.get();
- } else {
- throw new ExplicitException("No applicable job executor");
+ }
+ } else {
+ throw new ExplicitException("No applicable job executor");
+ }
}
- } finally {
- Build.pop();
- JobSecretAuthorizationContext.pop();
- }
+
+ }), job.getTimeout() * 1000L));
+
+ return executionRef.get();
}
private void log(Throwable e, TaskLogger logger) {
@@ -1105,6 +1121,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
try {
execution.check();
build.setStatus(Build.Status.SUCCESSFUL);
+ jobLogger.log("Job finished");
} catch (TimeoutException e) {
build.setStatus(Build.Status.TIMED_OUT);
} catch (CancellationException e) {
@@ -1124,7 +1141,6 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
} catch (InterruptedException e) {
} finally {
build.setFinishDate(new Date());
- jobLogger.log("Job finished");
listenerRegistry.post(new BuildFinished(build));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
index 2e89ebd609..6baf9f959e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CheckoutStep.java
@@ -17,6 +17,10 @@ public class CheckoutStep extends Step {
private GitCredential cloneCredential = new DefaultCredential();
+ private boolean withLfs;
+
+ private boolean withSubmodules;
+
private Integer cloneDepth;
@Editable(order=100, description="By default code is cloned via an auto-generated credential, "
@@ -31,6 +35,24 @@ public class CheckoutStep extends Step {
this.cloneCredential = cloneCredential;
}
+ @Editable(order=120, name="Retrieve LFS Files", description="Check this to retrieve Git LFS files")
+ public boolean isWithLfs() {
+ return withLfs;
+ }
+
+ public void setWithLfs(boolean withLfs) {
+ this.withLfs = withLfs;
+ }
+
+ @Editable(order=180, name="Retrieve Submodules", description="Check this to retrieve submodules")
+ public boolean isWithSubmodules() {
+ return withSubmodules;
+ }
+
+ public void setWithSubmodules(boolean withSubmodules) {
+ this.withSubmodules = withSubmodules;
+ }
+
@Editable(order=200, description="Optionally specify depth for a shallow clone in order "
+ "to speed up source retrieval")
public Integer getCloneDepth() {
@@ -43,7 +65,8 @@ public class CheckoutStep extends Step {
@Override
public Executable getExecutable(Build build, String jobToken, ParamCombination paramCombination) {
- return new CheckoutExecutable(cloneDepth!=null?cloneDepth:0, cloneCredential.newCloneInfo(build, jobToken));
+ return new CheckoutExecutable(cloneDepth!=null?cloneDepth:0, withLfs, withSubmodules,
+ cloneCredential.newCloneInfo(build, jobToken));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java
new file mode 100644
index 0000000000..77f60b1c4d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/GitLfsLockManager.java
@@ -0,0 +1,10 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.GitLfsLock;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface GitLfsLockManager extends EntityManager<GitLfsLock> {
+
+ GitLfsLock find(String path);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index ea6c002543..6260c886e0 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -15,6 +15,7 @@ import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.MailSetting;
+import io.onedev.server.model.support.administration.PerformanceSetting;
import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.ServiceDeskSetting;
import io.onedev.server.model.support.administration.SshSetting;
@@ -152,6 +153,10 @@ public interface SettingManager extends EntityManager<Setting> {
SshSetting getSshSetting();
+ void savePerformanceSetting(PerformanceSetting performanceSetting);
+
+ PerformanceSetting getPerformanceSetting();
+
void saveSshSetting(SshSetting sshSetting);
List<SsoConnector> getSsoConnectors();
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java
new file mode 100644
index 0000000000..a81bf02a8e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGitLfsLockManager.java
@@ -0,0 +1,30 @@
+package io.onedev.server.entitymanager.impl;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.GitLfsLockManager;
+import io.onedev.server.model.GitLfsLock;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultGitLfsLockManager extends BaseEntityManager<GitLfsLock> implements GitLfsLockManager {
+
+ @Inject
+ public DefaultGitLfsLockManager(Dao dao) {
+ super(dao);
+ }
+
+ @Override
+ public GitLfsLock find(String path) {
+ EntityCriteria<GitLfsLock> criteria = newCriteria();
+ criteria.add(Restrictions.ilike(GitLfsLock.PROP_PATH, path));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 0c98988557..453d6a0b8f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -12,6 +12,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
import java.util.stream.Collectors;
import javax.annotation.Nullable;
@@ -41,6 +42,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
import io.onedev.commons.loader.Listen;
import io.onedev.commons.loader.ListenerRegistry;
@@ -284,6 +286,24 @@ public class DefaultProjectManager extends BaseEntityManager<Project>
commitInfoManager.cloneInfo(from, to);
avatarManager.copyAvatar(from, to);
+ for (File file: FileUtils.listFiles(from.getLfsObjectsDir(), Sets.newHashSet("**"), Sets.newHashSet())) {
+ String objectId = file.getName();
+ Lock lock = from.getLfsObjectLock(objectId).readLock();
+ lock.lock();
+ try {
+ FileUtils.copyFile(file, to.getLfsObjectFile(objectId));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ lock.unlock();
+ }
+ }
+ try {
+ FileUtils.copyDirectory(from.getLfsObjectsDir(), to.getLfsObjectsDir());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
listenerRegistry.post(new ProjectCreated(to));
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index 81178460c4..ed9bc0d86a 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -123,10 +123,10 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.util.ProjectScopedNumber;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
import io.onedev.server.util.reviewrequirement.ReviewRequirement;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.BatchWorker;
@Singleton
public class DefaultPullRequestManager extends BaseEntityManager<PullRequest> implements PullRequestManager {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 8eaeaae7aa..410851854f 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -28,6 +28,7 @@ import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
import io.onedev.server.model.support.administration.GroovyScript;
import io.onedev.server.model.support.administration.MailSetting;
+import io.onedev.server.model.support.administration.PerformanceSetting;
import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.ServiceDeskSetting;
import io.onedev.server.model.support.administration.SshSetting;
@@ -86,6 +87,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
private volatile Long contributedSettingsId;
+ private volatile Long performanceSettingId;
+
@Inject
public DefaultSettingManager(Dao dao, DataManager dataManager) {
super(dao);
@@ -469,6 +472,32 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
dao.persist(setting);
}
+ @Sessional
+ @Override
+ public PerformanceSetting getPerformanceSetting() {
+ Setting setting;
+ if (performanceSettingId == null) {
+ setting = getSetting(Key.PERFORMANCE);
+ Preconditions.checkNotNull(setting);
+ performanceSettingId = setting.getId();
+ } else {
+ setting = load(performanceSettingId);
+ }
+ return (PerformanceSetting)setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void savePerformanceSetting(PerformanceSetting performanceSetting) {
+ Setting setting = getSetting(Key.PERFORMANCE);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.PERFORMANCE);
+ }
+ setting.setValue(performanceSetting);
+ dao.persist(setting);
+ }
+
@Sessional
@SuppressWarnings("unchecked")
@Override
diff --git a/server-core/src/main/java/io/onedev/server/git/Blob.java b/server-core/src/main/java/io/onedev/server/git/Blob.java
index 7297067d65..b04982fa1c 100644
--- a/server-core/src/main/java/io/onedev/server/git/Blob.java
+++ b/server-core/src/main/java/io/onedev/server/git/Blob.java
@@ -16,11 +16,12 @@ import org.eclipse.jgit.lib.ObjectReader;
import com.google.common.base.Optional;
+import io.onedev.commons.utils.StringUtils;
import io.onedev.server.util.ContentDetector;
public class Blob {
- public static final int MAX_BLOB_SIZE = 5*1024*1024;
+ private static final int MAX_LOADED_BLOB_SIZE = 5*1024*1024;
private final BlobIdent ident;
@@ -32,8 +33,10 @@ public class Blob {
private transient MediaType mediaType;
- private transient Optional<Text> optionalText;
-
+ private transient Optional<Text> text;
+
+ private transient Optional<LfsPointer> lfsPointer;
+
public Blob(BlobIdent ident, ObjectId blobId, ObjectReader objectReader) {
this.ident = ident;
this.blobId = blobId;
@@ -44,9 +47,9 @@ public class Blob {
throw new RuntimeException(e);
}
long blobSize = objectLoader.getSize();
- if (blobSize > MAX_BLOB_SIZE) {
+ if (blobSize > MAX_LOADED_BLOB_SIZE) {
try (InputStream is = objectLoader.openStream()) {
- byte[] bytes = new byte[Blob.MAX_BLOB_SIZE];
+ byte[] bytes = new byte[Blob.MAX_LOADED_BLOB_SIZE];
is.read(bytes);
size = blobSize;
this.bytes = bytes;
@@ -99,7 +102,7 @@ public class Blob {
}
return mediaType;
}
-
+
/**
* Get text representation of this blob.
*
@@ -108,24 +111,44 @@ public class Blob {
* content is binary
*/
public @Nullable Text getText() {
- if (optionalText == null) {
+ if (text == null) {
if (ident.isGitLink() || ident.isSymbolLink() || ident.isTree()) {
Charset charset = StandardCharsets.UTF_8;
- optionalText = Optional.of(new Text(charset, new String(bytes, charset)));
+ text = Optional.of(new Text(charset, new String(bytes, charset)));
} else if (!isPartial()) {
if (!ContentDetector.isBinary(bytes, ident.path)) {
Charset charset = ContentDetector.detectCharset(bytes);
if (charset == null)
charset = Charset.defaultCharset();
- optionalText = Optional.of(new Text(charset, new String(bytes, charset)));
+ text = Optional.of(new Text(charset, new String(bytes, charset)));
+ } else {
+ text = Optional.absent();
+ }
+ } else {
+ text = Optional.absent();
+ }
+ }
+ return text.orNull();
+ }
+
+ @Nullable
+ public LfsPointer getLfsPointer() {
+ if (lfsPointer == null) {
+ Text text = getText();
+ if (text != null) {
+ if (!text.getLines().isEmpty()
+ && text.getLines().get(0).startsWith("version https://git-lfs.github.com/spec/")) {
+ String objectId = StringUtils.substringAfter(text.getLines().get(1), ":");
+ long objectSize = Long.parseLong(StringUtils.substringAfter(text.getLines().get(2), " "));
+ lfsPointer = Optional.of(new LfsPointer(objectId, objectSize));
} else {
- optionalText = Optional.absent();
+ lfsPointer = Optional.absent();
}
} else {
- optionalText = Optional.absent();
+ lfsPointer = Optional.absent();
}
}
- return optionalText.orNull();
+ return lfsPointer.orNull();
}
public static class Text {
diff --git a/server-core/src/main/java/io/onedev/server/git/GitFilter.java b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
index b085da060c..23039f85d3 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitFilter.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitFilter.java
@@ -27,13 +27,9 @@ import org.apache.shiro.authz.UnauthorizedException;
import org.eclipse.jgit.http.server.GitSmartHttpTools;
import org.eclipse.jgit.http.server.ServletUtils;
import org.eclipse.jgit.transport.PacketLineOut;
-import org.hibernate.Hibernate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.io.Resources;
-
-import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.command.ErrorCollector;
import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.server.OneDev;
@@ -50,9 +46,11 @@ import io.onedev.server.persistence.SessionManager;
import io.onedev.server.security.CodePullAuthorizationSource;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.InputStreamWrapper;
+import io.onedev.server.util.OutputStreamWrapper;
import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.concurrent.WorkExecutor;
import io.onedev.server.util.concurrent.PrioritizedRunnable;
-import io.onedev.server.util.work.WorkExecutor;
@Singleton
public class GitFilter implements Filter {
@@ -107,9 +105,6 @@ public class GitFilter implements Filter {
Project project = projectManager.find(projectName);
if (project == null)
throw new GitException(String.format("Unable to find project %s", projectName));
- else
- Hibernate.initialize(project);
-
return project;
}
@@ -134,97 +129,85 @@ public class GitFilter implements Filter {
String projectInfo = StringUtils.substringBeforeLast(pathInfo, "/");
Project project = getProject(request, response, projectInfo);
- if (project != null) {
- doNotCache(response);
- response.setHeader("Content-Type", "application/x-" + service + "-result");
+ doNotCache(response);
+ response.setHeader("Content-Type", "application/x-" + service + "-result");
- String serverUrl;
- if (serverConfig.getHttpPort() != 0)
- serverUrl = "http://localhost:" + serverConfig.getHttpPort();
- else
- serverUrl = "https://localhost:" + serverConfig.getHttpsPort();
+ String serverUrl;
+ if (serverConfig.getHttpPort() != 0)
+ serverUrl = "http://localhost:" + serverConfig.getHttpPort();
+ else
+ serverUrl = "https://localhost:" + serverConfig.getHttpsPort();
- environments.put("ONEDEV_CURL", settingManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("ONEDEV_URL", serverUrl);
- environments.put("ONEDEV_USER_ID", SecurityUtils.getUserId().toString());
- environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
-
- // to be compatible with old repository
- environments.put("GITPLEX_CURL", settingManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("GITPLEX_URL", serverUrl);
- environments.put("GITPLEX_USER_ID", SecurityUtils.getUserId().toString());
- environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());
-
- gitDir = storageManager.getProjectGitDir(project.getId());
+ environments.put("ONEDEV_CURL", settingManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("ONEDEV_URL", serverUrl);
+ environments.put("ONEDEV_USER_ID", SecurityUtils.getUserId().toString());
+ environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
+
+ // to be compatible with old repository
+ environments.put("GITPLEX_CURL", settingManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("GITPLEX_URL", serverUrl);
+ environments.put("GITPLEX_USER_ID", SecurityUtils.getUserId().toString());
+ environments.put("GITPLEX_REPOSITORY_ID", project.getId().toString());
+
+ gitDir = storageManager.getProjectGitDir(project.getId());
- if (GitSmartHttpTools.isUploadPack(request)) {
- checkPullPermission(request, project);
- upload = true;
- } else {
- if (!SecurityUtils.canWriteCode(project))
- throw new UnauthorizedException("You do not have permission to push to this project.");
- upload = false;
- }
+ if (GitSmartHttpTools.isUploadPack(request)) {
+ checkPullPermission(request, project);
+ upload = true;
} else {
- gitDir = null;
- if (GitSmartHttpTools.isUploadPack(request))
- upload = true;
- else
- throw new UnsupportedOperationException("Can not push to the example repository");
- }
+ if (!SecurityUtils.canWriteCode(project))
+ throw new UnauthorizedException("You do not have permission to push to this project.");
+ upload = false;
+ }
} finally {
sessionManager.closeSession();
}
+ InputStream stdin = new InputStreamWrapper(ServletUtils.getInputStream(request)) {
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ };
+ OutputStream stdout = new OutputStreamWrapper(response.getOutputStream()) {
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ };
+
if (upload) {
workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
@Override
public void run() {
- try {
- InputStream stdin = ServletUtils.getInputStream(request);
- OutputStream stdout = response.getOutputStream();
-
- AtomicBoolean toleratedErrors = new AtomicBoolean(false);
- ErrorCollector stderr = new ErrorCollector(StandardCharsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- super.consume(line);
- // This error may happen during a normal shallow fetch/clone
- if (line.contains("remote end hung up unexpectedly")) {
- toleratedErrors.set(true);
- logger.debug(line);
- } else {
- logger.error(line);
- }
- }
-
- };
+ AtomicBoolean toleratedErrors = new AtomicBoolean(false);
+ ErrorCollector stderr = new ErrorCollector(StandardCharsets.UTF_8.name()) {
- ExecutionResult result;
- if (gitDir != null) {
- UploadPackCommand upload = new UploadPackCommand(gitDir, environments);
- upload.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);
- result = upload.call();
- } else {
- File tempDir = FileUtils.createTempDir();
- try {
- populateExampleRepo(tempDir);
- UploadPackCommand upload = new UploadPackCommand(tempDir, environments);
- upload.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);
- result = upload.call();
- } finally {
- FileUtils.deleteDir(tempDir, 3);
+ @Override
+ public void consume(String line) {
+ super.consume(line);
+ // This error may happen during a normal shallow fetch/clone
+ if (line.contains("remote end hung up unexpectedly")) {
+ toleratedErrors.set(true);
+ logger.debug(line);
+ } else {
+ logger.error(line);
}
}
- result.setStderr(stderr.getMessage());
- if (result.getReturnCode() != 0 && !toleratedErrors.get())
- throw result.buildException();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ };
+
+ ExecutionResult result;
+ UploadPackCommand upload = new UploadPackCommand(gitDir, environments);
+ upload.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);
+ result = upload.call();
+ result.setStderr(stderr.getMessage());
+
+ if (result.getReturnCode() != 0 && !toleratedErrors.get())
+ throw result.buildException();
}
}).get();
@@ -233,28 +216,21 @@ public class GitFilter implements Filter {
@Override
public void run() {
- try {
- InputStream stdin = ServletUtils.getInputStream(request);
- OutputStream stdout = response.getOutputStream();
-
- ErrorCollector stderr = new ErrorCollector(StandardCharsets.UTF_8.name()) {
+ ErrorCollector stderr = new ErrorCollector(StandardCharsets.UTF_8.name()) {
- @Override
- public void consume(String line) {
- super.consume(line);
- logger.error(line);
- }
-
- };
+ @Override
+ public void consume(String line) {
+ super.consume(line);
+ logger.error(line);
+ }
- ReceivePackCommand receive = new ReceivePackCommand(gitDir, environments);
- receive.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);
- ExecutionResult result = receive.call();
- result.setStderr(stderr.getMessage());
- result.checkReturnCode();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
+ };
+
+ ReceivePackCommand receive = new ReceivePackCommand(gitDir, environments);
+ receive.stdin(stdin).stdout(stdout).stderr(stderr).statelessRpc(true);
+ ExecutionResult result = receive.call();
+ result.setStderr(stderr.getMessage());
+ result.checkReturnCode();
}
}).get();
@@ -298,46 +274,33 @@ public class GitFilter implements Filter {
Project project = getProject(request, response, projectInfo);
String service = request.getParameter("service");
- if (project != null) {
- gitDir = storageManager.getProjectGitDir(project.getId());
-
- if (service.contains("upload")) {
- checkPullPermission(request, project);
- writeInitial(response, service);
- upload = true;
- } else {
- if (!SecurityUtils.canWriteCode(project))
- throw new UnauthorizedException("You do not have permission to push to this project.");
- writeInitial(response, service);
- upload = false;
- }
+ gitDir = storageManager.getProjectGitDir(project.getId());
+
+ if (service.contains("upload")) {
+ checkPullPermission(request, project);
+ writeInitial(response, service);
+ upload = true;
} else {
- gitDir = null;
- if (service.contains("upload")) {
- writeInitial(response, service);
- upload = true;
- } else {
- throw new UnsupportedOperationException("Can not push to the example repository");
- }
+ if (!SecurityUtils.canWriteCode(project))
+ throw new UnauthorizedException("You do not have permission to push to this project.");
+ writeInitial(response, service);
+ upload = false;
}
} finally {
sessionManager.closeSession();
}
- if (upload) {
- if (gitDir != null) {
- new AdvertiseUploadRefsCommand(gitDir).output(response.getOutputStream()).call();
- } else {
- File tempDir = FileUtils.createTempDir();
- try {
- populateExampleRepo(tempDir);
- new AdvertiseUploadRefsCommand(tempDir).output(response.getOutputStream()).call();
- } finally {
- FileUtils.deleteDir(tempDir, 3);
- }
+
+ OutputStream os = new OutputStreamWrapper(response.getOutputStream()) {
+
+ @Override
+ public void close() throws IOException {
}
- } else {
- new AdvertiseReceiveRefsCommand(gitDir).output(response.getOutputStream()).call();
- }
+
+ };
+ if (upload)
+ new AdvertiseUploadRefsCommand(gitDir).output(os).call();
+ else
+ new AdvertiseReceiveRefsCommand(gitDir).output(os).call();
}
@Override
@@ -373,14 +336,6 @@ public class GitFilter implements Filter {
}
}
- private static void populateExampleRepo(File dir) {
- try (InputStream is = Resources.getResource(GitFilter.class, "example-repo.zip").openStream()) {
- FileUtils.unzip(is, dir);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
@Override
public void destroy() {
}
diff --git a/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
new file mode 100644
index 0000000000..fc36478d8b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/GitLfsFilter.java
@@ -0,0 +1,532 @@
+package io.onedev.server.git;
+
+import static io.onedev.server.util.CollectionUtils.newHashMap;
+import static javax.servlet.http.HttpServletResponse.SC_CONFLICT;
+import static javax.servlet.http.HttpServletResponse.SC_CREATED;
+import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
+import static javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_ACCEPTABLE;
+import static javax.servlet.http.HttpServletResponse.SC_NOT_FOUND;
+import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URISyntaxException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.codec.binary.Hex;
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.tika.mime.MimeTypes;
+import org.hibernate.criterion.Restrictions;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Preconditions;
+import com.google.common.hash.Hashing;
+import com.google.common.hash.HashingInputStream;
+
+import io.onedev.commons.bootstrap.Bootstrap;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.entitymanager.GitLfsLockManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.GitLfsLock;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.security.CodePullAuthorizationSource;
+import io.onedev.server.security.SecurityUtils;
+
+@Singleton
+public class GitLfsFilter implements Filter {
+
+ private static final String CONTENT_TYPE = "application/vnd.git-lfs+json";
+
+ private static final String DATETIME_FORMAT = "yyyy-MM-dd'T'HH:mm:ssXXX";
+
+ public static final int MAX_PAGE_SIZE = 100;
+
+ private static final Logger logger = LoggerFactory.getLogger(GitLfsFilter.class);
+
+ private final ProjectManager projectManager;
+
+ private final ObjectMapper objectMapper;
+
+ private final SessionManager sessionManager;
+
+ private final SettingManager settingManager;
+
+ private final GitLfsLockManager lockManager;
+
+ private final Set<CodePullAuthorizationSource> codePullAuthorizationSources;
+
+ @Inject
+ public GitLfsFilter(ProjectManager projectManager, ObjectMapper objectMapper, SessionManager sessionManager,
+ SettingManager settingManager, GitLfsLockManager lockManager,
+ Set<CodePullAuthorizationSource> codePullAuthorizationSources) {
+ this.projectManager = projectManager;
+ this.objectMapper = objectMapper;
+ this.sessionManager = sessionManager;
+ this.settingManager = settingManager;
+ this.lockManager = lockManager;
+ this.codePullAuthorizationSources = codePullAuthorizationSources;
+ }
+
+ @Override
+ public void init(FilterConfig filterConfig) throws ServletException {
+ }
+
+ private long getMaxLFSFileSize() {
+ return 1L * settingManager.getSystemSetting().getMaxGitLFSFileSize()*1024*1024;
+ }
+
+ private boolean canReadCode(HttpServletRequest request, Project project) {
+ if (!SecurityUtils.canReadCode(project)) {
+ for (CodePullAuthorizationSource source: codePullAuthorizationSources) {
+ if (source.canPullCode(request, project))
+ return true;
+ }
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+ private String getObjectUrl(HttpServletRequest request, String projectName, String objectId) {
+ try {
+ String path = projectName + ".git/lfs/objects/" + objectId;
+ return new URIBuilder(request.getRequestURL().toString())
+ .setPath(path)
+ .addParameter("lfs-objects", "true")
+ .build()
+ .toString();
+ } catch (URISyntaxException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private String getProjectName(String pathInfo) {
+ String projectName = StringUtils.substringBefore(pathInfo, "/");
+ return projectName.substring(0, projectName.length() - ".git".length());
+ }
+
+ @Override
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
+ throws IOException, ServletException {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+ HttpServletResponse httpResponse = (HttpServletResponse) response;
+ String uri = httpRequest.getRequestURI();
+ String pathInfo = uri.substring(httpRequest.getContextPath().length());
+ pathInfo = StringUtils.stripStart(pathInfo, "/");
+ if ("true".equals(httpRequest.getParameter("lfs-objects"))) {
+ if (httpRequest.getMethod().equals("GET")) {
+ LfsObjectAccess lfsObjectAccess = null;
+ sessionManager.openSession();
+ try {
+ Project project = Preconditions.checkNotNull(projectManager.find(getProjectName(pathInfo)));
+ String objectId = StringUtils.substringAfterLast(pathInfo, "/");
+ if (canReadCode(httpRequest, project))
+ lfsObjectAccess = new LfsObjectAccess(project.getLfsObjectFile(objectId), project.getLfsObjectLock(objectId).readLock());
+ else
+ sendAuthorizationError(httpResponse);
+ } finally {
+ sessionManager.closeSession();
+ }
+
+ if (lfsObjectAccess != null) {
+ httpResponse.setContentType(MimeTypes.OCTET_STREAM);
+ lfsObjectAccess.lock.lock();
+ try (
+ InputStream is = new BufferedInputStream(new FileInputStream(lfsObjectAccess.file), Bootstrap.BUFFER_SIZE);
+ OutputStream os = new BufferedOutputStream(httpResponse.getOutputStream(), Bootstrap.BUFFER_SIZE);) {
+ IOUtils.copy(is, os);
+ } finally {
+ lfsObjectAccess.lock.unlock();
+ }
+ }
+ } else {
+ String objectId = StringUtils.substringAfterLast(pathInfo, "/");
+ LfsObjectAccess lfsObjectAccess = null;
+ sessionManager.openSession();
+ try {
+ Project project = Preconditions.checkNotNull(projectManager.find(getProjectName(pathInfo)));
+ if (SecurityUtils.canWriteCode(project))
+ lfsObjectAccess = new LfsObjectAccess(project.getLfsObjectFile(objectId), project.getLfsObjectLock(objectId).writeLock());
+ else
+ sendAuthorizationError(httpResponse);
+ } finally {
+ sessionManager.closeSession();
+ }
+
+ if (lfsObjectAccess != null) {
+ lfsObjectAccess.lock.lock();
+ try {
+ String hash;
+ try (
+ HashingInputStream is = new HashingInputStream(Hashing.sha256(), new BufferedInputStream(httpRequest.getInputStream(), Bootstrap.BUFFER_SIZE));
+ OutputStream os = new BufferedOutputStream(new FileOutputStream(lfsObjectAccess.file), Bootstrap.BUFFER_SIZE);) {
+ IOUtils.copy(is, os);
+ hash = Hex.encodeHexString(is.hash().asBytes());
+ }
+ if (!hash.equals(objectId)) {
+ FileUtils.deleteFile(lfsObjectAccess.file);
+ throw new RuntimeException("Invalid uploaded content: hash not equals to object id");
+ }
+ } finally {
+ lfsObjectAccess.lock.unlock();
+ }
+ }
+ }
+ } else if (httpRequest.getContentType() != null
+ && httpRequest.getContentType().startsWith(CONTENT_TYPE)
+ || httpRequest.getHeader("Accept") != null
+ && httpRequest.getHeader("Accept").startsWith(CONTENT_TYPE)) {
+ sessionManager.openSession();
+ try {
+ String projectName = getProjectName(pathInfo);
+ Project project = projectManager.find(projectName);
+ if (project == null) {
+ sendBatchError(httpResponse, SC_NOT_FOUND,
+ "Project not found: " + projectName);
+ } else {
+ httpResponse.setContentType(CONTENT_TYPE);
+ if (pathInfo.endsWith("/batch")) {
+ JsonNode batchRequestNode;
+ try (InputStream is = httpRequest.getInputStream()) {
+ batchRequestNode = objectMapper.readTree(is);
+ }
+
+ boolean supportBasicTransfer;
+ JsonNode transfersNode = batchRequestNode.get("transfers");
+ if (transfersNode != null) {
+ supportBasicTransfer = false;
+ for (JsonNode transferNode: transfersNode) {
+ if (transferNode.asText().equals("basic")) {
+ supportBasicTransfer = true;
+ break;
+ }
+ }
+ } else {
+ supportBasicTransfer = true;
+ }
+ if (!supportBasicTransfer) {
+ sendBatchError(httpResponse, SC_NOT_ACCEPTABLE,
+ "This server can only accept basic transfer");
+ } else {
+ boolean supportSha256;
+ JsonNode hashAlgoNode = batchRequestNode.get("hash_algo");
+ if (hashAlgoNode != null)
+ supportSha256 = hashAlgoNode.asText().equals("sha256");
+ else
+ supportSha256 = true;
+ if (!supportSha256) {
+ sendBatchError(httpResponse, SC_NOT_ACCEPTABLE,
+ "This server can only accept sha256 hash algorithm");
+ } else {
+ boolean upload = batchRequestNode.get("operation").asText().equals("upload");
+ boolean authorized = false;
+ if (upload) {
+ if (!SecurityUtils.canWriteCode(project))
+ sendAuthorizationError(httpResponse);
+ else
+ authorized = true;
+ } else {
+ if (!canReadCode(httpRequest, project))
+ sendAuthorizationError(httpResponse);
+ else
+ authorized = true;
+ }
+ if (authorized) {
+ List<Map<String, Object>> objectsResponse = new ArrayList<>();
+ for (JsonNode objectNode: batchRequestNode.get("objects")) {
+ String objectId = objectNode.get("oid").asText();
+ long objectSize = objectNode.get("size").asLong();
+ objectsResponse.add(getObjectResponse(
+ httpRequest, project, upload, objectId, objectSize));
+ }
+
+ Map<String, Object> batchResponse = new HashMap<>();
+ batchResponse.put("objects", objectsResponse);
+ writeTo(httpResponse, batchResponse);
+ }
+ }
+ }
+ } else if (pathInfo.endsWith("/locks")) {
+ if (httpRequest.getMethod().equals("POST")) {
+ if (SecurityUtils.canWriteCode(project)) {
+ JsonNode lockRequestNode;
+ try (InputStream is = httpRequest.getInputStream()) {
+ lockRequestNode = objectMapper.readTree(is);
+ }
+ String path = lockRequestNode.get("path").asText();
+ GitLfsLock lock = lockManager.find(path);
+ if (lock == null) {
+ lock = new GitLfsLock();
+ lock.setPath(path);
+ lock.setOwner(SecurityUtils.getUser());
+ lockManager.save(lock);
+ httpResponse.setStatus(SC_CREATED);
+ } else {
+ httpResponse.setStatus(SC_CONFLICT);
+ }
+ Map<Object, Object> lockResponse = newHashMap("lock", toMap(lock));
+ if (httpResponse.getStatus() == SC_CONFLICT)
+ lockResponse.put("message", "Lock exists");
+ writeTo(httpResponse, lockResponse);
+ } else {
+ sendAuthorizationError(httpResponse);
+ }
+ } else {
+ if (canReadCode(httpRequest, project)) {
+ String path = httpRequest.getParameter("path");
+
+ Long id = null;
+ String idString = httpRequest.getParameter("id");
+ if (idString != null)
+ id = Long.valueOf(idString);
+
+ int cursor = 0;
+ String cursorString = httpRequest.getParameter("cursor");
+ if (cursorString != null)
+ cursor = Integer.parseInt(cursorString);
+
+ int limit = MAX_PAGE_SIZE;
+ String limitString = httpRequest.getParameter("limit");
+ if (limitString != null)
+ limit = Integer.parseInt(limitString);
+ if (limit > MAX_PAGE_SIZE)
+ limit = MAX_PAGE_SIZE;
+
+ EntityCriteria<GitLfsLock> criteria = EntityCriteria.of(GitLfsLock.class);
+ if (path != null)
+ criteria.add(Restrictions.eq(GitLfsLock.PROP_PATH, path));
+ if (id != null)
+ criteria.add(Restrictions.eq(GitLfsLock.PROP_ID, id));
+
+ List<Map<Object, Object>> locks = new ArrayList<>();
+ for (GitLfsLock lock: lockManager.query(criteria, cursor, limit))
+ locks.add(toMap(lock));
+ Map<Object, Object> locksResponse = newHashMap("locks", locks);
+ if (locks.size() == limit)
+ locksResponse.put("next_cursor", String.valueOf(cursor+limit));
+ writeTo(httpResponse, locksResponse);
+ } else {
+ sendAuthorizationError(httpResponse);
+ }
+ }
+ } else if (pathInfo.endsWith("/locks/verify")) {
+ if (SecurityUtils.canWriteCode(project)) {
+ JsonNode lockVerifyNode;
+ try (InputStream is = httpRequest.getInputStream()) {
+ lockVerifyNode = objectMapper.readTree(is);
+ }
+
+ String path = null;
+ JsonNode pathNode = lockVerifyNode.get("path");
+ if (pathNode != null)
+ path = pathNode.asText();
+
+ Long id = null;
+ JsonNode idNode = lockVerifyNode.get("id");
+ if (idNode != null)
+ id = idNode.asLong();
+
+ int cursor = 0;
+ JsonNode cursorNode = lockVerifyNode.get("cursor");
+ if (cursorNode != null)
+ cursor = cursorNode.intValue();
+
+ int limit = MAX_PAGE_SIZE;
+ JsonNode limitNode = lockVerifyNode.get("limit");
+ if (limitNode != null)
+ limit = limitNode.asInt();
+ if (limit > MAX_PAGE_SIZE)
+ limit = MAX_PAGE_SIZE;
+
+ EntityCriteria<GitLfsLock> criteria = EntityCriteria.of(GitLfsLock.class);
+ if (path != null)
+ criteria.add(Restrictions.eq(GitLfsLock.PROP_PATH, path));
+ if (id != null)
+ criteria.add(Restrictions.eq(GitLfsLock.PROP_ID, id));
+
+ List<Map<Object, Object>> ourLocks = new ArrayList<>();
+ List<Map<Object, Object>> theirLocks = new ArrayList<>();
+
+ for (GitLfsLock lock: lockManager.query(criteria, cursor, limit)) {
+ if (lock.getOwner().equals(SecurityUtils.getUser()))
+ ourLocks.add(toMap(lock));
+ else
+ theirLocks.add(toMap(lock));
+ }
+ Map<Object, Object> verifyResponse = newHashMap(
+ "ours", ourLocks,
+ "theirs", theirLocks);
+ if (ourLocks.size() + theirLocks.size() == limit)
+ verifyResponse.put("next_cursor", String.valueOf(cursor+limit));
+ writeTo(httpResponse, verifyResponse);
+ } else {
+ sendAuthorizationError(httpResponse);
+ }
+ } else if (pathInfo.endsWith("/unlock")) {
+ if (SecurityUtils.canWriteCode(project)) {
+ Long id = Long.valueOf(StringUtils.substringAfterLast(
+ StringUtils.substringBeforeLast(pathInfo, "/"), "/"));
+
+ JsonNode lockDeleteNode;
+ try (InputStream is = httpRequest.getInputStream()) {
+ lockDeleteNode = objectMapper.readTree(is);
+ }
+
+ boolean force = false;
+ JsonNode forceNode = lockDeleteNode.get("force");
+ if (forceNode != null)
+ force = forceNode.asBoolean();
+
+ GitLfsLock lock = lockManager.load(id);
+ if (lock.getOwner().equals(SecurityUtils.getUser())) {
+ lockManager.delete(lock);
+ writeTo(httpResponse, newHashMap("lock", toMap(lock)));
+ } else if (force) {
+ if (SecurityUtils.canManage(project)) {
+ lockManager.delete(lock);
+ writeTo(httpResponse, newHashMap("lock", toMap(lock)));
+ } else {
+ sendBatchError(httpResponse, SC_FORBIDDEN, "Only project managers can unlock forcibly");
+ }
+ } else {
+ sendBatchError(httpResponse, SC_FORBIDDEN, "Lock is created by other users");
+ }
+ } else {
+ sendAuthorizationError(httpResponse);
+ }
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Error handling LFS request", e);
+ sendBatchError(httpResponse, SC_INTERNAL_SERVER_ERROR,
+ "Internal server error, please check server log");
+ } finally {
+ sessionManager.closeSession();
+ }
+ } else {
+ chain.doFilter(request, response);
+ }
+ }
+
+ private void sendAuthorizationError(HttpServletResponse response) {
+ if (SecurityUtils.getUser() != null) {
+ sendBatchError(response, SC_FORBIDDEN, "Permission denied");
+ } else {
+ response.addHeader("LFS-Authenticate", "Basic realm=\"OneDev\"");
+ sendBatchError(response, SC_UNAUTHORIZED, "Authentication required");
+ }
+ }
+
+ private void writeTo(HttpServletResponse response, Object object) {
+ try (OutputStream os = response.getOutputStream()) {
+ os.write(objectMapper.writeValueAsBytes(object));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private Map<Object, Object> toMap(GitLfsLock lock) {
+ return newHashMap(
+ "id", String.valueOf(lock.getId()),
+ "path", lock.getPath(),
+ "locked_at", new SimpleDateFormat(DATETIME_FORMAT).format(lock.getDate()),
+ "owner", newHashMap(
+ "name", lock.getOwner().getDisplayName()));
+ }
+
+ private Map<Object, Object> getActionResponse(HttpServletRequest request, Project project, String objectId) {
+ Map<Object, Object> actionResponse = newHashMap(
+ "href", getObjectUrl(request, project.getName(), objectId));
+ User user = SecurityUtils.getUser();
+ if (user != null)
+ actionResponse.put(
+ "header", newHashMap(
+ "Authorization", KubernetesHelper.BEARER + " " + user.getAccessToken()));
+ return actionResponse;
+ }
+
+ private Map<String, Object> getObjectResponse(HttpServletRequest request, Project project, boolean upload,
+ String objectId, long objectSize) {
+ Map<String, Object> objectResponse = new HashMap<>();
+ objectResponse.put("oid", objectId);
+ objectResponse.put("size", objectSize);
+ if (objectSize > getMaxLFSFileSize()) {
+ objectResponse.put("error", newHashMap(
+ "code", SC_NOT_ACCEPTABLE,
+ "message", "Exceeded max acceptable LFS file size " + getMaxLFSFileSize()));
+ } else if (upload) {
+ if (!project.isLfsObjectExists(objectId)) {
+ objectResponse.put(
+ "actions", newHashMap(
+ "upload", getActionResponse(request, project, objectId)));
+ }
+ } else if (project.isLfsObjectExists(objectId)) {
+ objectResponse.put(
+ "actions", newHashMap(
+ "download", getActionResponse(request, project, objectId)));
+ } else {
+ objectResponse.put("error", newHashMap(
+ "code", SC_NOT_FOUND,
+ "message", "Object not found"));
+ }
+ return objectResponse;
+ }
+
+ private void sendBatchError(HttpServletResponse response, int statusCode, String errorMessage) {
+ response.setContentType(CONTENT_TYPE);
+ response.setStatus(statusCode);
+ Map<String, String> batchResponse = new HashMap<>();
+ batchResponse.put("message", errorMessage);
+ writeTo(response, batchResponse);
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ private static class LfsObjectAccess {
+
+ final File file;
+
+ final Lock lock;
+
+ LfsObjectAccess(File file, Lock lock) {
+ this.file = file;
+ this.lock = lock;
+ }
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java
new file mode 100644
index 0000000000..64d491d3de
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommand.java
@@ -0,0 +1,197 @@
+package io.onedev.server.git;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.net.InetSocketAddress;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Future;
+
+import javax.annotation.Nullable;
+
+import org.apache.shiro.util.ThreadContext;
+import org.apache.sshd.common.channel.ChannelOutputStream;
+import org.apache.sshd.server.Environment;
+import org.apache.sshd.server.ExitCallback;
+import org.apache.sshd.server.channel.ChannelSession;
+import org.apache.sshd.server.command.Command;
+import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.server.session.ServerSessionAware;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.command.ExecutionResult;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.ssh.SshAuthenticator;
+import io.onedev.server.util.InputStreamWrapper;
+import io.onedev.server.util.OutputStreamWrapper;
+import io.onedev.server.util.ServerConfig;
+import io.onedev.server.util.concurrent.WorkExecutor;
+import io.onedev.server.util.concurrent.PrioritizedRunnable;
+
+abstract class GitSshCommand implements Command, ServerSessionAware {
+
+ private static final int PRIORITY = 2;
+
+ private static final Logger logger = LoggerFactory.getLogger(GitSshCommand.class);
+
+ final String command;
+
+ InputStream in;
+
+ OutputStream out;
+
+ OutputStream err;
+
+ ExitCallback callback;
+
+ ServerSession session;
+
+ Future<?> future;
+
+ GitSshCommand(String command) {
+ this.command = command;
+ }
+
+ private Map<String, String> buildGitEnvs(Project project) {
+ Map<String, String> environments = new HashMap<>();
+
+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
+ String serverUrl;
+ if (serverConfig.getHttpPort() != 0)
+ serverUrl = "http://localhost:" + serverConfig.getHttpPort();
+ else
+ serverUrl = "https://localhost:" + serverConfig.getHttpsPort();
+
+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);
+ environments.put("ONEDEV_CURL", settingManager.getSystemSetting().getCurlConfig().getExecutable());
+ environments.put("ONEDEV_URL", serverUrl);
+ environments.put("ONEDEV_USER_ID", SecurityUtils.getUserId().toString());
+ environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
+ return environments;
+ }
+
+ @Override
+ public void start(ChannelSession channel, Environment env) throws IOException {
+ SshAuthenticator authenticator = OneDev.getInstance(SshAuthenticator.class);
+ ThreadContext.bind(SecurityUtils.asSubject(authenticator.getPublicKeyOwnerId(session)));
+
+ File gitDir;
+ Map<String, String> gitEnvs;
+
+ SessionManager sessionManager = OneDev.getInstance(SessionManager.class);
+ sessionManager.openSession();
+ try {
+ String projectName = StringUtils.stripEnd(StringUtils.substringAfterLast(command, "/"), "'");
+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);
+ if (project == null) {
+ onExit(-1, "Unable to find project " + projectName);
+ return;
+ }
+
+ String errorMessage = checkPermission(project);
+ if (errorMessage != null) {
+ onExit(-1, errorMessage);
+ return;
+ }
+
+ gitDir = project.getGitDir();
+ gitEnvs = buildGitEnvs(project);
+ } finally {
+ sessionManager.closeSession();
+ }
+
+ InetSocketAddress address = (InetSocketAddress) session.getRemoteAddress();
+ String groupId = "git-over-ssh-" + gitDir.getAbsolutePath()
+ + "-" + address.getAddress().getHostAddress();
+
+ WorkExecutor workExecutor = OneDev.getInstance(WorkExecutor.class);
+ future = workExecutor.submit(groupId, new PrioritizedRunnable(PRIORITY) {
+
+ @Override
+ public void run() {
+ try {
+ ExecutionResult result = execute(gitDir, gitEnvs);
+ onExit(result.getReturnCode(), null);
+ } catch (Exception e) {
+ logger.error("Error executing git command", e);
+ onExit(-1, e.getMessage());
+ }
+ }
+
+ });
+
+ }
+
+ @Nullable
+ protected abstract String checkPermission(Project project);
+
+ protected abstract ExecutionResult execute(File gitDir, Map<String, String> gitEnvs);
+
+ @Override
+ public void destroy(ChannelSession channel) throws Exception {
+ if (future != null)
+ future.cancel(true);
+ }
+
+ protected void onExit(int exitValue, @Nullable String errorMessage) {
+ if (errorMessage != null)
+ new PrintStream(err).println("ERROR: " + errorMessage);
+ callback.onExit(exitValue);
+ }
+
+ @Override
+ public void setInputStream(InputStream in) {
+ this.in = new InputStreamWrapper(in) {
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ };
+ }
+
+ @Override
+ public void setOutputStream(OutputStream out) {
+ this.out = new OutputStreamWrapper(out) {
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ };
+ ((ChannelOutputStream) out).setNoDelay(true);
+ }
+
+ @Override
+ public void setErrorStream(OutputStream err) {
+ this.err = new OutputStreamWrapper(err) {
+
+ @Override
+ public void close() throws IOException {
+ }
+
+ };
+ ((ChannelOutputStream) err).setNoDelay(true);
+ }
+
+ @Override
+ public void setExitCallback(ExitCallback callBack) {
+ this.callback = callBack;
+ }
+
+ @Override
+ public void setSession(ServerSession session) {
+ this.session = session;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java
index b16e828169..8b3b6524e2 100644
--- a/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java
+++ b/server-core/src/main/java/io/onedev/server/git/GitSshCommandCreator.java
@@ -1,73 +1,26 @@
package io.onedev.server.git;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintStream;
-import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.Future;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
import javax.inject.Singleton;
-import org.apache.shiro.util.ThreadContext;
-import org.apache.sshd.common.channel.ChannelOutputStream;
-import org.apache.sshd.server.Environment;
-import org.apache.sshd.server.ExitCallback;
-import org.apache.sshd.server.channel.ChannelSession;
import org.apache.sshd.server.command.Command;
-import org.apache.sshd.server.session.ServerSession;
-import org.apache.sshd.server.session.ServerSessionAware;
import org.eclipse.jgit.transport.RemoteConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.command.ExecutionResult;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.git.command.ReceivePackCommand;
import io.onedev.server.git.command.UploadPackCommand;
import io.onedev.server.model.Project;
-import io.onedev.server.persistence.SessionManager;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.ssh.SshAuthenticator;
import io.onedev.server.ssh.SshCommandCreator;
-import io.onedev.server.util.ServerConfig;
-import io.onedev.server.util.concurrent.PrioritizedRunnable;
-import io.onedev.server.util.work.WorkExecutor;
@Singleton
public class GitSshCommandCreator implements SshCommandCreator {
- private static final Logger logger = LoggerFactory.getLogger(GitSshCommandCreator.class);
-
- private final ServerConfig serverConfig;
-
- private final SettingManager settingManager;
-
- private final ProjectManager projectManager;
-
- private final SessionManager sessionManager;
-
- private final SshAuthenticator authenticator;
-
- private final WorkExecutor workExecutor;
-
- @Inject
- public GitSshCommandCreator(ServerConfig serverConfig, SettingManager settingManager,
- ProjectManager projectManager, SessionManager sessionManager,
- WorkExecutor workExecutor, SshAuthenticator authenticator) {
- this.serverConfig = serverConfig;
- this.settingManager = settingManager;
- this.projectManager = projectManager;
- this.sessionManager = sessionManager;
- this.workExecutor = workExecutor;
- this.authenticator = authenticator;
- }
+ static final Logger logger = LoggerFactory.getLogger(GitSshCommandCreator.class);
@Override
public Command createCommand(String command) {
@@ -77,9 +30,9 @@ public class GitSshCommandCreator implements SshCommandCreator {
@Override
protected ExecutionResult execute(File gitDir, Map<String, String> gitEnvs) {
return new UploadPackCommand(gitDir, gitEnvs)
- .stdin(inputStream)
- .stdout(outputStream)
- .stderr(errorStream)
+ .stdin(in)
+ .stdout(out)
+ .stderr(err)
.call();
}
@@ -98,9 +51,9 @@ public class GitSshCommandCreator implements SshCommandCreator {
@Override
protected ExecutionResult execute(File gitDir, Map<String, String> gitEnvs) {
return new ReceivePackCommand(gitDir, gitEnvs)
- .stdin(inputStream)
- .stdout(outputStream)
- .stderr(errorStream)
+ .stdin(in)
+ .stdout(out)
+ .stderr(err)
.call();
}
@@ -113,137 +66,11 @@ public class GitSshCommandCreator implements SshCommandCreator {
}
};
+ } else if (command.startsWith(LfsAuthenticateCommand.COMMAND_PREFIX)) {
+ return new LfsAuthenticateCommand(command);
} else {
return null;
}
}
-
- private abstract class GitSshCommand implements Command, ServerSessionAware {
-
- private static final int PRIORITY = 2;
-
- final String command;
-
- InputStream inputStream;
-
- OutputStream outputStream;
-
- OutputStream errorStream;
-
- ExitCallback exitCallBack;
-
- ServerSession session;
-
- Future<?> commandFuture;
-
- GitSshCommand(String command) {
- this.command = command;
- }
-
- private Map<String, String> buildGitEnvs(Project project) {
- Map<String, String> environments = new HashMap<>();
-
- String serverUrl;
- if (serverConfig.getHttpPort() != 0)
- serverUrl = "http://localhost:" + serverConfig.getHttpPort();
- else
- serverUrl = "https://localhost:" + serverConfig.getHttpsPort();
-
- environments.put("ONEDEV_CURL", settingManager.getSystemSetting().getCurlConfig().getExecutable());
- environments.put("ONEDEV_URL", serverUrl);
- environments.put("ONEDEV_USER_ID", SecurityUtils.getUserId().toString());
- environments.put("ONEDEV_REPOSITORY_ID", project.getId().toString());
- return environments;
- }
-
- @Override
- public void start(ChannelSession channel, Environment env) throws IOException {
- ThreadContext.bind(SecurityUtils.asSubject(authenticator.getPublicKeyOwnerId(session)));
-
- File gitDir;
- Map<String, String> gitEnvs;
-
- sessionManager.openSession();
- try {
- String projectName = StringUtils.stripEnd(StringUtils.substringAfterLast(command, "/"), "'");
- Project project = projectManager.find(projectName);
- if (project == null) {
- onExit(-1, "Unable to find project " + projectName);
- return;
- }
-
- String errorMessage = checkPermission(project);
- if (errorMessage != null) {
- onExit(-1, errorMessage);
- return;
- }
-
- gitDir = project.getGitDir();
- gitEnvs = buildGitEnvs(project);
- } finally {
- sessionManager.closeSession();
- }
-
- commandFuture = workExecutor.submit(new PrioritizedRunnable(PRIORITY) {
-
- @Override
- public void run() {
- try {
- ExecutionResult result = execute(gitDir, gitEnvs);
- onExit(result.getReturnCode(), null);
- } catch (Exception e) {
- logger.error("Error executing git command", e);
- onExit(-1, e.getMessage());
- }
- }
-
- });
-
- }
-
- @Nullable
- protected abstract String checkPermission(Project project);
-
- protected abstract ExecutionResult execute(File gitDir, Map<String, String> gitEnvs);
-
- @Override
- public void destroy(ChannelSession channel) throws Exception {
- if (commandFuture != null)
- commandFuture.cancel(true);
- }
-
- protected void onExit(int exitValue, @Nullable String errorMessage) {
- if (errorMessage != null)
- new PrintStream(errorStream).println("ERROR: " + errorMessage);
- exitCallBack.onExit(exitValue);
- }
-
- @Override
- public void setInputStream(InputStream inputStream) {
- this.inputStream = inputStream;
- }
-
- @Override
- public void setOutputStream(OutputStream outputStream) {
- this.outputStream = outputStream;
- ((ChannelOutputStream) this.outputStream).setNoDelay(true);
- }
-
- @Override
- public void setErrorStream(OutputStream errorStream) {
- this.errorStream = errorStream;
- ((ChannelOutputStream) this.errorStream).setNoDelay(true);
- }
-
- @Override
- public void setExitCallback(ExitCallback exitCallBack) {
- this.exitCallBack = exitCallBack;
- }
-
- @Override
- public void setSession(ServerSession session) {
- this.session = session;
- }
-
- }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.java b/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.java
new file mode 100644
index 0000000000..5720b0feee
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/LfsAuthenticateCommand.java
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on 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 io.onedev.server.git;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.PrintStream;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+
+import org.apache.sshd.server.Environment;
+import org.apache.sshd.server.ExitCallback;
+import org.apache.sshd.server.channel.ChannelSession;
+import org.apache.sshd.server.command.Command;
+import org.apache.sshd.server.session.ServerSession;
+import org.apache.sshd.server.session.ServerSessionAware;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.k8shelper.KubernetesHelper;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UrlManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.persistence.SessionManager;
+import io.onedev.server.ssh.SshAuthenticator;
+import io.onedev.server.util.CollectionUtils;
+
+public class LfsAuthenticateCommand implements Command, ServerSessionAware {
+
+ static final String COMMAND_PREFIX = "git-lfs-authenticate";
+
+ private static final Logger logger = LoggerFactory.getLogger(LfsAuthenticateCommand.class);
+
+ private final String command;
+
+ private OutputStream out;
+
+ private OutputStream err;
+
+ private ExitCallback callback;
+
+ private ServerSession session;
+
+ LfsAuthenticateCommand(String command) {
+ this.command = command;
+ }
+
+ @Override
+ public void setInputStream(InputStream in) {
+ }
+
+ @Override
+ public void setOutputStream(OutputStream out) {
+ this.out = out;
+ }
+
+ @Override
+ public void setErrorStream(OutputStream err) {
+ this.err = err;
+ }
+
+ @Override
+ public void setExitCallback(ExitCallback callback) {
+ this.callback = callback;
+ }
+
+ @Override
+ public void start(ChannelSession channel, Environment env) throws IOException {
+ SshAuthenticator authenticator = OneDev.getInstance(SshAuthenticator.class);
+ Long userId = authenticator.getPublicKeyOwnerId(session);
+ OneDev.getInstance(ExecutorService.class).submit(new Runnable() {
+
+ @Override
+ public void run() {
+ SessionManager sessionManager = OneDev.getInstance(SessionManager.class);
+ sessionManager.openSession();
+ try {
+ String accessToken = OneDev.getInstance(UserManager.class).load(userId).getAccessToken();
+ String projectName = StringUtils.substringBefore(command.substring(COMMAND_PREFIX.length()+1), " ");
+ Project project = OneDev.getInstance(ProjectManager.class).find(projectName);
+ if (project == null)
+ throw new ExplicitException("Project not found: " + projectName);
+ String url = OneDev.getInstance(UrlManager.class).cloneUrlFor(project, false);
+ Map<Object, Object> response = CollectionUtils.newHashMap(
+ "href", url + ".git/info/lfs",
+ "header", CollectionUtils.newHashMap(
+ "Authorization", KubernetesHelper.BEARER + " " + accessToken));
+ out.write(OneDev.getInstance(ObjectMapper.class).writeValueAsBytes(response));
+ callback.onExit(0);
+ } catch (Exception e) {
+ logger.error("Error executing " + COMMAND_PREFIX, e);
+ new PrintStream(err).println("Check server log for details");
+ callback.onExit(-1);
+ } finally {
+ sessionManager.closeSession();
+ }
+ }
+
+ });
+ }
+
+ @Override
+ public void destroy(ChannelSession channel) {
+
+ }
+
+ @Override
+ public void setSession(ServerSession session) {
+ this.session = session;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/LfsPointer.java b/server-core/src/main/java/io/onedev/server/git/LfsPointer.java
new file mode 100644
index 0000000000..169de7f538
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/git/LfsPointer.java
@@ -0,0 +1,26 @@
+package io.onedev.server.git;
+
+import java.io.Serializable;
+
+public class LfsPointer implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String objectId;
+
+ private final long objectSize;
+
+ public LfsPointer(String objectId, long objectSize) {
+ this.objectId = objectId;
+ this.objectSize = objectSize;
+ }
+
+ public String getObjectId() {
+ return objectId;
+ }
+
+ public long getObjectSize() {
+ return objectSize;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java b/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java
index ebda4c7151..ddc6ef4de0 100644
--- a/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java
+++ b/server-core/src/main/java/io/onedev/server/git/config/SystemGit.java
@@ -1,5 +1,9 @@
package io.onedev.server.git.config;
+import java.io.File;
+
+import org.apache.commons.lang3.SystemUtils;
+
import io.onedev.server.web.editable.annotation.Editable;
@Editable(name="Use git in System Path", order=100)
@@ -9,7 +13,10 @@ public class SystemGit extends GitConfig {
@Override
public String getExecutable() {
- return "git";
+ if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/git").exists())
+ return "/usr/local/bin/git";
+ else
+ return "git";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
index e663db71aa..5155fcf66c 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultCommitInfoManager.java
@@ -70,10 +70,10 @@ import io.onedev.server.util.ElementPumper;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.NameAndEmail;
import io.onedev.server.util.Pair;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
import io.onedev.server.util.facade.UserFacade;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.BatchWorker;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
import jetbrains.exodus.backup.BackupStrategy;
diff --git a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java
index 0528a6fc60..627b1ef04a 100644
--- a/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java
+++ b/server-core/src/main/java/io/onedev/server/infomanager/DefaultPullRequestInfoManager.java
@@ -29,9 +29,9 @@ import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.BatchWorker;
import jetbrains.exodus.ArrayByteIterable;
import jetbrains.exodus.ByteIterable;
import jetbrains.exodus.env.Environment;
diff --git a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
index 83af0dab27..068483570e 100644
--- a/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
+++ b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
@@ -29,7 +29,7 @@ import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.Agent;
import io.onedev.server.model.Setting;
-import io.onedev.server.model.support.administration.SystemSetting;
+import io.onedev.server.model.support.administration.PerformanceSetting;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
@@ -64,8 +64,10 @@ public class DefaultResourceManager implements ResourceManager {
@Listen
public synchronized void on(SystemStarted event) {
Map<String, Integer> resources = new HashMap<>();
- resources.put(ResourceHolder.CPU, settingManager.getSystemSetting().getCpu());
- resources.put(ResourceHolder.MEMORY, settingManager.getSystemSetting().getMemory());
+ resources.put(ResourceHolder.CPU,
+ settingManager.getPerformanceSetting().getServerJobExecutorCpuQuota());
+ resources.put(ResourceHolder.MEMORY,
+ settingManager.getPerformanceSetting().getServerJobExecutorMemoryQuota());
serverResourceHolder = new ResourceHolder(resources);
Query<?> query = dao.getSession().createQuery(String.format("select id, %s from Agent", Agent.PROP_PAUSED));
@@ -99,11 +101,13 @@ public class DefaultResourceManager implements ResourceManager {
public void on(EntityPersisted event) {
if (serverResourceHolder != null && event.getEntity() instanceof Setting) {
Setting setting = (Setting) event.getEntity();
- if (setting.getKey() == Setting.Key.SYSTEM) {
- SystemSetting systemSetting = (SystemSetting) setting.getValue();
+ if (setting.getKey() == Setting.Key.PERFORMANCE) {
+ PerformanceSetting performanceSetting = (PerformanceSetting) setting.getValue();
synchronized (this) {
- serverResourceHolder.updateTotalResource(ResourceHolder.CPU, systemSetting.getCpu());
- serverResourceHolder.updateTotalResource(ResourceHolder.MEMORY, systemSetting.getMemory());
+ serverResourceHolder.updateTotalResource(ResourceHolder.CPU,
+ performanceSetting.getServerJobExecutorCpuQuota());
+ serverResourceHolder.updateTotalResource(ResourceHolder.MEMORY,
+ performanceSetting.getServerJobExecutorMemoryQuota());
notifyAll();
}
}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
index 0d68d08dd9..ef8165151e 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java
@@ -48,6 +48,7 @@ import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
import io.onedev.server.model.support.administration.MailSetting;
+import io.onedev.server.model.support.administration.PerformanceSetting;
import io.onedev.server.model.support.administration.SecuritySetting;
import io.onedev.server.model.support.administration.ServiceDeskSetting;
import io.onedev.server.model.support.administration.SshSetting;
@@ -155,7 +156,7 @@ public class DefaultDataManager implements DataManager, Serializable {
systemSetting = (SystemSetting) setting.getValue();
}
if (systemSetting != null) {
- Collection<String> excludedProps = Sets.newHashSet("gravatarEnabled", "cpu", "memory");
+ Collection<String> excludedProps = Sets.newHashSet("maxGitLFSFileSize", "gravatarEnabled", "cpu", "memory");
if (Bootstrap.isInDocker()) {
excludedProps.add("gitConfig");
excludedProps.add("curlConfig");
@@ -194,6 +195,10 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null) {
settingManager.saveIssueSetting(new GlobalIssueSetting());
}
+ setting = settingManager.getSetting(Key.PERFORMANCE);
+ if (setting == null) {
+ settingManager.savePerformanceSetting(new PerformanceSetting());
+ }
setting = settingManager.getSetting(Key.AUTHENTICATOR);
if (setting == null) {
settingManager.saveAuthenticator(null);
diff --git a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
index 1a218c884f..60c00a5cd8 100644
--- a/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
+++ b/server-core/src/main/java/io/onedev/server/migration/DataMigrator.java
@@ -34,6 +34,8 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.model.User;
import io.onedev.server.util.Pair;
+import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
@Singleton
@SuppressWarnings("unused")
@@ -2771,7 +2773,6 @@ public class DataMigrator {
}
}
- @SuppressWarnings("restriction")
private void migrate62(File dataDir, Stack<Integer> versions) {
for (File file: dataDir.listFiles()) {
if (file.getName().startsWith("Settings.xml")) {
@@ -2781,12 +2782,10 @@ public class DataMigrator {
if (key.equals("SYSTEM")) {
Element valueElement = element.element("value");
if (valueElement != null) {
- int cpu = Runtime.getRuntime().availableProcessors()*1000;
+ HardwareAbstractionLayer hardware = new SystemInfo().getHardware();
+ int cpu = hardware.getProcessor().getLogicalProcessorCount()*1000;
valueElement.addElement("cpu").setText(String.valueOf(cpu));
-
- com.sun.management.OperatingSystemMXBean os = (com.sun.management.OperatingSystemMXBean)
- java.lang.management.ManagementFactory.getOperatingSystemMXBean();
- int memory = (int)(os.getTotalPhysicalMemorySize()/1024/1024);
+ int memory = (int) (hardware.getMemory().getTotal()/1024/1024);
valueElement.addElement("memory").setText(String.valueOf(memory));
}
} else if (key.equals("JOB_EXECUTORS")) {
@@ -2978,4 +2977,20 @@ public class DataMigrator {
}
}
+ private void migrate64(File dataDir, Stack<Integer> versions) {
+ for (File file: dataDir.listFiles()) {
+ if (file.getName().startsWith("Settings.xml")) {
+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);
+ for (Element element: dom.getRootElement().elements()) {
+ String key = element.elementTextTrim("key");
+ if (key.equals("SYSTEM")) {
+ Element valueElement = element.element("value");
+ if (valueElement != null)
+ valueElement.addElement("maxGitLFSFileSize").setText("4096");
+ }
+ }
+ dom.writeToFile(file, false);
+ }
+ }
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java b/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java
new file mode 100644
index 0000000000..acdd5eda1f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/GitLfsLock.java
@@ -0,0 +1,69 @@
+package io.onedev.server.model;
+
+import static io.onedev.server.model.GitLfsLock.PROP_PATH;
+
+import java.util.Date;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+/**
+ * @author robin
+ *
+ */
+@Entity
+@Table(
+ indexes={@Index(columnList="o_owner_id"), @Index(columnList=PROP_PATH)})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
+@Editable
+public class GitLfsLock extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_PATH = "path";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private User owner;
+
+ @Column(nullable=false, unique=true)
+ private String path;
+
+ @Column(nullable=false)
+ private Date date = new Date();
+
+ public User getOwner() {
+ return owner;
+ }
+
+ public void setOwner(User owner) {
+ this.owner = owner;
+ }
+
+ public String getPath() {
+ return path;
+ }
+
+ public void setPath(String path) {
+ this.path = path;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
+ public void setDate(Date date) {
+ this.date = date;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index 85157d9288..66d1c72b2e 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -4,7 +4,10 @@ import static io.onedev.server.model.Project.PROP_NAME;
import static io.onedev.server.model.Project.PROP_UPDATE_DATE;
import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
import java.io.FileOutputStream;
+import java.io.FilterInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -22,6 +25,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.Stack;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.stream.Collectors;
@@ -40,6 +44,7 @@ import javax.validation.Validator;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.shiro.authz.Permission;
+import org.apache.tika.mime.MediaType;
import org.eclipse.jgit.api.CreateBranchCommand;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.TagCommand;
@@ -120,6 +125,7 @@ import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.AttachmentTooLargeException;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.ComponentContext;
+import io.onedev.server.util.ContentDetector;
import io.onedev.server.util.NameAware;
import io.onedev.server.util.StatusInfo;
import io.onedev.server.util.diff.WhitespaceOption;
@@ -1590,4 +1596,69 @@ public class Project extends AbstractEntity implements NameAware {
contributedSettings.put(settingClass.getName(), setting);
}
+ public File getLfsObjectsDir() {
+ return new File(getGitDir(), "lfs/objects");
+ }
+
+ public File getLfsObjectFile(String objectId) {
+ File objectDir = new File(getLfsObjectsDir(), objectId.substring(0, 2) + "/" + objectId.substring(2, 4));
+ Lock lock = LockUtils.getLock("lfs-storage:" + getGitDir().getAbsolutePath());
+ lock.lock();
+ try {
+ FileUtils.createDir(objectDir);
+ } finally {
+ lock.unlock();
+ }
+ return new File(objectDir, objectId);
+ }
+
+ public ReadWriteLock getLfsObjectLock(String objectId) {
+ return LockUtils.getReadWriteLock("lfs-objects:" + objectId);
+ }
+
+ public boolean isLfsObjectExists(String objectId) {
+ Lock readLock = getLfsObjectLock(objectId).readLock();
+ readLock.lock();
+ try {
+ return getLfsObjectFile(objectId).exists();
+ } finally {
+ readLock.unlock();
+ }
+ }
+
+ public InputStream getLfsObjectInputStream(String objectId) {
+ Lock readLock = getLfsObjectLock(objectId).readLock();
+ readLock.lock();
+ try {
+ return new FilterInputStream(new FileInputStream(getLfsObjectFile(objectId))) {
+
+ @Override
+ public void close() throws IOException {
+ super.close();
+ readLock.unlock();
+ }
+
+ };
+ } catch (FileNotFoundException e) {
+ readLock.unlock();
+ throw new RuntimeException(e);
+ }
+ }
+
+ public MediaType detectLfsObjectMediaType(String objectId, String fileName) {
+ try (InputStream is = getLfsObjectInputStream(objectId)) {
+ return ContentDetector.detectMediaType(is, fileName);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public MediaType detectMediaType(BlobIdent blobIdent) {
+ Blob blob = getBlob(blobIdent, true);
+ if (blob.getLfsPointer() != null)
+ return detectLfsObjectMediaType(blob.getLfsPointer().getObjectId(), blobIdent.getName());
+ else
+ return blob.getMediaType();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.java
index c3f2e47063..815f61b2c0 100644
--- a/server-core/src/main/java/io/onedev/server/model/Setting.java
+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java
@@ -23,7 +23,7 @@ public class Setting extends AbstractEntity {
public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS,
GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, SSO_CONNECTORS,
NOTIFICATION_TEMPLATE_SETTING, CONTRIBUTED_SETTINGS, SERVICE_DESK_SETTING,
- AGENT};
+ AGENT, PERFORMANCE};
@Column(nullable=false, unique=true)
private Key key;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java
new file mode 100644
index 0000000000..68555cdaf5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/PerformanceSetting.java
@@ -0,0 +1,60 @@
+package io.onedev.server.model.support.administration;
+
+import java.io.Serializable;
+
+import io.onedev.server.web.editable.annotation.Editable;
+import oshi.SystemInfo;
+import oshi.hardware.HardwareAbstractionLayer;
+
+@Editable
+public class PerformanceSetting implements Serializable {
+
+ private static final long serialVersionUID = 1;
+
+ private int cpuIntensiveTaskConcurrency;
+
+ private int serverJobExecutorCpuQuota;
+
+ private int serverJobExecutorMemoryQuota;
+
+ public PerformanceSetting() {
+ HardwareAbstractionLayer hardware = new SystemInfo().getHardware();
+ cpuIntensiveTaskConcurrency = hardware.getProcessor().getLogicalProcessorCount();
+ serverJobExecutorCpuQuota = hardware.getProcessor().getLogicalProcessorCount()*1000;
+ serverJobExecutorMemoryQuota = (int) (hardware.getMemory().getTotal()/1024/1024);
+ }
+
+ @Editable(order=100, name="CPU Intensive Task Concurrency", description="Specify max concurrent CPU intensive "
+ + "tasks, such as Git repository pull/push, repository index, etc.")
+ public int getCpuIntensiveTaskConcurrency() {
+ return cpuIntensiveTaskConcurrency;
+ }
+
+ public void setCpuIntensiveTaskConcurrency(int cpuIntensiveTaskConcurrency) {
+ this.cpuIntensiveTaskConcurrency = cpuIntensiveTaskConcurrency;
+ }
+
+ @Editable(order=400, name="Server Job Executor CPU Quota", description="Specify CPU quota to run build jobs "
+ + "on server (via server docker/shell executor). This is normally <i>(CPU cores)*1000</i>, for "
+ + "instance <i>4000</i> means 4 CPU cores. CPU requirements of all build jobs running on server "
+ + "will be limited by this quota")
+ public int getServerJobExecutorCpuQuota() {
+ return serverJobExecutorCpuQuota;
+ }
+
+ public void setServerJobExecutorCpuQuota(int serverJobExecutorCpuQuota) {
+ this.serverJobExecutorCpuQuota = serverJobExecutorCpuQuota;
+ }
+
+ @Editable(order=500, name="Server Job Executor Memory Quota", description="Specify memory quota in mega bytes "
+ + "to run builds jobs on server (via server docker/shell executor). Memory requirements of all build "
+ + "jobs running on server will be limited by this quota")
+ public int getServerJobExecutorMemoryQuota() {
+ return serverJobExecutorMemoryQuota;
+ }
+
+ public void setServerJobExecutorMemoryQuota(int serverJobExecutorMemoryQuota) {
+ this.serverJobExecutorMemoryQuota = serverJobExecutorMemoryQuota;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
index f1a6911d83..3bea693a59 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/SystemSetting.java
@@ -29,20 +29,9 @@ public class SystemSetting implements Serializable, Validatable {
private CurlConfig curlConfig = new SystemCurl();
- private boolean gravatarEnabled;
-
- private int cpu;
-
- private int memory;
+ private int maxGitLFSFileSize = 4096;
- @SuppressWarnings("restriction")
- public SystemSetting() {
- cpu = Runtime.getRuntime().availableProcessors()*1000;
-
- com.sun.management.OperatingSystemMXBean os = (com.sun.management.OperatingSystemMXBean)
- java.lang.management.ManagementFactory.getOperatingSystemMXBean();
- memory = (int)(os.getTotalPhysicalMemorySize()/1024/1024);
- }
+ private boolean gravatarEnabled;
@Editable(name="Server URL", order=90, description="Specify root URL to access this server")
@NotEmpty
@@ -54,8 +43,9 @@ public class SystemSetting implements Serializable, Validatable {
this.serverUrl = serverUrl;
}
- @Editable(order=200, description="OneDev requires git command line to manage repositories. The minimum "
- + "required version is 2.11.1")
+ @Editable(order=200, name="Git Command Line", description="OneDev requires git command line to manage repositories. The minimum "
+ + "required version is 2.11.1. Also make sure that git-lfs is installed if you want to retrieve "
+ + "LFS files in CI/CD job")
@Valid
@NotNull(message="may not be empty")
public GitConfig getGitConfig() {
@@ -66,7 +56,7 @@ public class SystemSetting implements Serializable, Validatable {
this.gitConfig = gitConfig;
}
- @Editable(order=250, description="OneDev configures git hooks to communicate with itself via curl")
+ @Editable(order=250, name="CURL Command Line", description="OneDev configures git hooks to communicate with itself via curl")
@Valid
@NotNull(message="may not be empty")
public CurlConfig getCurlConfig() {
@@ -77,6 +67,15 @@ public class SystemSetting implements Serializable, Validatable {
this.curlConfig = curlConfig;
}
+ @Editable(order=275, name="Max Git LFS File Size", description="Specify max git LFS file size in mega bytes")
+ public int getMaxGitLFSFileSize() {
+ return maxGitLFSFileSize;
+ }
+
+ public void setMaxGitLFSFileSize(int maxGitLFSFileSize) {
+ this.maxGitLFSFileSize = maxGitLFSFileSize;
+ }
+
@Editable(order=300, description="Whether or not to enable user gravatar (https://gravatar.com)")
public boolean isGravatarEnabled() {
return gravatarEnabled;
@@ -86,27 +85,6 @@ public class SystemSetting implements Serializable, Validatable {
this.gravatarEnabled = gravatarEnabled;
}
- @Editable(order=400, name="Server CPU", description="Specify CPU capability in millis available to run builds "
- + "on server (via server docker/shell executor). This is normally <i>(CPU cores)*1000</i>, for "
- + "instance <i>4000</i> means 4 CPU cores")
- public int getCpu() {
- return cpu;
- }
-
- public void setCpu(int cpu) {
- this.cpu = cpu;
- }
-
- @Editable(order=500, name="Server Memory", description="Specify physical memory in mega bytes available to run "
- + "builds on server (via server docker/shell executor)")
- public int getMemory() {
- return memory;
- }
-
- public void setMemory(int memory) {
- this.memory = memory;
- }
-
@Override
public boolean isValid(ConstraintValidatorContext context) {
if (serverUrl != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java b/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
index 012043f591..de6ae5e345 100644
--- a/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
+++ b/server-core/src/main/java/io/onedev/server/search/code/DefaultIndexManager.java
@@ -83,9 +83,9 @@ import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.ContentDetector;
import io.onedev.server.util.IndexResult;
+import io.onedev.server.util.concurrent.BatchWorkManager;
+import io.onedev.server.util.concurrent.BatchWorker;
import io.onedev.server.util.concurrent.Prioritized;
-import io.onedev.server.util.work.BatchWorkManager;
-import io.onedev.server.util.work.BatchWorker;
@Singleton
public class DefaultIndexManager implements IndexManager {
diff --git a/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java b/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java
index d34cb9e954..1f048af84a 100644
--- a/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/DefaultJobLogManager.java
@@ -140,7 +140,6 @@ public class DefaultJobLogManager implements JobLogManager {
throw new RuntimeException(e);
}
}
-
webSocketManager.notifyObservableChange(Build.getLogWebSocketObservable(buildId));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/InputStreamWrapper.java b/server-core/src/main/java/io/onedev/server/util/InputStreamWrapper.java
new file mode 100644
index 0000000000..2b813bdb1b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/InputStreamWrapper.java
@@ -0,0 +1,59 @@
+package io.onedev.server.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+public class InputStreamWrapper extends InputStream {
+
+ private final InputStream delegate;
+
+ public InputStreamWrapper(InputStream delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public int read() throws IOException {
+ return delegate.read();
+ }
+
+ @Override
+ public int read(byte[] b) throws IOException {
+ return delegate.read(b);
+ }
+
+ @Override
+ public int read(byte[] b, int off, int len) throws IOException {
+ return delegate.read(b, off, len);
+ }
+
+ @Override
+ public long skip(long n) throws IOException {
+ return delegate.skip(n);
+ }
+
+ @Override
+ public int available() throws IOException {
+ return delegate.available();
+ }
+
+ @Override
+ public void close() throws IOException {
+ delegate.close();
+ }
+
+ @Override
+ public synchronized void mark(int readlimit) {
+ delegate.mark(readlimit);
+ }
+
+ @Override
+ public synchronized void reset() throws IOException {
+ delegate.reset();
+ }
+
+ @Override
+ public boolean markSupported() {
+ return delegate.markSupported();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/OutputStreamWrapper.java b/server-core/src/main/java/io/onedev/server/util/OutputStreamWrapper.java
new file mode 100644
index 0000000000..b3cc665a70
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/OutputStreamWrapper.java
@@ -0,0 +1,39 @@
+package io.onedev.server.util;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class OutputStreamWrapper extends OutputStream {
+
+ private final OutputStream delegate;
+
+ public OutputStreamWrapper(OutputStream delegate) {
+ this.delegate = delegate;
+ }
+
+ @Override
+ public void write(int b) throws IOException {
+ delegate.write(b);
+ }
+
+ @Override
+ public void write(byte[] b) throws IOException {
+ delegate.write(b);
+ }
+
+ @Override
+ public void write(byte[] b, int off, int len) throws IOException {
+ delegate.write(b, off, len);
+ }
+
+ @Override
+ public void flush() throws IOException {
+ delegate.flush();
+ }
+
+ @Override
+ public void close() throws IOException {
+ delegate.close();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/work/BatchWorkManager.java b/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.java
similarity index 50%
rename from server-core/src/main/java/io/onedev/server/util/work/BatchWorkManager.java
rename to server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.java
index 8d290d1508..cf3bd8d4d3 100644
--- a/server-core/src/main/java/io/onedev/server/util/work/BatchWorkManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.java
@@ -1,6 +1,4 @@
-package io.onedev.server.util.work;
-
-import io.onedev.server.util.concurrent.Prioritized;
+package io.onedev.server.util.concurrent;
public interface BatchWorkManager {
diff --git a/server-core/src/main/java/io/onedev/server/util/work/BatchWorker.java b/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorker.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/util/work/BatchWorker.java
rename to server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorker.java
index 9c3888c9b9..ae603e669b 100644
--- a/server-core/src/main/java/io/onedev/server/util/work/BatchWorker.java
+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorker.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.work;
+package io.onedev.server.util.concurrent;
import java.util.Collection;
@@ -7,8 +7,6 @@ import org.apache.commons.lang3.builder.HashCodeBuilder;
import com.google.common.base.Preconditions;
-import io.onedev.server.util.concurrent.Prioritized;
-
public abstract class BatchWorker {
private final String id;
diff --git a/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java
rename to server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.java
index 758e6bc466..e4836529a8 100644
--- a/server-core/src/main/java/io/onedev/server/util/work/DefaultBatchWorkManager.java
+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultBatchWorkManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.work;
+package io.onedev.server.util.concurrent;
import java.util.ArrayList;
import java.util.Collection;
@@ -21,8 +21,6 @@ import io.onedev.commons.loader.Listen;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.concurrent.Prioritized;
-import io.onedev.server.util.concurrent.PrioritizedRunnable;
@Singleton
public class DefaultBatchWorkManager implements BatchWorkManager, Runnable {
@@ -72,7 +70,7 @@ public class DefaultBatchWorkManager implements BatchWorkManager, Runnable {
works.queued.drainTo(works.working, worker.getMaxBatchSize());
if (!works.working.isEmpty()) {
double priority = works.working.stream().collect(Collectors.averagingInt(Prioritized::getPriority));
- workExecutor.execute(new PrioritizedRunnable((int)priority) {
+ workExecutor.submit(new PrioritizedRunnable((int)priority) {
@Override
public void run() {
diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutor.java b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutor.java
new file mode 100644
index 0000000000..c2c1764156
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/DefaultWorkExecutor.java
@@ -0,0 +1,264 @@
+package io.onedev.server.util.concurrent;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import io.onedev.commons.loader.Listen;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.entity.EntityPersisted;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.support.administration.PerformanceSetting;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.security.SecurityUtils;
+
+@Singleton
+public class DefaultWorkExecutor implements WorkExecutor {
+
+ private final ExecutorService executorService;
+
+ private final Map<String, Collection<PrioritizedCallable<?>>> runnings = new HashMap<>();
+
+ private final Map<String, Collection<WorkFuture<?>>> waitings = new HashMap<>();
+
+ private final SettingManager settingManager;
+
+ private volatile int concurrency = 1;
+
+ @Inject
+ public DefaultWorkExecutor(ExecutorService executorService, SettingManager settingManager) {
+ this.executorService = executorService;
+ this.settingManager = settingManager;
+ }
+
+ @Transactional
+ @Listen
+ public void on(SystemStarted event) {
+ concurrency = settingManager.getPerformanceSetting().getCpuIntensiveTaskConcurrency();
+ executorService.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ check();
+ }
+
+ });
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (event.getEntity() instanceof Setting) {
+ Setting setting = (Setting) event.getEntity();
+ if (setting.getKey() == Setting.Key.PERFORMANCE) {
+ PerformanceSetting performanceSetting = (PerformanceSetting) setting.getValue();
+ concurrency = performanceSetting.getCpuIntensiveTaskConcurrency();
+ executorService.execute(new Runnable() {
+
+ @Override
+ public void run() {
+ check();
+ }
+
+ });
+ }
+ }
+ }
+
+ private synchronized void check() {
+ if (concurrency > runnings.size()) {
+ Map<String, Integer> averagePriorities = new HashMap<>();
+ for (Map.Entry<String, Collection<WorkFuture<?>>> entry: waitings.entrySet()) {
+ int totalPriorities = 0;
+ for (WorkFuture<?> future: entry.getValue())
+ totalPriorities += future.callable.getPriority();
+ averagePriorities.put(entry.getKey(), totalPriorities/entry.getValue().size());
+ }
+ List<String> groupIds = new ArrayList<>(waitings.keySet());
+ Collections.sort(groupIds, new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return averagePriorities.get(o1) - averagePriorities.get(o2);
+ }
+
+ });
+ for (String groupId: groupIds) {
+ Collection<PrioritizedCallable<?>> runningsOfGroup = new ArrayList<>();
+ for (WorkFuture<?> future: waitings.remove(groupId)) {
+ future.runningFuture = call(future.groupId, future.callable);
+ notifyAll();
+ runningsOfGroup.add(future.callable);
+ }
+ runnings.put(groupId, runningsOfGroup);
+ if (runnings.size() == concurrency)
+ break;
+ }
+ }
+ }
+
+ private synchronized <T> Future<T> call(String groupId, PrioritizedCallable<T> callable) {
+ return executorService.submit(new Callable<T>() {
+
+ @Override
+ public T call() throws Exception {
+ try {
+ return callable.call();
+ } finally {
+ synchronized (DefaultWorkExecutor.this) {
+ Collection<PrioritizedCallable<?>> runningsOfGroup = runnings.get(groupId);
+ runningsOfGroup.remove(callable);
+ if (runningsOfGroup.isEmpty()) {
+ runnings.remove(groupId);
+ check();
+ }
+ }
+ }
+ }
+
+ });
+ }
+
+ @Override
+ public synchronized <T> Future<T> submit(String groupId, PrioritizedCallable<T> callable) {
+ callable = SecurityUtils.inheritSubject(callable);
+ Collection<PrioritizedCallable<?>> runningsOfGroup = runnings.get(groupId);
+ if (runningsOfGroup != null) {
+ runningsOfGroup.add(callable);
+ return call(groupId, callable);
+ } else {
+ WorkFuture<T> future = new WorkFuture<T>(groupId, callable);
+ Collection<WorkFuture<?>> waitingsOfGroup = waitings.get(groupId);
+ if (waitingsOfGroup == null) {
+ waitingsOfGroup = new ArrayList<>();
+ waitings.put(groupId, waitingsOfGroup);
+ }
+ waitingsOfGroup.add(future);
+ check();
+ return future;
+ }
+ }
+
+ private class WorkFuture<T> implements Future<T> {
+
+ private final String groupId;
+
+ private final PrioritizedCallable<T> callable;
+
+ private Future<?> runningFuture;
+
+ public WorkFuture(String groupId, PrioritizedCallable<T> callable) {
+ this.groupId = groupId;
+ this.callable = callable;
+ }
+
+ @Override
+ public boolean cancel(boolean mayInterruptIfRunning) {
+ synchronized (DefaultWorkExecutor.this) {
+ if (runningFuture != null) {
+ return runningFuture.cancel(mayInterruptIfRunning);
+ } else {
+ Collection<WorkFuture<?>> waitingsOfGroup = waitings.get(groupId);
+ if (waitingsOfGroup != null)
+ return waitingsOfGroup.remove(this);
+ else
+ return false;
+ }
+ }
+ }
+
+ @Override
+ public boolean isCancelled() {
+ synchronized (DefaultWorkExecutor.this) {
+ if (runningFuture != null) {
+ return runningFuture.isCancelled();
+ } else {
+ Collection<WorkFuture<?>> waitingsOfGroup = waitings.get(groupId);
+ if (waitingsOfGroup != null)
+ return !waitingsOfGroup.contains(this);
+ else
+ return true;
+ }
+ }
+ }
+
+ @Override
+ public boolean isDone() {
+ synchronized (DefaultWorkExecutor.this) {
+ if (runningFuture != null)
+ return runningFuture.isDone();
+ else
+ return false;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public T get() throws InterruptedException, ExecutionException {
+ synchronized (DefaultWorkExecutor.this) {
+ while (runningFuture == null)
+ DefaultWorkExecutor.this.wait();
+ }
+ return (T) runningFuture.get();
+ }
+
+ private long getRemainingTime(long timeoutTime) throws TimeoutException {
+ long remainingTime = timeoutTime - System.currentTimeMillis();
+ if (remainingTime > 0)
+ return remainingTime;
+ else
+ throw new TimeoutException();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public T get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException {
+ long timeoutTime = System.currentTimeMillis() + unit.toMillis(timeout);
+ synchronized (DefaultWorkExecutor.this) {
+ while (runningFuture == null)
+ DefaultWorkExecutor.this.wait(getRemainingTime(timeoutTime));
+ }
+ return (T) runningFuture.get(getRemainingTime(timeoutTime), TimeUnit.MILLISECONDS);
+ }
+
+ }
+
+ @Override
+ public <T> Future<T> submit(PrioritizedCallable<T> callable) {
+ return submit(UUID.randomUUID().toString(), callable);
+ }
+
+ @Override
+ public Future<?> submit(String groupId, PrioritizedRunnable runnable) {
+ return submit(groupId, new PrioritizedCallable<Void>(runnable.getPriority()) {
+
+ @Override
+ public Void call() throws Exception {
+ runnable.run();
+ return null;
+ }
+
+ });
+ }
+
+ @Override
+ public Future<?> submit(PrioritizedRunnable runnable) {
+ return submit(UUID.randomUUID().toString(), runnable);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/WorkExecutor.java b/server-core/src/main/java/io/onedev/server/util/concurrent/WorkExecutor.java
new file mode 100644
index 0000000000..31a1b03281
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/WorkExecutor.java
@@ -0,0 +1,20 @@
+package io.onedev.server.util.concurrent;
+
+import java.util.concurrent.Future;
+
+/**
+ * Work executor executes submitted works with concurrency limit. Only concurrent number of
+ * different groups is limited, works within same group are not subject to concurrency check.
+ * This is so as some work (git lfs push over ssh for instance) may need to wait for
+ * completion of other works. Putting them in same group can prevent deadlocks
+ */
+public interface WorkExecutor {
+
+ <T> Future<T> submit(String groupId, PrioritizedCallable<T> callable);
+
+ <T> Future<T> submit(PrioritizedCallable<T> callable);
+
+ Future<?> submit(String groupId, PrioritizedRunnable runnable);
+
+ Future<?> submit(PrioritizedRunnable runnable);
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/UrlPathValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/UrlPathValidator.java
new file mode 100644
index 0000000000..b399239cba
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/UrlPathValidator.java
@@ -0,0 +1,42 @@
+package io.onedev.server.util.validation;
+
+import java.net.URISyntaxException;
+import java.util.regex.Pattern;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.http.client.utils.URIBuilder;
+
+import io.onedev.server.util.validation.annotation.UrlPath;
+
+public class UrlPathValidator implements ConstraintValidator<UrlPath, String> {
+
+ public static final Pattern PATTERN = Pattern.compile("\\w([\\w-\\.]*\\w)?");
+
+ private String message;
+
+ @Override
+ public void initialize(UrlPath constaintAnnotation) {
+ message = constaintAnnotation.message();
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null)
+ return true;
+
+ try {
+ new URIBuilder(value);
+ return true;
+ } catch (URISyntaxException e) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = this.message;
+ if (message.length() == 0)
+ message = e.getMessage();
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/UrlPath.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/UrlPath.java
new file mode 100644
index 0000000000..34d722a343
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/UrlPath.java
@@ -0,0 +1,23 @@
+package io.onedev.server.util.validation.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+
+import io.onedev.server.util.validation.UrlPathValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=UrlPathValidator.class)
+public @interface UrlPath {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java b/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java
deleted file mode 100644
index 25ab4dae0a..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/work/DefaultWorkExecutor.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package io.onedev.server.util.work;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Future;
-import java.util.concurrent.PriorityBlockingQueue;
-import java.util.concurrent.RunnableFuture;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import javax.inject.Singleton;
-
-import io.onedev.commons.loader.Listen;
-import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.concurrent.PrioritizedCallable;
-import io.onedev.server.util.concurrent.PrioritizedFutureTask;
-import io.onedev.server.util.concurrent.PrioritizedRunnable;
-
-@Singleton
-public class DefaultWorkExecutor implements WorkExecutor {
-
- private final ExecutorService delegator = new ThreadPoolExecutor(
- Runtime.getRuntime().availableProcessors(),
- Runtime.getRuntime().availableProcessors(),
- 0L, TimeUnit.MILLISECONDS, new PriorityBlockingQueue<Runnable>()) {
-
- @Override
- protected <T> RunnableFuture<T> newTaskFor(Callable<T> callable) {
- return new PrioritizedFutureTask<T>((PrioritizedCallable<T>)callable);
- }
-
- @Override
- protected <T> RunnableFuture<T> newTaskFor(Runnable runnable, T value) {
- return new PrioritizedFutureTask<T>((PrioritizedRunnable)runnable, value);
- }
-
- };
-
- @Override
- public void execute(PrioritizedRunnable command) {
- delegator.execute(SecurityUtils.inheritSubject(command));
- }
-
- @Override
- public <T> Future<T> submit(PrioritizedCallable<T> task) {
- return delegator.submit(SecurityUtils.inheritSubject(task));
- }
-
- @Override
- public <T> Future<T> submit(PrioritizedRunnable task, T result) {
- return delegator.submit(SecurityUtils.inheritSubject(task), result);
- }
-
- @Override
- public Future<?> submit(PrioritizedRunnable task) {
- return delegator.submit(SecurityUtils.inheritSubject(task));
- }
-
- @Override
- public <T> List<Future<T>> invokeAll(Collection<? extends PrioritizedCallable<T>> tasks)
- throws InterruptedException {
- return delegator.invokeAll(SecurityUtils.inheritSubject(tasks));
- }
-
- @Override
- public <T> List<Future<T>> invokeAll(
- Collection<? extends PrioritizedCallable<T>> tasks, long timeout, TimeUnit unit)
- throws InterruptedException {
- return delegator.invokeAll(SecurityUtils.inheritSubject(tasks), timeout, unit);
- }
-
- @Override
- public <T> T invokeAny(Collection<? extends PrioritizedCallable<T>> tasks)
- throws InterruptedException, ExecutionException {
- return delegator.invokeAny(SecurityUtils.inheritSubject(tasks));
- }
-
- @Override
- public <T> T invokeAny(Collection<? extends PrioritizedCallable<T>> tasks,
- long timeout, TimeUnit unit) throws InterruptedException,
- ExecutionException, TimeoutException {
- return delegator.invokeAny(SecurityUtils.inheritSubject(tasks), timeout, unit);
- }
-
- @Listen
- public void on(SystemStopping event) {
- delegator.shutdown();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/work/WorkExecutor.java b/server-core/src/main/java/io/onedev/server/util/work/WorkExecutor.java
deleted file mode 100644
index 6117343d94..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/work/WorkExecutor.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package io.onedev.server.util.work;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import io.onedev.server.util.concurrent.PrioritizedCallable;
-import io.onedev.server.util.concurrent.PrioritizedRunnable;
-
-/**
- * This executor is intended to run resource intensive long running tasks
- *
- * @author robin
- *
- */
-public interface WorkExecutor {
-
- void execute(PrioritizedRunnable command);
-
- <T> Future<T> submit(PrioritizedCallable<T> task);
-
- <T> Future<T> submit(PrioritizedRunnable task, T result);
-
- Future<?> submit(PrioritizedRunnable task);
-
- <T> List<Future<T>> invokeAll(Collection<? extends PrioritizedCallable<T>> tasks)
- throws InterruptedException;
-
- <T> List<Future<T>> invokeAll(Collection<? extends PrioritizedCallable<T>> tasks,
- long timeout, TimeUnit unit) throws InterruptedException;
-
- <T> T invokeAny(Collection<? extends PrioritizedCallable<T>> tasks)
- throws InterruptedException, ExecutionException;
-
- <T> T invokeAny(Collection<? extends PrioritizedCallable<T>> tasks,
- long timeout, TimeUnit unit) throws InterruptedException,
- ExecutionException, TimeoutException;
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 2930f87833..d7e4092e24 100644
--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -33,6 +33,7 @@ import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransiti
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;
import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;
+import io.onedev.server.web.page.admin.performancesetting.PerformanceSettingPage;
import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;
import io.onedev.server.web.page.admin.role.NewRolePage;
import io.onedev.server.web.page.admin.role.RoleDetailPage;
@@ -235,6 +236,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
IssueNotificationTemplatePage.class));
add(new DynamicPathPageMapper("administration/settings/pull-request-notification-template",
PullRequestNotificationTemplatePage.class));
+ add(new DynamicPathPageMapper("administration/settings/performance", PerformanceSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/backup", DatabaseBackupPage.class));
add(new DynamicPathPageMapper("administration/settings/security", GeneralSecuritySettingPage.class));
add(new DynamicPathPageMapper("administration/settings/authenticator", AuthenticatorPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
index 8deef9ea50..21f8060850 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java
@@ -50,7 +50,7 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;
import io.onedev.server.web.page.builds.BuildListPage;
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.renderers.buildspec.BuildSpecRendererProvider;
+import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer;
import io.onedev.server.web.page.project.commits.CommitDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -200,7 +200,7 @@ public abstract class BuildSidePanel extends Panel {
state.blobIdent = new BlobIdent(getBuild().getBranch(), BuildSpec.BLOB_PATH,
FileMode.REGULAR_FILE.getBits());
state.mode = BlobRenderContext.Mode.EDIT;
- state.position = BuildSpecRendererProvider.getPosition(Job.SELECTION_PREFIX + getBuild().getJobName());
+ state.position = BuildSpecRenderer.getPosition(Job.SELECTION_PREFIX + getBuild().getJobName());
state.urlBeforeEdit = urlFor(getPage().getClass(), getPage().getPageParameters()).toString();
params = ProjectBlobPage.paramsOf(getProject(), state);
general.add(new BookmarkablePageLink<Void>("editJob", ProjectBlobPage.class, params));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
index ec47d9fcd9..7cd2a4bf23 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/BlobDiffPanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.diff.blob;
import javax.annotation.Nullable;
+import org.apache.tika.mime.MediaType;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
@@ -13,6 +14,7 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import io.onedev.server.OneDev;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobChange;
+import io.onedev.server.git.LfsPointer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.PullRequest;
import io.onedev.server.util.diff.DiffUtils;
@@ -60,7 +62,22 @@ public class BlobDiffPanel extends Panel {
}
private void showBlob(Blob blob) {
- if (blob.getText() != null) {
+ Component diffPanel = null;
+ for (DiffRenderer renderer: OneDev.getExtensions(DiffRenderer.class)) {
+ if (blob.getLfsPointer() != null
+ && !change.getProject().isLfsObjectExists(blob.getLfsPointer().getObjectId())) {
+ diffPanel = newFragment("Storage file missing", true);
+ break;
+ }
+ MediaType mediaType = change.getProject().detectMediaType(blob.getIdent());
+ diffPanel = renderer.render(CONTENT_ID, mediaType, change, diffMode);
+ if (diffPanel != null)
+ break;
+ }
+
+ if (diffPanel != null) {
+ add(diffPanel);
+ } else if (blob.getText() != null) {
if (blob.getText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {
add(newFragment("Unable to diff as the file is too large.", true));
} else if (change.getAdditions()+change.getDeletions() > WebConstants.MAX_SINGLE_DIFF_LINES) {
@@ -80,19 +97,8 @@ public class BlobDiffPanel extends Panel {
});
}
- } else if (blob.isPartial()) {
- add(newFragment("File is too large to be loaded.", true));
} else {
- Panel diffPanel = null;
- for (DiffRenderer renderer: OneDev.getExtensions(DiffRenderer.class)) {
- diffPanel = renderer.render(CONTENT_ID, blob.getMediaType(), change, diffMode);
- if (diffPanel != null)
- break;
- }
- if (diffPanel != null)
- add(diffPanel);
- else
- add(newFragment("Binary file.", false));
+ add(newFragment("Binary file.", false));
}
}
@@ -105,38 +111,47 @@ public class BlobDiffPanel extends Panel {
} else if (change.getType() == ChangeType.DELETE) {
showBlob(change.getOldBlob());
} else {
- if (change.getOldText() != null && change.getNewText() != null) {
- if (change.getOldText().getLines().size() + change.getNewText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {
- add(newFragment("Unable to diff as the file is too large.", true));
- } else if (change.getAdditions() + change.getDeletions() > WebConstants.MAX_SINGLE_DIFF_LINES) {
- add(newFragment("Diff is too large to be displayed.", true));
- } else if (change.getAdditions() + change.getDeletions() == 0) {
- add(newFragment("Content is identical", false));
- } else {
- add(new TextDiffPanel(CONTENT_ID, change, diffMode, blameModel) {
-
- @Override
- protected PullRequest getPullRequest() {
- return BlobDiffPanel.this.getPullRequest();
- }
-
- });
- }
- } else if (change.getOldBlob().isPartial() || change.getNewBlob().isPartial()) {
- 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: OneDev.getExtensions(DiffRenderer.class)) {
- diffPanel = renderer.render(CONTENT_ID, change.getNewBlob().getMediaType(), change, diffMode);
- if (diffPanel != null)
- break;
+ LfsPointer oldLfsPointer = change.getOldBlob().getLfsPointer();
+ LfsPointer newLfsPointer = change.getNewBlob().getLfsPointer();
+ if (oldLfsPointer != null && !change.getProject().isLfsObjectExists(oldLfsPointer.getObjectId())
+ || newLfsPointer != null && !change.getProject().isLfsObjectExists(newLfsPointer.getObjectId())) {
+ add(newFragment("Storage file missing", true));
+ } else {
+ MediaType oldMediaType = change.getProject().detectMediaType(change.getOldBlobIdent());
+ MediaType newMediaType = change.getProject().detectMediaType(change.getNewBlobIdent());
+
+ Component diffPanel = null;
+
+ if (oldMediaType.equals(newMediaType)) {
+ for (DiffRenderer renderer: OneDev.getExtensions(DiffRenderer.class)) {
+ diffPanel = renderer.render(CONTENT_ID, newMediaType, change, diffMode);
+ if (diffPanel != null)
+ break;
+ }
}
- if (diffPanel != null)
+
+ if (diffPanel != null) {
add(diffPanel);
- else
+ } else if (change.getOldText() != null && change.getNewText() != null) {
+ if (change.getOldText().getLines().size() + change.getNewText().getLines().size() > DiffUtils.MAX_DIFF_SIZE) {
+ add(newFragment("Unable to diff as the file is too large.", true));
+ } else if (change.getAdditions() + change.getDeletions() > WebConstants.MAX_SINGLE_DIFF_LINES) {
+ add(newFragment("Diff is too large to be displayed.", true));
+ } else if (change.getAdditions() + change.getDeletions() == 0) {
+ add(newFragment("Content is identical", false));
+ } else {
+ add(new TextDiffPanel(CONTENT_ID, change, diffMode, blameModel) {
+
+ @Override
+ protected PullRequest getPullRequest() {
+ return BlobDiffPanel.this.getPullRequest();
+ }
+
+ });
+ }
+ } else {
add(newFragment("Binary file.", false));
- } else {
- add(newFragment("Binary file.", false));
+ }
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java
index ee3855dbb6..0f594be793 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/image/ImageDiffPanel.java
@@ -2,15 +2,15 @@ package io.onedev.server.web.component.diff.blob.image;
import org.apache.wicket.markup.html.image.Image;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.resource.DynamicImageResource;
import org.apache.wicket.request.resource.PackageResourceReference;
-import org.eclipse.jgit.lib.ObjectId;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobChange;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.util.Provider;
import io.onedev.server.web.component.diff.difftitle.BlobDiffTitle;
+import io.onedev.server.web.resource.RawBlobResource;
+import io.onedev.server.web.resource.RawBlobResourceReference;
@SuppressWarnings("serial")
public class ImageDiffPanel extends Panel {
@@ -52,22 +52,8 @@ public class ImageDiffPanel extends Panel {
private Image newImage(String id, BlobIdent blobIdent, Provider<Blob> blobProvider) {
Image image;
if (blobIdent.path != null) {
- add(image = new Image(id, new DynamicImageResource() {
-
- @Override
- protected void configureResponse(ResourceResponse response, Attributes attributes) {
- super.configureResponse(response, attributes);
- if (!ObjectId.isId(blobIdent.revision))
- response.disableCaching();
- response.setContentType(blobProvider.get().getMediaType().toString());
- response.setFileName(blobIdent.getName());
- }
-
- @Override
- protected byte[] getImageData(Attributes attributes) {
- return blobProvider.get().getBytes();
- }
- }));
+ add(image = new Image(id, new RawBlobResourceReference(),
+ RawBlobResource.paramsOf(change.getProject(), blobIdent)));
} else {
add(image = new Image(id, new PackageResourceReference(ImageDiffPanel.class, "blank.png")));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
index 40da8d5525..7f14be1def 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/blob/text/TextDiffPanel.java
@@ -230,7 +230,7 @@ public class TextDiffPanel extends Panel {
PageParameters params = ProjectBlobPage.paramsOf(getProject(), viewState);
actions.add(new ViewStateAwarePageLink<Void>("viewFile", ProjectBlobPage.class, params));
- if (change.getType() != ChangeType.DELETE) {
+ if (change.getType() != ChangeType.DELETE && change.getNewBlob().getLfsPointer() == null) {
if (getPullRequest() != null
&& getPullRequest().getSource() != null
&& getPullRequest().getSource().getObjectName(false) != null
@@ -252,7 +252,7 @@ public class TextDiffPanel extends Panel {
}
};
- editLink.add(AttributeAppender.append("title", "Edit on source branch"));
+ editLink.add(AttributeAppender.replace("title", "Edit on source branch"));
actions.add(editLink);
} else if (SecurityUtils.canModify(getProject(), change.getBlobIdent().revision, change.getPath())
&& getProject().getBranchRef(change.getBlobIdent().revision) != null) {
@@ -270,7 +270,7 @@ public class TextDiffPanel extends Panel {
}
};
- editLink.add(AttributeAppender.append("title", "Edit on branch " + change.getBlobIdent().revision));
+ editLink.add(AttributeAppender.replace("title", "Edit on branch " + change.getBlobIdent().revision));
actions.add(editLink);
} else {
actions.add(new WebMarkupContainer("editFile").setVisible(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html
index 396a733504..5f9380a37d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.html
@@ -5,6 +5,13 @@
<wicket:svg href="arrow" class="icon"/>
</wicket:enclosure>
<span wicket:id="title"></span>
- <span wicket:id="modeChange" class="message"></span>
+ <wicket:enclosure child="modeChange">
+ <span class="text-muted">|</span>
+ <span wicket:id="modeChange" class="text-muted font-size-sm"></span>
+ </wicket:enclosure>
+ <wicket:enclosure child="lfsHint">
+ <span class="text-muted">|</span>
+ <span wicket:id="lfsHint" class="text-muted font-size-sm">Stored with Git LFS</span>
+ </wicket:enclosure>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java
index 07cc97435c..18e8f3265b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/difftitle/BlobDiffTitle.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.component.diff.difftitle;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.eclipse.jgit.diff.DiffEntry.ChangeType;
@@ -29,17 +30,19 @@ public class BlobDiffTitle extends Panel {
.setVisible(change.getType() == ChangeType.RENAME));
add(new Label("title", change.getPath()));
- String modeChange;
if (change.getOldBlobIdent().mode != null && change.getNewBlobIdent().mode != null
&& !change.getOldBlobIdent().mode.equals(change.getNewBlobIdent().mode)) {
- modeChange = Integer.toString(change.getOldBlobIdent().mode, 8)
+ String modeChange = Integer.toString(change.getOldBlobIdent().mode, 8)
+ " " + SpriteImage.getVersionedHref(IconScope.class, "arrow2") + " "
+ Integer.toString(change.getNewBlobIdent().mode, 8);
+ add(new Label("modeChange", modeChange).setEscapeModelStrings(false));
} else {
- modeChange = null;
+ add(new WebMarkupContainer("modeChange").setVisible(false));
}
- add(new Label("modeChange", modeChange).setEscapeModelStrings(false));
+ boolean isLfs = change.getNewBlobIdent().path != null && change.getNewBlob().getLfsPointer() != null
+ || change.getOldBlobIdent().path != null && change.getOldBlob().getLfsPointer() != null;
+ add(new WebMarkupContainer("lfsHint").setVisible(isLfs));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
index fd74c58e1b..ddb71f835e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java
@@ -15,7 +15,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider;
+import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer;
@SuppressWarnings("serial")
public abstract class JobDefLink extends BookmarkablePageLink<Void> {
@@ -56,7 +56,7 @@ public abstract class JobDefLink extends BookmarkablePageLink<Void> {
state.blobIdent = new BlobIdent(commitId.name(), BuildSpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits());
if (getProject().getBlob(state.blobIdent, false) == null)
state.blobIdent = new BlobIdent(commitId.name(), ".onedev-buildspec", FileMode.REGULAR_FILE.getBits());
- state.position = BuildSpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName);
+ state.position = BuildSpecRenderer.getPosition(Job.SELECTION_PREFIX + jobName);
state.requestId = PullRequest.idOf(getPullRequest());
return ProjectBlobPage.paramsOf(getProject(), state);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
index ab7ddceff9..54d8465068 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java
@@ -123,8 +123,11 @@ public abstract class RunJobLink extends AjaxLink<Void> {
}
};
- builds.add(getJobManager().submit(getProject(), commitId, job.getName(),
- paramMap, reason));
+ Build build = getJobManager().submit(getProject(), commitId, job.getName(),
+ paramMap, reason);
+ if (build.isFinished())
+ getJobManager().resubmit(build, paramMap, "Resubmitted manually ");
+ builds.add(build);
}
if (builds.size() == 1)
setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));
@@ -169,6 +172,9 @@ public abstract class RunJobLink extends AjaxLink<Void> {
};
Build build = getJobManager().submit(getProject(), commitId, job.getName(),
new HashMap<>(), reason);
+ if (build.isFinished())
+ getJobManager().resubmit(build, new HashMap<>(), "Resubmitted manually");
+
setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));
}
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
index 406c369f37..e177943075 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/symboltooltip/SymbolTooltipPanel.java
@@ -44,7 +44,7 @@ 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.render.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;
@SuppressWarnings("serial")
@@ -290,7 +290,7 @@ public abstract class SymbolTooltipPanel extends Panel {
public PageParameters getQueryHitParams(QueryHit hit) {
BlobIdent blobIdent = new BlobIdent(revision, hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());
ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
- state.position = SourceRendererProvider.getPosition(hit.getTokenPos());
+ state.position = BlobRendererer.getSourcePosition(hit.getTokenPos());
return ProjectBlobPage.paramsOf(getProject(), state);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
index 5c66e714f3..99f4fe4538 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
@@ -14,6 +14,7 @@
</ul>
</li>
<li>Make sure git version 2.11.1 or higher is installed and available in system path</li>
+ <li>Make sure git-lfs is installed and available in system path if you want to retrieve LFS files</li>
<li>Download <a wicket:id="agent" class="link-primary">agent package</a>. A new agent token will be included in the package</li>
<li>Extract the package into a folder</li>
<li>From extracted folder, run <code>bin\agent.bat console</code> as administrator on Windows or <code>bin/agent.sh console</code> on other OS </li>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
index cfbe801536..33f04a240e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
@@ -29,6 +29,7 @@ import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.BeanUpdating;
+import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.util.Testable;
@SuppressWarnings("serial")
@@ -169,7 +170,8 @@ abstract class JobExecutorEditPanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
if (editor.isValid()) {
if (testData != null) {
- new BeanEditModalPanel(target, testData, Sets.newHashSet(), true, "Testing Job Executor") {
+ String title = EditableUtils.getDisplayName(testData.getClass());
+ new BeanEditModalPanel(target, testData, Sets.newHashSet(), true, title) {
@Override
protected void onSave(AjaxRequestTarget target, Serializable bean) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/performancesetting/PerformanceSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/performancesetting/PerformanceSettingPage.html
new file mode 100644
index 0000000000..ebe02fc702
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/performancesetting/PerformanceSettingPage.html
@@ -0,0 +1,10 @@
+<wicket:extend>
+ <div class="card">
+ <div class="card-body">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="editor" class="mb-4"></div>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Save Setting">
+ </form>
+ </div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/performancesetting/PerformanceSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/performancesetting/PerformanceSettingPage.java
new file mode 100644
index 0000000000..228da0f4ee
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/performancesetting/PerformanceSettingPage.java
@@ -0,0 +1,49 @@
+package io.onedev.server.web.page.admin.performancesetting;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.administration.PerformanceSetting;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class PerformanceSettingPage extends AdministrationPage {
+
+ public PerformanceSettingPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ PerformanceSetting performanceSetting = OneDev.getInstance(SettingManager.class).getPerformanceSetting();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ OneDev.getInstance(SettingManager.class).savePerformanceSetting(performanceSetting);
+ getSession().success("Performance setting has been saved");
+
+ setResponsePage(PerformanceSettingPage.class);
+ }
+
+ };
+ form.add(BeanContext.edit("editor", performanceSetting));
+
+ add(form);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Performance Setting");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index de586c1a4c..7d7ba9be77 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -62,6 +62,7 @@ import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransiti
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.notificationtemplatesetting.IssueNotificationTemplatePage;
import io.onedev.server.web.page.admin.notificationtemplatesetting.PullRequestNotificationTemplatePage;
+import io.onedev.server.web.page.admin.performancesetting.PerformanceSettingPage;
import io.onedev.server.web.page.admin.pluginsettings.ContributedAdministrationSettingPage;
import io.onedev.server.web.page.admin.role.NewRolePage;
import io.onedev.server.web.page.admin.role.RoleDetailPage;
@@ -173,10 +174,12 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",
notificationTemplateSettingMenuItems));
+ administrationMenuItems.add(new SidebarMenuItem.Page(null, "Performance Setting",
+ PerformanceSettingPage.class, new PageParameters()));
+
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
GroovyScriptListPage.class, new PageParameters()));
-
for (AdministrationSettingContribution contribution:
OneDev.getExtensions(AdministrationSettingContribution.class)) {
for (Class<? extends Serializable> settingClass: contribution.getSettingClasses()) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
index dbfa0bd11f..289cb6593a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html
@@ -27,4 +27,14 @@
<div wicket:id="content" class="flex-grow-1 d-flex flex-column overflow-hidden"></div>
</div>
</div>
+ <wicket:fragment wicket:id="binaryFileFrag">
+ <div class="alert alert-notice alert-light-warning m-4">
+ Binary file
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="lfsObjectMissingFrag">
+ <div class="alert alert-notice alert-light-warning m-4">
+ This is a Git LFS object, but the storage file is missing
+ </div>
+ </wicket:fragment>
</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
index 07a3767fc6..310366c251 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java
@@ -31,6 +31,7 @@ import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -71,6 +72,7 @@ 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.LfsPointer;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -90,7 +92,6 @@ import io.onedev.server.util.JobSecretAuthorizationContextAware;
import io.onedev.server.util.script.identity.JobIdentity;
import io.onedev.server.util.script.identity.ScriptIdentity;
import io.onedev.server.util.script.identity.ScriptIdentityAware;
-import io.onedev.server.web.PrioritizedComponentRenderer;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.commit.status.CommitStatusPanel;
@@ -106,8 +107,13 @@ import io.onedev.server.web.component.revisionpicker.RevisionPicker;
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.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
+import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;
+import io.onedev.server.web.page.project.blob.render.folder.FolderViewPanel;
+import io.onedev.server.web.page.project.blob.render.nocommits.NoCommitsPanel;
+import io.onedev.server.web.page.project.blob.render.noname.NoNameEditPanel;
+import io.onedev.server.web.page.project.blob.render.source.SourceEditPanel;
+import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;
import io.onedev.server.web.page.project.blob.render.view.Positionable;
import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
import io.onedev.server.web.page.project.blob.search.advanced.AdvancedSearchPanel;
@@ -591,6 +597,13 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
return menuItems;
}
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(state.mode == Mode.VIEW || state.mode == Mode.BLAME);
+ }
+
});
String compareWith = resolvedRevision!=null?resolvedRevision.name():null;
@@ -600,7 +613,16 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
else
query = null;
blobOperations.add(new ViewStateAwarePageLink<Void>("history", ProjectCommitsPage.class,
- ProjectCommitsPage.paramsOf(getProject(), query, compareWith)));
+ ProjectCommitsPage.paramsOf(getProject(), query, compareWith)) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ setVisible(state.mode == Mode.VIEW || state.mode == Mode.BLAME);
+ }
+
+ });
blobOperations.add(new DropdownLink("getCode") {
@@ -657,7 +679,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
BlobIdent selected = new BlobIdent(state.blobIdent.revision, hit.getBlobPath(),
FileMode.REGULAR_FILE.getBits());
- ProjectBlobPage.this.onSelect(target, selected, SourceRendererProvider.getPosition(hit.getTokenPos()));
+ ProjectBlobPage.this.onSelect(target, selected, BlobRendererer.getSourcePosition(hit.getTokenPos()));
modal.close();
}
@@ -718,15 +740,47 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
}
private void newBlobContent(@Nullable AjaxRequestTarget target) {
- PrioritizedComponentRenderer mostPrioritizedRenderer = null;
- for (BlobRendererContribution contribution: OneDev.getExtensions(BlobRendererContribution.class)) {
- PrioritizedComponentRenderer renderer = contribution.getRenderer(this);
- if (renderer != null) {
- if (mostPrioritizedRenderer == null || mostPrioritizedRenderer.getPriority() > renderer.getPriority())
- mostPrioritizedRenderer = renderer;
+ Component blobContent = null;
+ if (getMode() == Mode.VIEW && getBlobIdent().revision == null) {
+ blobContent = new NoCommitsPanel(BLOB_CONTENT_ID, this);
+ } else if (getMode() == Mode.DELETE) {
+ blobContent = new CommitOptionPanel(BLOB_CONTENT_ID, this, null);
+ } else if (getMode() == Mode.VIEW && getBlobIdent().isTree()) {
+ blobContent = new FolderViewPanel(BLOB_CONTENT_ID, this);
+ } else if (getMode() == Mode.ADD && getNewPath() == null) {
+ blobContent = new NoNameEditPanel(BLOB_CONTENT_ID, this);
+ } else {
+ if (getMode() == Mode.VIEW) {
+ LfsPointer lfsPointer = getProject().getBlob(getBlobIdent(), true).getLfsPointer();
+ if (lfsPointer != null && !getProject().isLfsObjectExists(lfsPointer.getObjectId()))
+ blobContent = new Fragment(BLOB_CONTENT_ID, "lfsObjectMissingFrag", this);
+ }
+
+ if (blobContent == null) {
+ for (BlobRendererer contribution: OneDev.getExtensions(BlobRendererer.class)) {
+ blobContent = contribution.render(BLOB_CONTENT_ID, this);
+ if (blobContent != null)
+ break;
+ }
+ }
+
+ if (blobContent == null) {
+ if (getMode() == Mode.ADD
+ || getMode() == Mode.EDIT
+ && getProject().getBlob(getBlobIdent(), true).getText() != null) {
+ blobContent = new SourceEditPanel(BLOB_CONTENT_ID, this);
+ } else if ((getMode() == Mode.VIEW || getMode() == Mode.BLAME)
+ && getBlobIdent().isFile()
+ && getProject().getBlob(getBlobIdent(), true).getText() != null) {
+ blobContent = new SourceViewPanel(BLOB_CONTENT_ID, this, false);
+ } else {
+ blobContent = new Fragment(BLOB_CONTENT_ID, "binaryFileFrag", this);
+ }
}
}
- Component blobContent = Preconditions.checkNotNull(mostPrioritizedRenderer).render(BLOB_CONTENT_ID);
+
+ blobContent.setOutputMarkupId(true);
+
if (target != null) {
replace(blobContent);
target.add(blobContent);
@@ -940,7 +994,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
FileMode.REGULAR_FILE.getBits());
State state = new State(blobIdent);
state.commentId = comment.getId();
- state.position = SourceRendererProvider.getPosition(comment.getMark().getRange());
+ state.position = BlobRendererer.getSourcePosition(comment.getMark().getRange());
return state;
}
@@ -1163,7 +1217,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
@Override
public void onCommentOpened(AjaxRequestTarget target, CodeComment comment, PlanarRange range) {
state.commentId = comment.getId();
- state.position = SourceRendererProvider.getPosition(range);
+ state.position = BlobRendererer.getSourcePosition(range);
pushState(target);
}
@@ -1177,7 +1231,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext,
@Override
public void onAddComment(AjaxRequestTarget target, PlanarRange range) {
state.commentId = null;
- state.position = SourceRendererProvider.getPosition(range);
+ state.position = BlobRendererer.getSourcePosition(range);
pushState(target);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
index cb6e3d575c..3a10024d16 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/project-blob.js
@@ -27,7 +27,9 @@ onedev.server.projectBlob = {
* properly in readonly mode
*/
$(document).on("keydown", function(e) {
- if ($(".modal:visible").length == 0 && !onedev.server.util.canInput(e.target)) {
+ if ($(".blob-content>.blob-edit").length == 0
+ && $(".modal:visible").length == 0
+ && !onedev.server.util.canInput(e.target)) {
if (e.keyCode == 84) { // 't'
callback("quickSearch");
} else if (e.keyCode == 86) { // 'v'
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java
deleted file mode 100644
index fba419712e..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererContribution.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package io.onedev.server.web.page.project.blob.render;
-
-import java.io.Serializable;
-
-import javax.annotation.Nullable;
-
-import io.onedev.commons.loader.ExtensionPoint;
-import io.onedev.server.web.PrioritizedComponentRenderer;
-
-@ExtensionPoint
-public interface BlobRendererContribution extends Serializable {
-
- @Nullable PrioritizedComponentRenderer getRenderer(BlobRenderContext context);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererer.java
new file mode 100644
index 0000000000..77af75f6cf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/BlobRendererer.java
@@ -0,0 +1,32 @@
+package io.onedev.server.web.page.project.blob.render;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+import io.onedev.commons.loader.ExtensionPoint;
+import io.onedev.commons.utils.PlanarRange;
+
+@ExtensionPoint
+public interface BlobRendererer extends Serializable {
+
+ static final String SOURCE_POSITION_PREFIX = "source-";
+
+ @Nullable
+ public static PlanarRange getSourceRange(@Nullable String position) {
+ if (position != null && position.startsWith(SOURCE_POSITION_PREFIX))
+ return PlanarRange.of(position.substring(SOURCE_POSITION_PREFIX.length()));
+ else
+ return null;
+ }
+
+ @Nullable
+ public static String getSourcePosition(@Nullable PlanarRange range) {
+ return range!=null? SOURCE_POSITION_PREFIX + range.toString(): null;
+ }
+
+ @Nullable Component render(String componentId, BlobRenderContext context);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
index 704fd5b14d..609f88d16d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.folder;
+package io.onedev.server.web.page.project.blob.render.folder;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewResourceReference.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewResourceReference.java
index 0aa0f096df..5b5bcf7363 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/FolderViewResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.folder;
+package io.onedev.server.web.page.project.blob.render.folder;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
index a556f2f196..f0c79ae5e4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResource.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.folder;
+package io.onedev.server.web.page.project.blob.render.folder;
import java.io.IOException;
import java.util.HashMap;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResourceReference.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResourceReference.java
index 28b5e9e139..3781014fbd 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/LastCommitsResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/LastCommitsResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.folder;
+package io.onedev.server.web.page.project.blob.render.folder;
import org.apache.wicket.request.resource.IResource;
import org.apache.wicket.request.resource.ResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/folder-view.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.css
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/folder-view.css
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/folder-view.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/folder-view.js
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/folder/folder-view.js
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsCssResourceReference.java
similarity index 81%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsCssResourceReference.java
index 18b6c2cf84..5e69daab7f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
+package io.onedev.server.web.page.project.blob.render.nocommits;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java
similarity index 98%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java
index cb87e9e1fd..296a562c0c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/NoCommitsPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
+package io.onedev.server.web.page.project.blob.render.nocommits;
import java.util.ArrayList;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/no-commits.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/no-commits.css
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/nocommits/no-commits.css
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameCssResourceReference.java
similarity index 80%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameCssResourceReference.java
index 00288b3776..22e3a89234 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.noname;
+package io.onedev.server.web.page.project.blob.render.noname;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.java
index 23ab607b38..8ee1da5299 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.noname;
+package io.onedev.server.web.page.project.blob.render.noname;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.java
index 72ab16c146..90fdbaab75 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameFormComponent.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/NoNameFormComponent.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.noname;
+package io.onedev.server.web.page.project.blob.render.noname;
import org.apache.wicket.markup.html.form.FormComponentPanel;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/no-name.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/no-name.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/no-name.css
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/noname/no-name.css
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java
deleted file mode 100644
index 79dcfcf697..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/BlobDeletionProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers;
-
-import org.apache.wicket.Component;
-
-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.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
-import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;
-
-public class BlobDeletionProvider implements BlobRendererContribution {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.DELETE) {
-
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new CommitOptionPanel(componentId, context, null);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
index da4a673460..d92a9c94a6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java
@@ -1,8 +1,8 @@
package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getActiveNamedElementIndex;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getPosition;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getSelection;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveNamedElementIndex;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getPosition;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getSelection;
import java.io.Serializable;
import java.util.ArrayList;
@@ -120,7 +120,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
ProjectBlobPage.State state = new ProjectBlobPage.State();
state.blobIdent = new BlobIdent(aImport.getTag(), BuildSpec.BLOB_PATH,
FileMode.REGULAR_FILE.getBits());
- state.position = BuildSpecRendererProvider.getPosition("properties");
+ state.position = BuildSpecRenderer.getPosition("properties");
Project project = aImport.getProject();
Link<?> link = new ViewStateAwarePageLink<Void>("imported", ProjectBlobPage.class,
ProjectBlobPage.paramsOf(project, state)) {
@@ -683,8 +683,8 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
ProjectBlobPage.State state = new ProjectBlobPage.State();
state.blobIdent = new BlobIdent(aImport.getTag(), BuildSpec.BLOB_PATH,
FileMode.REGULAR_FILE.getBits());
- String urlSegment = BuildSpecRendererProvider.getUrlSegment(elementClass);
- state.position = BuildSpecRendererProvider.getPosition(urlSegment+"s/" + elementName);
+ String urlSegment = BuildSpecRenderer.getUrlSegment(elementClass);
+ state.position = BuildSpecRenderer.getPosition(urlSegment+"s/" + elementName);
Project project = aImport.getProject();
Link<?> link = new ViewStateAwarePageLink<Void>("link", ProjectBlobPage.class,
ProjectBlobPage.paramsOf(project, state)) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
index d491ace332..2c5e4147a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java
@@ -1,7 +1,7 @@
package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getActiveNamedElementIndex;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider.getUrlSegment;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveNamedElementIndex;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getUrlSegment;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
@@ -559,18 +559,18 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
private void pushState(AjaxRequestTarget target, String selection) {
- String position = BuildSpecRendererProvider.getPosition(selection);
+ String position = BuildSpecRenderer.getPosition(selection);
context.pushState(target, context.getBlobIdent(), position);
}
private void replaceState(AjaxRequestTarget target, String selection) {
- String position = BuildSpecRendererProvider.getPosition(selection);
+ String position = BuildSpecRenderer.getPosition(selection);
context.replaceState(target, context.getBlobIdent(), position);
}
@Nullable
private String getSelection() {
- return BuildSpecRendererProvider.getSelection(context.getPosition());
+ return BuildSpecRenderer.getSelection(context.getPosition());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
similarity index 58%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
index 3d0e80b11d..a70d20d4ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
@@ -9,16 +9,14 @@ import org.apache.wicket.Component;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.NamedElement;
-import io.onedev.server.web.PrioritizedComponentRenderer;
import io.onedev.server.web.editable.EditableUtils;
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.BlobRendererContribution;
-import io.onedev.server.web.page.project.blob.render.renderers.source.SourceEditPanel;
-import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;
-import io.onedev.server.web.page.project.blob.render.renderers.source.SourceViewPanel;
+import io.onedev.server.web.page.project.blob.render.source.SourceEditPanel;
+import io.onedev.server.web.page.project.blob.render.source.SourceViewPanel;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
-public class BuildSpecRendererProvider implements BlobRendererContribution {
+public class BuildSpecRenderer implements BlobRendererer {
private static final long serialVersionUID = 1L;
@@ -62,48 +60,22 @@ public class BuildSpecRendererProvider implements BlobRendererContribution {
}
@Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
+ public Component render(String componentId, BlobRenderContext context) {
if (context.getMode() == Mode.ADD && isBuildSpec(context.getNewPath())
|| context.getMode() == Mode.EDIT && isBuildSpec(context.getBlobIdent().path)) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- if (SourceRendererProvider.getRange(context.getPosition()) != null)
- return new SourceEditPanel(componentId, context);
- else
- return new BuildSpecBlobEditPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
- };
+ if (BlobRendererer.getSourceRange(context.getPosition()) != null)
+ return new SourceEditPanel(componentId, context);
+ else
+ return new BuildSpecBlobEditPanel(componentId, context);
} else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)
&& context.getBlobIdent().isFile()
&& isBuildSpec(context.getBlobIdent().path)) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- if (SourceRendererProvider.getRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)
- return new SourceViewPanel(componentId, context, false);
- else if (context.isViewPlain())
- return new SourceViewPanel(componentId, context, true);
- else
- return new BuildSpecBlobViewPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
- };
+ if (BlobRendererer.getSourceRange(context.getPosition()) != null || context.getMode() == Mode.BLAME)
+ return new SourceViewPanel(componentId, context, false);
+ else if (context.isViewPlain())
+ return new SourceViewPanel(componentId, context, true);
+ else
+ return new BuildSpecBlobViewPanel(componentId, context);
} else {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java
deleted file mode 100644
index 01aa4fde8a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeRendererProvider.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.failsafe;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new FailsafeViewPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return Integer.MAX_VALUE;
- }
-
- };
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
deleted file mode 100644
index 64d8bcb76c..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<wicket:extend>
- <div class="alert alert-notice alert-light-warning m-4">
- Unable to show content
- </div>
-</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java
deleted file mode 100644
index 27f15cf6c8..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/failsafe/FailsafeViewPanel.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.failsafe;
-
-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 {
-
- public FailsafeViewPanel(String id, BlobRenderContext context) {
- super(id, context);
- }
-
- @Override
- protected boolean isEditSupported() {
- return false;
- }
-
- @Override
- protected boolean isViewPlainSupported() {
- return false;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java
deleted file mode 100644
index 73d0565734..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewRendererProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.folder;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW
- && context.getBlobIdent().revision != null
- && context.getBlobIdent().isTree()) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new FolderViewPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.java
new file mode 100644
index 0000000000..0acd6227cf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRenderer.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.project.blob.render.renderers.gitlink;
+
+import org.apache.wicket.Component;
+
+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.BlobRendererer;
+
+public class GitLinkRenderer implements BlobRendererer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId, BlobRenderContext context) {
+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().isGitLink())
+ return new GitLinkPanel(componentId, context);
+ else
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java
deleted file mode 100644
index 42bfd81d0a..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkRendererProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.gitlink;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW && context.getBlobIdent().isGitLink()) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new GitLinkPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.java
new file mode 100644
index 0000000000..3a70231e53
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRenderer.java
@@ -0,0 +1,23 @@
+package io.onedev.server.web.page.project.blob.render.renderers.image;
+
+import org.apache.wicket.Component;
+
+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.BlobRendererer;
+
+public class ImageRenderer implements BlobRendererer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId, BlobRenderContext context) {
+ if (context.getMode() == Mode.VIEW
+ && context.getProject().detectMediaType(context.getBlobIdent()).getType().equalsIgnoreCase("image")) {
+ return new ImageViewPanel(componentId, context);
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java
deleted file mode 100644
index e64b3c7943..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/image/ImageRendererProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.image;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW && context.getBlobIdent().isFile()) {
- if (context.getProject().getBlob(context.getBlobIdent(), true).getMediaType().getType().equalsIgnoreCase("image")) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new ImageViewPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- }
- }
- return null;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java
new file mode 100644
index 0000000000..2bd1304b1d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRenderer.java
@@ -0,0 +1,39 @@
+package io.onedev.server.web.page.project.blob.render.renderers.markdown;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+
+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.source.SourceViewPanel;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
+
+@SuppressWarnings("serial")
+public class MarkdownRenderer implements BlobRendererer {
+
+ private boolean isMarkdown(@Nullable String blobPath) {
+ return blobPath != null && blobPath.endsWith(".md");
+ }
+
+ @Override
+ public Component render(String componentId, BlobRenderContext context) {
+ if (context.getMode() == Mode.ADD && isMarkdown(context.getNewPath())
+ || context.getMode() == Mode.EDIT
+ && isMarkdown(context.getBlobIdent().path)
+ && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {
+ return new MarkdownBlobEditPanel(componentId, context);
+ } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)
+ && context.getBlobIdent().isFile()
+ && isMarkdown(context.getBlobIdent().path)
+ && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {
+ if (context.getPosition() != null || context.getMode() == Mode.BLAME)
+ return new SourceViewPanel(componentId, context, false);
+ else
+ return new MarkdownBlobViewPanel(componentId, context);
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java
deleted file mode 100644
index c28525a6d0..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownRendererProvider.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.markdown;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private boolean isMarkdown(@Nullable String blobPath) {
- return blobPath != null && blobPath.endsWith(".md");
- }
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.ADD && isMarkdown(context.getNewPath())
- || context.getMode() == Mode.EDIT
- && isMarkdown(context.getBlobIdent().path)
- && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new MarkdownBlobEditPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
- };
- } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)
- && context.getBlobIdent().isFile()
- && isMarkdown(context.getBlobIdent().path)
- && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- if (context.getPosition() != null || context.getMode() == Mode.BLAME)
- return new SourceViewPanel(componentId, context, false);
- else
- return new MarkdownBlobViewPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsRendererProvider.java
deleted file mode 100644
index 0756625622..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsRendererProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.nocommits;
-
-import org.apache.wicket.Component;
-
-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.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
-
-public class NoCommitsRendererProvider implements BlobRendererContribution {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW && context.getBlobIdent().revision == null) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new NoCommitsPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java
deleted file mode 100644
index b723c80359..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameRendererProvider.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.noname;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.ADD && context.getNewPath() == null) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new NoNameEditPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java
deleted file mode 100644
index c48a81166b..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceRendererProvider.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-
-import io.onedev.commons.utils.PlanarRange;
-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.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.BlobRendererContribution;
-
-public class SourceRendererProvider implements BlobRendererContribution {
-
- private static final long serialVersionUID = 1L;
-
- private static final String POSITION_PREFIX = "source-";
-
- @Nullable
- public static PlanarRange getRange(@Nullable String position) {
- if (position != null && position.startsWith(POSITION_PREFIX))
- return PlanarRange.of(position.substring(POSITION_PREFIX.length()));
- else
- return null;
- }
-
- @Nullable
- public static String getPosition(@Nullable PlanarRange range) {
- return range!=null? POSITION_PREFIX + range.toString(): null;
- }
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.ADD
- || context.getMode() == Mode.EDIT
- && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new SourceEditPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return Integer.MAX_VALUE-1;
- }
- };
- } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.BLAME)
- && context.getBlobIdent().isFile()
- && context.getProject().getBlob(context.getBlobIdent(), true).getText() != null) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new SourceViewPanel(componentId, context, false);
- }
-
- @Override
- public int getPriority() {
- return Integer.MAX_VALUE-1;
- }
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.java
new file mode 100644
index 0000000000..05c21daf1c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRenderer.java
@@ -0,0 +1,21 @@
+package io.onedev.server.web.page.project.blob.render.renderers.symbollink;
+
+import org.apache.wicket.Component;
+
+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.BlobRendererer;
+
+public class SymbolLinkRenderer implements BlobRendererer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId, BlobRenderContext context) {
+ if (context.getMode() == Mode.VIEW && context.getBlobIdent().isSymbolLink())
+ return new SymbolLinkPanel(componentId, context);
+ else
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java
deleted file mode 100644
index 4debbde779..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/symbollink/SymbolLinkRendererProvider.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.symbollink;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW && context.getBlobIdent().isSymbolLink()) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new SymbolLinkPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- } else {
- return null;
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.java
new file mode 100644
index 0000000000..fe2d6ac27c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRenderer.java
@@ -0,0 +1,23 @@
+package io.onedev.server.web.page.project.blob.render.renderers.video;
+
+import org.apache.wicket.Component;
+
+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.BlobRendererer;
+
+public class VideoRenderer implements BlobRendererer {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component render(String componentId, BlobRenderContext context) {
+ if (context.getMode() == Mode.VIEW
+ && context.getProject().detectMediaType(context.getBlobIdent()).getType().equalsIgnoreCase("video")) {
+ return new VideoViewPanel(componentId, context);
+ } else {
+ return null;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java
deleted file mode 100644
index ad195a177d..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/video/VideoRendererProvider.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package io.onedev.server.web.page.project.blob.render.renderers.video;
-
-import org.apache.wicket.Component;
-
-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 {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) {
- if (context.getMode() == Mode.VIEW && context.getBlobIdent().isFile()) {
- if (context.getProject().getBlob(context.getBlobIdent(), true).getMediaType().getType().equalsIgnoreCase("video")) {
- return new PrioritizedComponentRenderer() {
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public Component render(String componentId) {
- return new VideoViewPanel(componentId, context);
- }
-
- @Override
- public int getPriority() {
- return 0;
- }
-
- };
- }
- }
- return null;
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java
similarity index 90%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java
index 3f677ee744..67dd6c7e9c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
+package io.onedev.server.web.page.project.blob.render.source;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.head.IHeaderResponse;
@@ -16,6 +16,7 @@ import io.onedev.server.OneDev;
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.BlobRendererer;
import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
import io.onedev.server.web.page.project.blob.render.view.Positionable;
@@ -83,7 +84,7 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));
String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());
- PlanarRange mark = SourceRendererProvider.getRange(context.getPosition());
+ PlanarRange mark = BlobRendererer.getSourceRange(context.getPosition());
String script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');",
getEditor().getMarkupId(), mark != null? getJson(mark): "undefined", autosaveKey);
@@ -101,7 +102,7 @@ public class SourceEditPanel extends BlobEditPanel implements Positionable {
@Override
public void position(AjaxRequestTarget target, String position) {
String script;
- PlanarRange mark = SourceRendererProvider.getRange(position);
+ PlanarRange mark = BlobRendererer.getSourceRange(position);
if (mark != null)
script = String.format("onedev.server.sourceEdit.mark(%s);", getJson(mark));
else
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditResourceReference.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditResourceReference.java
index 82b3bd1225..f62858672c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceEditResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
+package io.onedev.server.web.page.project.blob.render.source;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java
index 605d5f34e1..4806647810 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceFormComponent.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
+package io.onedev.server.web.page.project.blob.render.source;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -20,6 +20,7 @@ import io.onedev.server.util.ContentDetector;
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.BlobRendererer;
@SuppressWarnings("serial")
abstract class SourceFormComponent extends FormComponentPanel<byte[]> {
@@ -69,7 +70,7 @@ abstract class SourceFormComponent extends FormComponentPanel<byte[]> {
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
String autosaveKey = JavaScriptEscape.escapeJavaScript(getContext().getAutosaveKey());
- PlanarRange mark = SourceRendererProvider.getRange(getContext().getPosition());
+ PlanarRange mark = BlobRendererer.getSourceRange(getContext().getPosition());
String jsonOfMark;
if (mark != null) {
try {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
index a3bc92dd98..6fb1e5b3a9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
+package io.onedev.server.web.page.project.blob.render.source;
import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;
@@ -103,6 +103,7 @@ 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.BlobRendererer;
import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
import io.onedev.server.web.page.project.blob.render.view.Positionable;
import io.onedev.server.web.page.project.blob.search.SearchMenuContributor;
@@ -331,7 +332,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
public void onClick(AjaxRequestTarget target) {
PlanarRange range = (PlanarRange) commentContainer.getDefaultModelObject();
- String position = SourceRendererProvider.getPosition(range);
+ String position = BlobRendererer.getSourcePosition(range);
position(target, position);
context.onPosition(target, position);
target.appendJavaScript(String.format("$('#%s').blur();", getMarkupId()));
@@ -404,7 +405,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
case "openSelectionPopover":
PlanarRange range = getRange(params, "param1", "param2", "param3", "param4");
- String position = SourceRendererProvider.getPosition(range);
+ String position = BlobRendererer.getSourcePosition(range);
String script = String.format("onedev.server.sourceView.openSelectionPopover(%s, '%s', %s);",
convertToJson(range), context.getPositionUrl(position), SecurityUtils.getUser()!=null);
target.appendJavaScript(script);
@@ -687,7 +688,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
public void onClick(AjaxRequestTarget target) {
context.onSelect(target, context.getBlobIdent(),
- SourceRendererProvider.getPosition(symbol.getPosition()));
+ BlobRendererer.getSourcePosition(symbol.getPosition()));
}
};
@@ -712,7 +713,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
protected void onSelect(AjaxRequestTarget target, QueryHit hit) {
BlobIdent blobIdent = new BlobIdent(
getRevision(), hit.getBlobPath(), FileMode.REGULAR_FILE.getBits());
- context.onSelect(target, blobIdent, SourceRendererProvider.getPosition(hit.getTokenPos()));
+ context.onSelect(target, blobIdent, BlobRendererer.getSourcePosition(hit.getTokenPos()));
}
@Override
@@ -863,7 +864,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
explicit("action"), explicit("param1"), explicit("param2"),
explicit("param3"), explicit("param4"), explicit("param5"));
- PlanarRange markRange = SourceRendererProvider.getRange(context.getPosition());
+ PlanarRange markRange = BlobRendererer.getSourceRange(context.getPosition());
if (markRange == null)
markRange = (PlanarRange) commentContainer.getDefaultModelObject();
else
@@ -919,7 +920,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
public void position(AjaxRequestTarget target, String position) {
String script;
- PlanarRange mark = SourceRendererProvider.getRange(position);
+ PlanarRange mark = BlobRendererer.getSourceRange(position);
if (mark != null)
script = String.format("onedev.server.sourceView.mark(%s, true);", convertToJson(mark));
else
@@ -985,7 +986,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
@Override
public void onClick(AjaxRequestTarget target) {
modal.close();
- context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
+ context.onSelect(target, context.getBlobIdent(), BlobRendererer.getSourcePosition(symbol.getPosition()));
}
};
@@ -1079,7 +1080,7 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear
} else if (key.equals("return")) {
int symbolIndex = params.getParameterValue("param").toInt();
Symbol symbol = filteredSymbols.get(symbolIndex);
- context.onSelect(target, context.getBlobIdent(), SourceRendererProvider.getPosition(symbol.getPosition()));
+ context.onSelect(target, context.getBlobIdent(), BlobRendererer.getSourcePosition(symbol.getPosition()));
modal.close();
} else {
throw new IllegalStateException("Unrecognized key: " + key);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java
index 978241479e..0fbac30b3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/SourceViewResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
+package io.onedev.server.web.page.project.blob.render.source;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-edit.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.css
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-edit.css
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-edit.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-edit.js
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.css
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.css
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js
rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/source/source-view.js
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
index 40a7a0be9d..191b60614f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.html
@@ -9,6 +9,9 @@
<span class="text-muted">|</span>
</wicket:enclosure>
<span wicket:id="size"></span>
+ <wicket:enclosure child="lfsHint">
+ <span wicket:id="lfsHint" class="text-muted">|</span> Stored with Git LFS
+ </wicket:enclosure>
</div>
<div class="tools d-flex align-items-center">
<div class="actions d-flex align-items-center">
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
index 55d1d70f7e..cb75978666 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/view/BlobViewPanel.java
@@ -22,6 +22,7 @@ import org.apache.wicket.model.Model;
import com.google.common.base.Preconditions;
import io.onedev.commons.utils.FileUtils;
+import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -76,7 +77,7 @@ public abstract class BlobViewPanel extends Panel {
WebMarkupContainer edit = new WebMarkupContainer("edit");
changeActions.add(edit);
- if (isEditSupported()) {
+ if (project.getBlob(context.getBlobIdent(), true).getLfsPointer() == null && isEditSupported()) {
String title;
if (reviewRequired)
title = "Review required for this change. Submit pull request instead";
@@ -185,7 +186,8 @@ public abstract class BlobViewPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
- setVisible(context.getProject().getBlob(context.getBlobIdent(), true).getText() != null);
+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
+ setVisible(blob.getLfsPointer() == null && blob.getText() != null);
}
});
@@ -203,12 +205,21 @@ public abstract class BlobViewPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
- setVisible(context.getProject().getBlob(context.getBlobIdent(), true).getText() != null);
+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
+ setVisible(blob.getLfsPointer() == null && blob.getText() != null);
}
});
- add(new Label("size", FileUtils.byteCountToDisplaySize(context.getProject().getBlob(context.getBlobIdent(), true).getSize())));
+ long size;
+ Blob blob = context.getProject().getBlob(context.getBlobIdent(), true);
+ if (blob.getLfsPointer() != null)
+ size = blob.getLfsPointer().getObjectSize();
+ else
+ size = blob.getSize();
+ add(new Label("size", FileUtils.byteCountToDisplaySize(size)));
+
+ add(new WebMarkupContainer("lfsHint").setVisible(blob.getLfsPointer() != null));
add(newFormats("formats"));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
index 43eec45589..5aaff488d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/quick/QuickSearchPanel.java
@@ -47,7 +47,7 @@ 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.render.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
import io.onedev.server.web.page.project.blob.search.result.SearchResultPanel;
@SuppressWarnings("serial")
@@ -261,7 +261,7 @@ public abstract class QuickSearchPanel extends Panel {
BlobIdent blobIdent = new BlobIdent(revisionModel.getObject(), hit.getBlobPath(),
FileMode.REGULAR_FILE.getBits());
ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
- state.position = SourceRendererProvider.getPosition(hit.getTokenPos());
+ state.position = BlobRendererer.getSourcePosition(hit.getTokenPos());
PageParameters params = ProjectBlobPage.paramsOf(projectModel.getObject(), state);
CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);
link.add(AttributeAppender.replace("href", url.toString()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
index 2696c958f2..2530179f0b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/result/SearchResultPanel.java
@@ -38,7 +38,7 @@ import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
import io.onedev.server.web.component.svg.SpriteImage;
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.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
@SuppressWarnings("serial")
public abstract class SearchResultPanel extends Panel {
@@ -151,7 +151,7 @@ public abstract class SearchResultPanel extends Panel {
BlobIdent selected = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),
FileMode.REGULAR_FILE.getBits());
- context.onSelect(target, selected, SourceRendererProvider.getPosition(hit.getTokenPos()));
+ context.onSelect(target, selected, BlobRendererer.getSourcePosition(hit.getTokenPos()));
}
private String getActiveBlobPath(ActiveIndex activeIndex) {
@@ -515,7 +515,7 @@ public abstract class SearchResultPanel extends Panel {
BlobIdent blobIdent = new BlobIdent(context.getBlobIdent().revision, hit.getBlobPath(),
FileMode.REGULAR_FILE.getBits());
ProjectBlobPage.State state = new ProjectBlobPage.State(blobIdent);
- state.position = SourceRendererProvider.getPosition(hit.getTokenPos());
+ state.position = BlobRendererer.getSourcePosition(hit.getTokenPos());
PageParameters params = ProjectBlobPage.paramsOf(context.getProject(), state);
CharSequence url = RequestCycle.get().urlFor(ProjectBlobPage.class, params);
add(AttributeAppender.replace("href", url.toString()));
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
index daf690349d..0bd07a89b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/RawBlobResource.java
@@ -23,13 +23,13 @@ import org.eclipse.jgit.lib.ObjectId;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.git.Blob;
import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.ExceptionUtils;
public class RawBlobResource extends AbstractResource {
@@ -86,11 +86,15 @@ public class RawBlobResource extends AbstractResource {
ResourceResponse response = new ResourceResponse();
response.setAcceptRange(ContentRangeType.BYTES);
- response.setContentLength(blob.getSize());
- response.setContentType(blob.getMediaType().toString());
- if (response.getContentType().equals(MediaType.TEXT_HTML)) {
+ response.setContentType(project.detectMediaType(blob.getIdent()).toString());
+
+ if (blob.getLfsPointer() != null)
+ response.setContentLength(blob.getLfsPointer().getObjectSize());
+ else
+ response.setContentLength(blob.getSize());
+
+ if (response.getContentType().equals(MediaType.TEXT_HTML))
response.setContentType(MediaType.TEXT_PLAIN);
- }
if (!ObjectId.isId(revision))
response.disableCaching();
@@ -137,8 +141,12 @@ public class RawBlobResource extends AbstractResource {
if (startByte == null)
startByte = 0L;
- if (endByte == null || endByte == -1)
- endByte = blob.getSize() - 1;
+ if (endByte == null || endByte == -1) {
+ if (blob.getLfsPointer() != null)
+ endByte = blob.getLfsPointer().getObjectSize() - 1;
+ else
+ endByte = blob.getSize() - 1;
+ }
try {
copyRange(is, attributes.getResponse().getOutputStream(), startByte, endByte);
} catch (Exception e) {
@@ -152,7 +160,9 @@ public class RawBlobResource extends AbstractResource {
}
private InputStream getInputStream(Blob blob) {
- if (blob.isPartial())
+ if (blob.getLfsPointer() != null)
+ return project.getLfsObjectInputStream(blob.getLfsPointer().getObjectId());
+ else if (blob.isPartial())
return project.getInputStream(blob.getIdent());
else
return new ByteArrayInputStream(blob.getBytes());
diff --git a/server-core/src/main/resources/git-receive-hook b/server-core/src/main/resources/git-receive-hook
index 5e13ab9e2e..fe67f18a7d 100644
--- a/server-core/src/main/resources/git-receive-hook
+++ b/server-core/src/main/resources/git-receive-hook
@@ -1,4 +1,6 @@
#!/usr/bin/env bash
+unset http_proxy
+unset https_proxy
IFS=$'\r\n';
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))
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index 5edcbc5408..c4ac765056 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-archetype/pom.xml b/server-plugin/server-plugin-archetype/pom.xml
index 3add3dcad4..724b74e2b2 100644
--- a/server-plugin/server-plugin-archetype/pom.xml
+++ b/server-plugin/server-plugin-archetype/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<build>
<resources>
diff --git a/server-plugin/server-plugin-authenticator-ldap/pom.xml b/server-plugin/server-plugin-authenticator-ldap/pom.xml
index 102640be6d..a1a6d51922 100644
--- a/server-plugin/server-plugin-authenticator-ldap/pom.xml
+++ b/server-plugin/server-plugin-authenticator-ldap/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.authenticator.ldap.LdapModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml
index 484ce20cbd..ed10c10b6e 100644
--- a/server-plugin/server-plugin-buildspec-gradle/pom.xml
+++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.gradle.GradleModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml
index dda92f3313..2f9a70e3cd 100644
--- a/server-plugin/server-plugin-buildspec-maven/pom.xml
+++ b/server-plugin/server-plugin-buildspec-maven/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.maven.MavenModule</moduleClass>
diff --git a/server-plugin/server-plugin-buildspec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml
index 26ded3076e..1693509abb 100644
--- a/server-plugin/server-plugin-buildspec-node/pom.xml
+++ b/server-plugin/server-plugin-buildspec-node/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.buildspec.node.NodePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-kubernetes/pom.xml b/server-plugin/server-plugin-executor-kubernetes/pom.xml
index 4e4118b644..8bd7ce7840 100644
--- a/server-plugin/server-plugin-executor-kubernetes/pom.xml
+++ b/server-plugin/server-plugin-executor-kubernetes/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.kubernetes.KubernetesModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
index c90e0be720..1defcaa00c 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java
@@ -31,6 +31,7 @@ import javax.annotation.Nullable;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.SystemUtils;
import org.hibernate.validator.constraints.NotEmpty;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -208,8 +209,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private Commandline newKubeCtl() {
String kubectl = getKubeCtlPath();
- if (kubectl == null)
- kubectl = "kubectl";
+ if (kubectl == null) {
+ if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/kubectl").exists())
+ kubectl = "/usr/local/bin/kubectl";
+ else
+ kubectl = "kubectl";
+ }
Commandline cmdline = new Commandline(kubectl);
if (getConfigFile() != null)
cmdline.addArgs("--kubeconfig", getConfigFile());
@@ -306,10 +311,10 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
private String createNamespace(String namespace, @Nullable JobContext jobContext, TaskLogger jobLogger) {
AtomicBoolean namespaceExists = new AtomicBoolean(false);
- Commandline cmd = newKubeCtl();
- cmd.addArgs("get", "namespaces", "--field-selector", "metadata.name=" + namespace,
+ Commandline kubectl = newKubeCtl();
+ kubectl.addArgs("get", "namespaces", "--field-selector", "metadata.name=" + namespace,
"-o", "name");
- cmd.execute(new LineConsumer() {
+ kubectl.execute(new LineConsumer() {
@Override
public void consume(String line) {
@@ -328,9 +333,9 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
if (namespaceExists.get())
deleteNamespace(namespace, jobLogger);
- cmd.clearArgs();
- cmd.addArgs("create", "namespace", namespace);
- cmd.execute(new LineConsumer() {
+ kubectl = newKubeCtl();
+ kubectl.addArgs("create", "namespace", namespace);
+ kubectl.execute(new LineConsumer() {
@Override
public void consume(String line) {
@@ -658,7 +663,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
if (!getStartedContainers(containerStatusNodes).isEmpty()) {
- kubectl.clearArgs();
+ kubectl = newKubeCtl();
kubectl.addArgs("exec", podName, "-n", namespace, "--");
if (baselineOsInfo.isLinux())
kubectl.addArgs("sh", "-c");
@@ -1181,7 +1186,6 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
jobLogger.log("Updating cache labels on node...");
Commandline kubectl = newKubeCtl();
- kubectl.clearArgs();
StringBuilder nodeJson = new StringBuilder();
kubectl.addArgs("get", "node", nodeName, "-o", "json");
kubectl.execute(new LineConsumer() {
@@ -1235,7 +1239,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
jobContext.getCacheCounts().clear();
for (List<String> partition: Lists.partition(labelUpdates, LABEL_UPDATE_BATCH)) {
- kubectl.clearArgs();
+ kubectl = newKubeCtl();
kubectl.addArgs("label", "node", nodeName, "--overwrite");
for (String labelUpdate: partition)
kubectl.addArgs(labelUpdate);
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java
index 183f741085..52ae7628db 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java
@@ -1,7 +1,9 @@
package io.onedev.server.plugin.executor.kubernetes;
+import java.io.File;
import java.util.Collection;
+import org.apache.commons.lang.SystemUtils;
import org.glassfish.jersey.server.ResourceConfig;
import com.google.common.collect.Sets;
@@ -45,7 +47,12 @@ public class KubernetesModule extends AbstractPluginModule {
@Override
public JobExecutor discover(TaskLogger jobLogger) {
jobLogger.log("Checking if there is a Kubernetes cluster...");
- Commandline kubectl = new Commandline("kubectl");
+
+ Commandline kubectl;
+ if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/kubectl").exists())
+ kubectl = new Commandline("/usr/local/bin/kubectl");
+ else
+ kubectl = new Commandline("kubectl");
kubectl.addArgs("cluster-info");
try {
kubectl.execute(new LineConsumer() {
diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml
index 2e5b0891a8..f180f7cd1b 100644
--- a/server-plugin/server-plugin-executor-remotedocker/pom.xml
+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-remoteshell/pom.xml b/server-plugin/server-plugin-executor-remoteshell/pom.xml
index 1b7d0defe7..a9022c4858 100644
--- a/server-plugin/server-plugin-executor-remoteshell/pom.xml
+++ b/server-plugin/server-plugin-executor-remoteshell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-plugin/server-plugin-executor-serverdocker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml
index 64ae9134d0..9122b34e11 100644
--- a/server-plugin/server-plugin-executor-serverdocker/pom.xml
+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index fe79d6f36f..da4dc4bc7c 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -134,6 +134,8 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
private Commandline newDocker() {
if (getDockerExecutable() != null)
return new Commandline(getDockerExecutable());
+ else if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/docker").exists())
+ return new Commandline("/usr/local/bin/docker");
else
return new Commandline("docker");
}
@@ -329,6 +331,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),
cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),
+ checkoutExecutable.isWithLfs(), checkoutExecutable.isWithSubmodules(),
cloneDepth, newInfoLogger(jobLogger), newErrorLogger(jobLogger));
} catch (Exception e) {
jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
@@ -502,7 +505,6 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
public void run() {
login(jobLogger);
- jobLogger.log("Running container...");
File workspaceDir = null;
File cacheDir = null;
@@ -512,7 +514,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
cacheDir = new File(getCacheHome(), UUID.randomUUID().toString());
FileUtils.createDir(cacheDir);
- jobLogger.log("Test running specified docker image...");
+ jobLogger.log("Testing specified docker image...");
docker.clearArgs();
docker.addArgs("run", "--rm");
if (getRunOptions() != null)
@@ -560,7 +562,7 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}
if (!SystemUtils.IS_OS_WINDOWS) {
- jobLogger.log("Test running busybox...");
+ jobLogger.log("Checking busybox availability...");
docker = newDocker();
docker.addArgs("run", "--rm", "busybox", "sh", "-c", "echo hello from busybox");
docker.execute(new LineConsumer() {
@@ -579,6 +581,9 @@ public class ServerDockerExecutor extends JobExecutor implements Testable<TestDa
}).checkReturnCode();
}
+
+ Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
+ KubernetesHelper.testGitLfsAvailability(git, jobLogger);
}
}, new HashMap<>(), jobLogger);
diff --git a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
index 4af94208da..3b1ece3345 100644
--- a/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
@@ -1,7 +1,10 @@
package io.onedev.server.plugin.executor.serverdocker;
+import java.io.File;
import java.util.Collection;
+import org.apache.commons.lang.SystemUtils;
+
import com.google.common.collect.Sets;
import io.onedev.commons.loader.AbstractPluginModule;
@@ -44,7 +47,12 @@ public class ServerDockerModule extends AbstractPluginModule {
public JobExecutor discover(TaskLogger jobLogger) {
jobLogger.log("Checking if there is docker facility...");
- Commandline docker = new Commandline("docker");
+ Commandline docker;
+ if (SystemUtils.IS_OS_MAC_OSX && new File("/usr/local/bin/docker").exists())
+ docker = new Commandline("/usr/local/bin/docker");
+ else
+ docker = new Commandline("docker");
+
docker.addArgs("version");
try {
docker.execute(new LineConsumer() {
diff --git a/server-plugin/server-plugin-executor-servershell/pom.xml b/server-plugin/server-plugin-executor-servershell/pom.xml
index 68b779d6b5..aa3b9769e4 100644
--- a/server-plugin/server-plugin-executor-servershell/pom.xml
+++ b/server-plugin/server-plugin-executor-servershell/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.executor.servershell.ServerShellModule</moduleClass>
diff --git a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
index 70ba6e4d22..11001e0211 100644
--- a/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
+++ b/server-plugin/server-plugin-executor-servershell/src/main/java/io/onedev/server/plugin/executor/servershell/ServerShellExecutor.java
@@ -1,5 +1,10 @@
package io.onedev.server.plugin.executor.servershell;
+import static io.onedev.agent.ShellExecutorUtils.getShell;
+import static io.onedev.agent.ShellExecutorUtils.newErrorLogger;
+import static io.onedev.agent.ShellExecutorUtils.newInfoLogger;
+import static io.onedev.agent.ShellExecutorUtils.resolveCachePath;
+import static io.onedev.agent.ShellExecutorUtils.testCommands;
import static io.onedev.k8shelper.KubernetesHelper.checkCacheAllocations;
import static io.onedev.k8shelper.KubernetesHelper.cloneRepository;
import static io.onedev.k8shelper.KubernetesHelper.getCacheInstances;
@@ -24,8 +29,6 @@ import javax.validation.constraints.Size;
import org.apache.commons.lang.SystemUtils;
-import static io.onedev.agent.ShellExecutorUtils.*;
-
import io.onedev.agent.job.FailedException;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.commons.loader.AppLoader;
@@ -215,8 +218,9 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
int cloneDepth = checkoutExecutable.getCloneDepth();
cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),
- cloneInfo.getCloneUrl(), jobContext.getCommitId().name(), cloneDepth,
- newInfoLogger(jobLogger), newErrorLogger(jobLogger));
+ cloneInfo.getCloneUrl(), jobContext.getCommitId().name(),
+ checkoutExecutable.isWithLfs(), checkoutExecutable.isWithSubmodules(),
+ cloneDepth, newInfoLogger(jobLogger), newErrorLogger(jobLogger));
} catch (Exception e) {
jobLogger.error("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
@@ -287,14 +291,15 @@ public class ServerShellExecutor extends JobExecutor implements Testable<TestDat
@Override
public void run() {
- testCommands(testData.getCommands(), jobLogger);
+ Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
+ testCommands(git, testData.getCommands(), jobLogger);
}
}, new HashMap<>(), jobLogger);
}
- @Editable(name="Specify Shell/Batch Commands to Test")
+ @Editable(name="Specify Shell/Batch Commands to Run")
public static class TestData implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
index 90c53b58d2..2b58295944 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
+++ b/server-plugin/server-plugin-import-bitbucketcloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.bitbucketcloud.BitbucketPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java
index 185a7d51e3..13d129dd77 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ProjectMapping.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.validation.annotation.ProjectName;
+import io.onedev.server.util.validation.annotation.UrlPath;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -20,6 +21,7 @@ public class ProjectMapping implements Serializable {
@Editable(order=100, name="Bitbucket Repository", description="Specify Bitbucket repository in form of "
+ "<tt>workspace/repository</tt>")
+ @UrlPath
@NotEmpty
public String getBitbucketRepo() {
return bitbucketRepo;
diff --git a/server-plugin/server-plugin-import-gitea/pom.xml b/server-plugin/server-plugin-import-gitea/pom.xml
index b7233d0161..c3de85455c 100644
--- a/server-plugin/server-plugin-import-gitea/pom.xml
+++ b/server-plugin/server-plugin-import-gitea/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitea.GiteaPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java
index cf226b452a..3a74e141b3 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ProjectMapping.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.validation.annotation.ProjectName;
+import io.onedev.server.util.validation.annotation.UrlPath;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -20,6 +21,7 @@ public class ProjectMapping implements Serializable {
@Editable(order=100, name="Gitea Repository", description="Specify Gitea repository in form of "
+ "<tt>organization/repository</tt>")
+ @UrlPath
@NotEmpty
public String getGiteaRepo() {
return giteaRepo;
diff --git a/server-plugin/server-plugin-import-github/pom.xml b/server-plugin/server-plugin-import-github/pom.xml
index c942a44245..9e90bb3628 100644
--- a/server-plugin/server-plugin-import-github/pom.xml
+++ b/server-plugin/server-plugin-import-github/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.github.GitHubPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java
index cdccb48a7e..a658595113 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ProjectMapping.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.validation.annotation.ProjectName;
+import io.onedev.server.util.validation.annotation.UrlPath;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -20,6 +21,7 @@ public class ProjectMapping implements Serializable {
@Editable(order=100, name="GitHub Repository", description="Specify GitHub repository in form of "
+ "<tt>organization/repository</tt>")
+ @UrlPath
@NotEmpty
public String getGitHubRepo() {
return gitHubRepo;
diff --git a/server-plugin/server-plugin-import-gitlab/pom.xml b/server-plugin/server-plugin-import-gitlab/pom.xml
index 887ea6651e..0d369e6037 100644
--- a/server-plugin/server-plugin-import-gitlab/pom.xml
+++ b/server-plugin/server-plugin-import-gitlab/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.gitlab.GitLabPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java
index add759087c..518ff3f9c4 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ProjectMapping.java
@@ -5,6 +5,7 @@ import java.io.Serializable;
import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.server.util.validation.annotation.ProjectName;
+import io.onedev.server.util.validation.annotation.UrlPath;
import io.onedev.server.web.editable.annotation.Editable;
@Editable
@@ -20,6 +21,7 @@ public class ProjectMapping implements Serializable {
@Editable(order=100, name="GitLab Project", description="Specify GitLab project in form of "
+ "<tt>group/subgroup/project</tt>")
+ @UrlPath
@NotEmpty
public String getGitLabProject() {
return gitLabProejct;
diff --git a/server-plugin/server-plugin-import-jiracloud/pom.xml b/server-plugin/server-plugin-import-jiracloud/pom.xml
index 0f8c91e4c4..c63b13c5a0 100644
--- a/server-plugin/server-plugin-import-jiracloud/pom.xml
+++ b/server-plugin/server-plugin-import-jiracloud/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.jiracloud.JiraPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-import-youtrack/pom.xml b/server-plugin/server-plugin-import-youtrack/pom.xml
index 175eecba0d..74be7d6a49 100644
--- a/server-plugin/server-plugin-import-youtrack/pom.xml
+++ b/server-plugin/server-plugin-import-youtrack/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.imports.youtrack.YouTrackPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-checkstyle/pom.xml b/server-plugin/server-plugin-report-checkstyle/pom.xml
index ebcc8a27da..30e0951591 100644
--- a/server-plugin/server-plugin-report-checkstyle/pom.xml
+++ b/server-plugin/server-plugin-report-checkstyle/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.checkstyle.CheckstylePluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.java
index 01f85dff7b..1568426ea3 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleFilesPage.java
@@ -48,7 +48,7 @@ import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.component.NoRecordsPlaceholder;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
@@ -247,7 +247,7 @@ public class CheckstyleFilesPage extends CheckstyleReportPage {
state.blobIdent = new BlobIdent(getBuild().getCommitHash(),
filePath, FileMode.REGULAR_FILE.getBits());
state.problemReport = getReportName();
- state.position = SourceRendererProvider.getPosition(violation.getRange());
+ state.position = BlobRendererer.getSourcePosition(violation.getRange());
PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
BookmarkablePageLink<Void> rangeLink = new BookmarkablePageLink<Void>("range",
ProjectBlobPage.class, params);
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.java
index f298bd8be1..b4a940fbed 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/CheckstyleRulesPage.java
@@ -48,7 +48,7 @@ import io.onedev.server.web.behavior.PatternSetAssistBehavior;
import io.onedev.server.web.component.NoRecordsPlaceholder;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
import io.onedev.server.web.util.SuggestionUtils;
@SuppressWarnings("serial")
@@ -235,7 +235,7 @@ public class CheckstyleRulesPage extends CheckstyleReportPage {
state.blobIdent = new BlobIdent(getBuild().getCommitHash(),
violation.getFile(), FileMode.REGULAR_FILE.getBits());
state.problemReport = getReportName();
- state.position = SourceRendererProvider.getPosition(violation.getRange());
+ state.position = BlobRendererer.getSourcePosition(violation.getRange());
PageParameters params = ProjectBlobPage.paramsOf(getProject(), state);
BookmarkablePageLink<Void> rangeLink = new BookmarkablePageLink<Void>("range",
ProjectBlobPage.class, params);
diff --git a/server-plugin/server-plugin-report-clover/pom.xml b/server-plugin/server-plugin-report-clover/pom.xml
index de9b1ce1c2..254649be9f 100644
--- a/server-plugin/server-plugin-report-clover/pom.xml
+++ b/server-plugin/server-plugin-report-clover/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.clover.CloverPluginModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jest/pom.xml b/server-plugin/server-plugin-report-jest/pom.xml
index ec71da7284..4284620054 100644
--- a/server-plugin/server-plugin-report-jest/pom.xml
+++ b/server-plugin/server-plugin-report-jest/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.jest.JestTestReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.java
index 6ffaeaea94..4f6f178e36 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/TestMessagePanel.java
@@ -14,7 +14,7 @@ import io.onedev.server.git.BlobIdent;
import io.onedev.server.model.Build;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider;
+import io.onedev.server.web.page.project.blob.render.BlobRendererer;
@SuppressWarnings("serial")
abstract class TestMessagePanel extends Label {
@@ -46,7 +46,7 @@ abstract class TestMessagePanel extends Label {
ProjectBlobPage.State state = new ProjectBlobPage.State();
state.blobIdent = blobIdent;
PlanarRange range = new PlanarRange(line-1, col-1, line-1, col);
- state.position = SourceRendererProvider.getPosition(range);
+ state.position = BlobRendererer.getSourcePosition(range);
PageParameters params = ProjectBlobPage.paramsOf(getBuild().getProject(), state);
String url = urlFor(ProjectBlobPage.class, params).toString();
buffer.append(String.format("(<a onclick='onedev.server.viewState.getFromViewAndSetToHistory();' href='%s'>%s:%d:%d</a>)",
diff --git a/server-plugin/server-plugin-report-markdown/pom.xml b/server-plugin/server-plugin-report-markdown/pom.xml
index a4476eda95..c486fc493d 100644
--- a/server-plugin/server-plugin-report-markdown/pom.xml
+++ b/server-plugin/server-plugin-report-markdown/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<properties>
<moduleClass>io.onedev.server.plugin.report.markdown.MarkdownReportModule</moduleClass>
diff --git a/server-plugin/server-plugin-sso-openid/pom.xml b/server-plugin/server-plugin-sso-openid/pom.xml
index 16ea9fde80..36474c0f59 100644
--- a/server-plugin/server-plugin-sso-openid/pom.xml
+++ b/server-plugin/server-plugin-sso-openid/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-product/docker/Dockerfile b/server-product/docker/Dockerfile
index 250e879cdc..30c6e42ebb 100644
--- a/server-product/docker/Dockerfile
+++ b/server-product/docker/Dockerfile
@@ -3,11 +3,12 @@ FROM ubuntu:18.04
COPY app /app
COPY entrypoint.sh idle.sh /root/bin/
COPY kubectl /usr/local/bin/
-RUN apt-get update && apt-get install -y locales docker.io iproute2 curl git openjdk-8-jre-headless
+RUN apt-get update && apt-get install -y locales docker.io iproute2 curl git git-lfs openjdk-8-jre-headless
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
EXPOSE 6610
+EXPOSE 6611
CMD ["/root/bin/entrypoint.sh"]
diff --git a/server-product/k8s/mini/README b/server-product/k8s/mini/README
deleted file mode 100644
index fbf3b5ac54..0000000000
--- a/server-product/k8s/mini/README
+++ /dev/null
@@ -1 +0,0 @@
-This folder configures OneDev with minimum resource requirements to use in resource-constrainted environments such as minikube
diff --git a/server-product/k8s/mini/disk-settings.yaml b/server-product/k8s/mini/disk-settings.yaml
deleted file mode 100644
index 7f8c95d96a..0000000000
--- a/server-product/k8s/mini/disk-settings.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: onedev
-spec:
- resources:
- requests:
- storage: 1Gi
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: mysql
-spec:
- resources:
- requests:
- storage: 512Mi
\ No newline at end of file
diff --git a/server-product/k8s/mini/kustomization.yaml b/server-product/k8s/mini/kustomization.yaml
deleted file mode 100644
index 285b137210..0000000000
--- a/server-product/k8s/mini/kustomization.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-namespace: onedev
-images:
-- name: 1dev/server
- newTag: ${buildVersion}
-bases:
-- ../base
-patchesStrategicMerge:
-- disk-settings.yaml
diff --git a/server-product/k8s/production/kustomization.yaml b/server-product/k8s/production/kustomization.yaml
index a88a03c067..02fd41752f 100644
--- a/server-product/k8s/production/kustomization.yaml
+++ b/server-product/k8s/production/kustomization.yaml
@@ -8,5 +8,4 @@ images:
newTag: ${buildVersion}
patchesStrategicMerge:
- node-selectors.yaml
-- memory-settings.yaml
- disk-settings.yaml
diff --git a/server-product/k8s/production/memory-settings.yaml b/server-product/k8s/production/memory-settings.yaml
deleted file mode 100644
index 8f8aee2ae7..0000000000
--- a/server-product/k8s/production/memory-settings.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: onedev
-spec:
- template:
- spec:
- containers:
- - name: onedev
- resources:
- requests:
- memory: 2Gi
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: mysql
-spec:
- template:
- spec:
- containers:
- - name: mysql
- resources:
- requests:
- memory: 500Mi
diff --git a/server-product/pom.xml b/server-product/pom.xml
index e092d51979..81a76443c4 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>io.onedev</groupId>
<artifactId>server</artifactId>
- <version>4.11.0</version>
+ <version>5.0.0</version>
</parent>
<dependencies>
<dependency>
diff --git a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
index d93d1e0cb3..774e03e55f 100644
--- a/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
+++ b/server-product/src/main/java/io/onedev/server/product/ProductServletConfigurator.java
@@ -19,6 +19,7 @@ import org.glassfish.jersey.servlet.ServletContainer;
import io.onedev.commons.bootstrap.Bootstrap;
import io.onedev.server.ServerSocketServlet;
import io.onedev.server.git.GitFilter;
+import io.onedev.server.git.GitLfsFilter;
import io.onedev.server.git.hookcallback.GitPostReceiveCallback;
import io.onedev.server.git.hookcallback.GitPreReceiveCallback;
import io.onedev.server.security.DefaultWebEnvironment;
@@ -38,6 +39,8 @@ public class ProductServletConfigurator implements ServletConfigurator {
private final GitFilter gitFilter;
+ private final GitLfsFilter gitLfsFilter;
+
private final GitPreReceiveCallback preReceiveServlet;
private final GitPostReceiveCallback postReceiveServlet;
@@ -51,13 +54,15 @@ public class ProductServletConfigurator implements ServletConfigurator {
private final ServerSocketServlet serverServlet;
@Inject
- public ProductServletConfigurator(ServerConfig serverConfig, ShiroFilter shiroFilter, GitFilter gitFilter,
- GitPreReceiveCallback preReceiveServlet, GitPostReceiveCallback postReceiveServlet,
- WicketServlet wicketServlet, WebSocketManager webSocketManager, ServletContainer jerseyServlet,
+ public ProductServletConfigurator(ServerConfig serverConfig, ShiroFilter shiroFilter,
+ GitFilter gitFilter, GitLfsFilter gitLfsFilter, GitPreReceiveCallback preReceiveServlet,
+ GitPostReceiveCallback postReceiveServlet, WicketServlet wicketServlet,
+ WebSocketManager webSocketManager, ServletContainer jerseyServlet,
ServerSocketServlet serverServlet) {
this.serverConfig = serverConfig;
this.shiroFilter = shiroFilter;
this.gitFilter = gitFilter;
+ this.gitLfsFilter = gitLfsFilter;
this.preReceiveServlet = preReceiveServlet;
this.postReceiveServlet = postReceiveServlet;
this.wicketServlet = wicketServlet;
@@ -77,6 +82,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addFilter(new FilterHolder(shiroFilter), "/*", EnumSet.allOf(DispatcherType.class));
context.addFilter(new FilterHolder(gitFilter), "/*", EnumSet.allOf(DispatcherType.class));
+ context.addFilter(new FilterHolder(gitLfsFilter), "/*", EnumSet.allOf(DispatcherType.class));
context.addServlet(new ServletHolder(preReceiveServlet), GitPreReceiveCallback.PATH + "/*");
diff --git a/server-product/src/test/java/io/onedev/server/product/Test.java b/server-product/src/test/java/io/onedev/server/product/Test.java
index 3d0dead201..a96bf27a34 100644
--- a/server-product/src/test/java/io/onedev/server/product/Test.java
+++ b/server-product/src/test/java/io/onedev/server/product/Test.java
@@ -1,11 +1,9 @@
package io.onedev.server.product;
-import java.io.IOException;
-
public class Test {
@org.junit.Test
- public void test() throws IOException {
+ public void test() {
}
}
\ No newline at end of file