Skip to content

The Unified and Autonomous Development Platform

Add sleepy job executor for testing purpose

Robin Shen32129ed3a1eb
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.java
index 8db474d3dd..9107536f51 100644
--- a/core/src/main/java/io/onedev/server/CoreModule.java
+++ b/core/src/main/java/io/onedev/server/CoreModule.java
@@ -85,8 +85,6 @@ import io.onedev.server.ci.CISpec;
import io.onedev.server.ci.DefaultJobScheduler;
import io.onedev.server.ci.JobScheduler;
import io.onedev.server.ci.detect.CISpecDetector;
-import io.onedev.server.ci.jobexecutor.JobExecutor;
-import io.onedev.server.ci.jobexecutor.JobExecutorProvider;
import io.onedev.server.command.ApplyDBConstraintsCommand;
import io.onedev.server.command.BackupDBCommand;
import io.onedev.server.command.CheckDataVersionCommand;
@@ -174,16 +172,15 @@ import io.onedev.server.git.GitPreReceiveCallback;
import io.onedev.server.git.config.GitConfig;
import io.onedev.server.migration.JpaConverter;
import io.onedev.server.migration.PersistentBagConverter;
-import io.onedev.server.model.Build2;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.authenticator.Authenticator;
-import io.onedev.server.notification.CommitNotificationManager;
import io.onedev.server.notification.CodeCommentNotificationManager;
+import io.onedev.server.notification.CommitNotificationManager;
import io.onedev.server.notification.DefaultMailManager;
-import io.onedev.server.notification.WebHookManager;
import io.onedev.server.notification.IssueNotificationManager;
import io.onedev.server.notification.MailManager;
import io.onedev.server.notification.PullRequestNotificationManager;
+import io.onedev.server.notification.WebHookManager;
import io.onedev.server.persistence.DefaultIdManager;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.DefaultSessionManager;
@@ -195,10 +192,10 @@ import io.onedev.server.persistence.PersistManager;
import io.onedev.server.persistence.PrefixedNamingStrategy;
import io.onedev.server.persistence.SessionFactoryProvider;
import io.onedev.server.persistence.SessionInterceptor;
+import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.SessionProvider;
import io.onedev.server.persistence.TransactionInterceptor;
import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.Dao;
@@ -228,8 +225,8 @@ import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator;
import io.onedev.server.util.jetty.DefaultJettyRunner;
import io.onedev.server.util.jetty.JettyRunner;
-import io.onedev.server.util.markdown.EntityReferenceManager;
import io.onedev.server.util.markdown.DefaultMarkdownManager;
+import io.onedev.server.util.markdown.EntityReferenceManager;
import io.onedev.server.util.markdown.MarkdownManager;
import io.onedev.server.util.markdown.MarkdownProcessor;
import io.onedev.server.util.validation.DefaultEntityValidator;
@@ -410,21 +407,6 @@ public class CoreModule extends AbstractPluginModule {
});
- contributeFromPackage(JobExecutorProvider.class, JobExecutorProvider.class);
- contribute(JobExecutorProvider.class, new JobExecutorProvider() {
-
- @Override
- public int getPriority() {
- return JobExecutorProvider.DEFAULT_PRIORITY;
- }
-
- @Override
- public JobExecutor getExecutor(Build2 build) {
- return null;
- }
-
- });
-
bind(IndexManager.class).to(DefaultIndexManager.class);
bind(SearchManager.class).to(DefaultSearchManager.class);
diff --git a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java
index b2db766148..97b215a7af 100644
--- a/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/DefaultJobScheduler.java
@@ -1,7 +1,6 @@
package io.onedev.server.ci;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.List;
@@ -9,7 +8,6 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ExecutorService;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
@@ -18,12 +16,10 @@ import org.eclipse.jgit.lib.ObjectId;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.commons.utils.LockUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.ci.jobexecutor.JobExecutor;
-import io.onedev.server.ci.jobexecutor.JobExecutorProvider;
import io.onedev.server.ci.jobparam.JobParam;
import io.onedev.server.ci.jobtrigger.JobTrigger;
import io.onedev.server.entitymanager.Build2Manager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.CommitAware;
import io.onedev.server.event.ProjectEvent;
@@ -35,10 +31,10 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
import io.onedev.server.exception.OneException;
import io.onedev.server.model.Build2;
-import io.onedev.server.model.Build2.Status;
import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.persistence.TransactionManager;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
@@ -49,6 +45,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
private static final int CHECK_INTERVAL = 10;
+ private enum Status {RUNNING, STOPPING, STOPPED};
+
private final Build2Manager buildManager;
private final UserManager userManager;
@@ -59,19 +57,20 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
private final ExecutorService executorService;
- private volatile Thread thread;
+ private final SettingManager settingManager;
- private volatile boolean stopping;
+ private volatile Status status;
@Inject
public DefaultJobScheduler(Build2Manager buildManager, UserManager userManager,
ListenerRegistry listenerRegistry, TransactionManager transactionManager,
- ExecutorService executorService) {
+ ExecutorService executorService, SettingManager settingManager) {
this.buildManager = buildManager;
this.userManager = userManager;
this.listenerRegistry = listenerRegistry;
this.transactionManager = transactionManager;
this.executorService = executorService;
+ this.settingManager = settingManager;
}
@Sessional
@@ -119,7 +118,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
build.setCommitHash(commitHash);
build.setJobName(jobName);
build.setSubmitDate(new Date());
- build.setStatus(Status.WAITING);
+ build.setStatus(Build2.Status.WAITING);
build.setUser(userManager.getCurrent());
for (Map.Entry<String, String> entry: paramMap.entrySet()) {
@@ -167,12 +166,12 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
}
private void run(Build2 build) {
- JobExecutor jobExecutor = getJobExecutor(build);
+ JobExecutor jobExecutor = settingManager.getJobExecutor();
if (jobExecutor != null) {
String runInstanceId = jobExecutor.run(build);
if (runInstanceId != null) {
build.setRunInstanceId(runInstanceId);
- build.setStatus(Status.RUNNING);
+ build.setStatus(Build2.Status.RUNNING);
build.setRunningDate(new Date());
buildManager.save(build);
listenerRegistry.post(new BuildRunning(build));
@@ -184,7 +183,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
private void markBuildError(Build2 build, String errorMessage) {
build.setErrorMessage(errorMessage);
- build.setStatus(Status.FAILED);
+ build.setStatus(Build2.Status.FAILED);
if (build.getPendingDate() == null)
build.setPendingDate(new Date());
if (build.getRunningDate() == null)
@@ -195,20 +194,6 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
listenerRegistry.post(new BuildFinished(build));
}
- @Nullable
- private JobExecutor getJobExecutor(Build2 build) {
- List<JobExecutorProvider> providers = new ArrayList<>(OneDev.getExtensions(JobExecutorProvider.class));
- providers.sort(Comparator.comparing(JobExecutorProvider::getPriority));
-
- for (JobExecutorProvider provider: providers) {
- JobExecutor jobExecutor = provider.getExecutor(build);
- if (jobExecutor != null)
- return jobExecutor;
- }
-
- return null;
- }
-
@Sessional
@Listen
public void on(ProjectEvent event) {
@@ -239,8 +224,8 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
for (BuildDependence dependence: build.getDependents())
resubmit(dependence.getDependent());
- if (build.getStatus() == Status.FAILED || build.getStatus() == Status.SUCCESSFUL) {
- build.setStatus(Status.WAITING);
+ if (build.getStatus() == Build2.Status.FAILED || build.getStatus() == Build2.Status.SUCCESSFUL) {
+ build.setStatus(Build2.Status.WAITING);
build.setErrorMessage(null);
build.setFinishDate(null);
build.setPendingDate(null);
@@ -258,10 +243,10 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Transactional
@Override
public void cancel(Build2 build) {
- if (build.getStatus() == Status.WAITING || build.getStatus() == Status.PENDING) {
+ if (build.getStatus() == Build2.Status.WAITING || build.getStatus() == Build2.Status.PENDING) {
markBuildError(build, "Build is cancelled");
- } else if (build.getStatus() == Status.RUNNING) {
- JobExecutor jobExecutor = getJobExecutor(build);
+ } else if (build.getStatus() == Build2.Status.RUNNING) {
+ JobExecutor jobExecutor = settingManager.getJobExecutor();
if (jobExecutor != null) {
if (jobExecutor.isRunning(build))
jobExecutor.stop(build);
@@ -275,17 +260,17 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Listen
public void on(SystemStarted event) {
- thread = new Thread(this);
- thread.start();
+ status = Status.RUNNING;
+ new Thread(this).start();
}
@Listen
public void on(SystemStopping event) {
- stopping = true;
+ status = Status.STOPPING;
synchronized (this) {
notify();
}
- while (thread != null ) {
+ while (status == Status.STOPPING) {
try {
Thread.sleep(100);
} catch (InterruptedException e) {
@@ -295,7 +280,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Override
public synchronized void run() {
- while (!stopping) {
+ while (status == Status.RUNNING) {
try {
wait(CHECK_INTERVAL * 1000L);
} catch (InterruptedException e) {
@@ -305,15 +290,15 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
@Override
public void run() {
for (Build2 build: buildManager.queryUnfinished()) {
- if (build.getStatus() == Status.PENDING) {
+ if (build.getStatus() == Build2.Status.PENDING) {
DefaultJobScheduler.this.run(build);
- } else if (build.getStatus() == Status.RUNNING) {
+ } else if (build.getStatus() == Build2.Status.RUNNING) {
CISpec ciSpec = build.getProject().getCISpec(ObjectId.fromString(build.getCommitHash()));
if (ciSpec != null) {
Job job = ciSpec.getJobMap().get(build.getJobName());
if (job != null) {
if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L) {
- JobExecutor jobExecutor = getJobExecutor(build);
+ JobExecutor jobExecutor = settingManager.getJobExecutor();
if (jobExecutor != null) {
if (jobExecutor.isRunning(build))
jobExecutor.stop(build);
@@ -329,7 +314,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
} else {
markBuildError(build, "No CI spec");
}
- } else if (build.getStatus() == Status.WAITING) {
+ } else if (build.getStatus() == Build2.Status.WAITING) {
boolean hasFailed = false;
boolean hasUnfinished = false;
@@ -350,13 +335,13 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
}
if (hasFailed) {
- build.setStatus(Status.FAILED);
+ build.setStatus(Build2.Status.FAILED);
build.setPendingDate(new Date());
build.setRunningDate(new Date());
build.setFinishDate(new Date());
listenerRegistry.post(new BuildFinished(build));
} else if (!hasUnfinished) {
- build.setStatus(Status.PENDING);
+ build.setStatus(Build2.Status.PENDING);
build.setPendingDate(new Date());
listenerRegistry.post(new BuildPending(build));
}
@@ -366,7 +351,7 @@ public class DefaultJobScheduler implements JobScheduler, Runnable {
});
}
- thread = null;
+ status = Status.STOPPED;
}
}
diff --git a/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutor.java
deleted file mode 100644
index 37482d0681..0000000000
--- a/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutor.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package io.onedev.server.ci.jobexecutor;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.model.Build2;
-
-public interface JobExecutor {
-
- @Nullable
- String run(Build2 build);
-
- boolean isRunning(Build2 build);
-
- void stop(Build2 build);
-
-}
diff --git a/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutorProvider.java b/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutorProvider.java
deleted file mode 100644
index a251896151..0000000000
--- a/core/src/main/java/io/onedev/server/ci/jobexecutor/JobExecutorProvider.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package io.onedev.server.ci.jobexecutor;
-
-import javax.annotation.Nullable;
-
-import io.onedev.commons.launcher.loader.ExtensionPoint;
-import io.onedev.server.model.Build2;
-
-@ExtensionPoint
-public interface JobExecutorProvider {
-
- int DEFAULT_PRIORITY = 100;
-
- @Nullable
- JobExecutor getExecutor(Build2 build);
-
- int getPriority();
-
-}
diff --git a/core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
index 14e7f350ef..8e30c70833 100644
--- a/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
+++ b/core/src/main/java/io/onedev/server/data/DefaultDataManager.java
@@ -153,6 +153,10 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null) {
settingManager.saveAuthenticator(null);
}
+ setting = settingManager.getSetting(Key.JOB_EXECUTOR);
+ if (setting == null) {
+ settingManager.saveJobExecutor(null);
+ }
setting = settingManager.getSetting(Key.MAIL);
if (setting == null) {
diff --git a/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index 3da5bc2fdb..a4b3c9a22b 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -4,6 +4,7 @@ import javax.annotation.Nullable;
import io.onedev.server.model.Setting;
import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.model.support.setting.BackupSetting;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
@@ -97,5 +98,10 @@ public interface SettingManager extends EntityManager<Setting> {
Authenticator getAuthenticator();
void saveAuthenticator(@Nullable Authenticator authenticator);
+
+ @Nullable
+ JobExecutor getJobExecutor();
+
+ void saveJobExecutor(JobExecutor jobExecutor);
}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index 03ac280e2a..10e12857b3 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -12,6 +12,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
import io.onedev.server.model.support.setting.BackupSetting;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
@@ -40,6 +41,8 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
private volatile Long authenticatorId;
+ private volatile Long jobExecutorId;
+
@Inject
public DefaultSettingManager(Dao dao, DataManager dataManager) {
super(dao);
@@ -213,4 +216,28 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
dao.persist(setting);
}
+ @Override
+ public JobExecutor getJobExecutor() {
+ Setting setting;
+ if (jobExecutorId == null) {
+ setting = getSetting(Key.JOB_EXECUTOR);
+ Preconditions.checkNotNull(setting);
+ jobExecutorId = setting.getId();
+ } else {
+ setting = load(jobExecutorId);
+ }
+ return (JobExecutor) setting.getValue();
+ }
+
+ @Override
+ public void saveJobExecutor(JobExecutor jobExecutor) {
+ Setting setting = getSetting(Key.JOB_EXECUTOR);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.JOB_EXECUTOR);
+ }
+ setting.setValue(jobExecutor);
+ dao.persist(setting);
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/Setting.java b/core/src/main/java/io/onedev/server/model/Setting.java
index 4eb82918a8..4ac9d9cc49 100644
--- a/core/src/main/java/io/onedev/server/model/Setting.java
+++ b/core/src/main/java/io/onedev/server/model/Setting.java
@@ -23,7 +23,7 @@ public class Setting extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE};
+ public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTOR};
/*
* Optimistic lock is necessary to ensure database integrity when update
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
new file mode 100644
index 0000000000..a9049768c8
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -0,0 +1,20 @@
+package io.onedev.server.model.support.jobexecutor;
+
+import java.io.Serializable;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Build2;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public interface JobExecutor extends Serializable {
+
+ @Nullable
+ String run(Build2 build);
+
+ boolean isRunning(Build2 build);
+
+ void stop(Build2 build);
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java
new file mode 100644
index 0000000000..bde71cad84
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SleepyJobExecutor.java
@@ -0,0 +1,81 @@
+package io.onedev.server.model.support.jobexecutor;
+
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.Build2Manager;
+import io.onedev.server.event.build2.BuildFinished;
+import io.onedev.server.model.Build2;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class SleepyJobExecutor implements JobExecutor {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final int MAX_JOBS = 5;
+
+ private static final Map<String, Thread> threads = new HashMap<>();
+
+ @Override
+ public String run(Build2 build) {
+ synchronized (threads) {
+ if (threads.size() < MAX_JOBS) {
+ Long buildId = build.getId();
+ String runInstanceId = UUID.randomUUID().toString();
+ Thread thread = new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ Thread.sleep(30000);
+ } catch (InterruptedException e) {
+ synchronized (threads) {
+ threads.remove(runInstanceId);
+ }
+ } finally {
+ OneDev.getInstance(TransactionManager.class).run(new Runnable() {
+
+ @Override
+ public void run() {
+ Build2 build = OneDev.getInstance(Build2Manager.class).load(buildId);
+ build.setStatus(Build2.Status.SUCCESSFUL);
+ build.setFinishDate(new Date());
+ OneDev.getInstance(ListenerRegistry.class).post(new BuildFinished(build));
+ }
+
+ });
+ }
+ }
+
+ });
+ threads.put(runInstanceId, thread);
+ return runInstanceId;
+ } else {
+ return null;
+ }
+ }
+ }
+
+ @Override
+ public boolean isRunning(Build2 build) {
+ synchronized (threads) {
+ return threads.containsKey(build.getRunInstanceId());
+ }
+ }
+
+ @Override
+ public void stop(Build2 build) {
+ synchronized (threads) {
+ Thread thread = threads.get(build.getRunInstanceId());
+ if (thread != null)
+ thread.interrupt();
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index f0b1372e6b..80c88604f2 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -22,6 +22,7 @@ import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;
import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;
import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;
+import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
@@ -150,6 +151,8 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));
add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));
+ add(new OnePageMapper("administration/settings/job-executor", JobExecutorPage.class));
+
add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));
add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));
add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java
similarity index 91%
rename from core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java
rename to core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java
index 37107a880b..cf184be87a 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorHolder.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorBean.java
@@ -7,7 +7,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
@Editable
-public class AuthenticatorHolder implements Serializable {
+public class AuthenticatorBean implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
index 5af18211e2..7bf4f53325 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
@@ -50,19 +50,19 @@ public class AuthenticatorPage extends AdministrationPage {
protected void onInitialize() {
super.onInitialize();
- AuthenticatorHolder authenticatorHolder = new AuthenticatorHolder();
- authenticatorHolder.setAuthenticator(OneDev.getInstance(SettingManager.class).getAuthenticator());
+ AuthenticatorBean bean = new AuthenticatorBean();
+ bean.setAuthenticator(OneDev.getInstance(SettingManager.class).getAuthenticator());
- PropertyEditor<Serializable> authenticatorEditor =
- PropertyContext.editBean("editor", authenticatorHolder, "authenticator");
- authenticatorEditor.setOutputMarkupId(true);
+ PropertyEditor<Serializable> editor =
+ PropertyContext.editBean("editor", bean, "authenticator");
+ editor.setOutputMarkupId(true);
Button saveButton = new Button("save") {
@Override
public void onSubmit() {
super.onSubmit();
- OneDev.getInstance(SettingManager.class).saveAuthenticator(authenticatorHolder.getAuthenticator());
+ OneDev.getInstance(SettingManager.class).saveAuthenticator(bean.getAuthenticator());
getSession().success("External authentication setting has been saved");
}
@@ -80,7 +80,7 @@ public class AuthenticatorPage extends AdministrationPage {
@Override
protected TestResult test() {
try {
- Authenticated authenticated = authenticatorHolder.getAuthenticator().authenticate(
+ Authenticated authenticated = bean.getAuthenticator().authenticate(
new UsernamePasswordToken(token.getUserName(), token.getPassword()));
StringBuilder retrievedInfoBuilder = new StringBuilder();
if (authenticated.getFullName() != null) {
@@ -125,7 +125,7 @@ public class AuthenticatorPage extends AdministrationPage {
protected void onConfigure() {
super.onConfigure();
- BeanEditor beanEditor = authenticatorEditor.visitChildren(BeanEditor.class,
+ BeanEditor beanEditor = editor.visitChildren(BeanEditor.class,
new IVisitor<BeanEditor, BeanEditor>() {
public void component(BeanEditor component, IVisit<BeanEditor> visit) {
@@ -193,7 +193,7 @@ public class AuthenticatorPage extends AdministrationPage {
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
- target.add(authenticatorEditor);
+ target.add(editor);
}
};
@@ -213,7 +213,7 @@ public class AuthenticatorPage extends AdministrationPage {
};
- form.add(authenticatorEditor);
+ form.add(editor);
form.add(saveButton);
form.add(testButton);
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
new file mode 100644
index 0000000000..0cac89dc79
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
@@ -0,0 +1,26 @@
+package io.onedev.server.web.page.admin.jobexecutor;
+
+import java.io.Serializable;
+
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+
+@Editable
+public class JobExecutorBean implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private JobExecutor jobExecutor;
+
+ @Editable
+ @NameOfEmptyValue("No job executor")
+ public JobExecutor getJobExecutor() {
+ return jobExecutor;
+ }
+
+ public void setJobExecutor(JobExecutor jobExecutor) {
+ this.jobExecutor = jobExecutor;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
new file mode 100644
index 0000000000..21d4a4f2b1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html
@@ -0,0 +1,9 @@
+<wicket:extend>
+ <div class="page-title">Job Executor</div>
+ <form wicket:id="jobExecutor" class="job-executor leave-confirm">
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting">
+ </div>
+ </form>
+</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
new file mode 100644
index 0000000000..321ad55964
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.java
@@ -0,0 +1,51 @@
+package io.onedev.server.web.page.admin.jobexecutor;
+
+import java.io.Serializable;
+
+import org.apache.wicket.markup.html.form.Button;
+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.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class JobExecutorPage extends AdministrationPage {
+
+ public JobExecutorPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ JobExecutorBean bean = new JobExecutorBean();
+ bean.setJobExecutor(OneDev.getInstance(SettingManager.class).getJobExecutor());
+
+ PropertyEditor<Serializable> editor = PropertyContext.editBean("editor", bean, "jobExecutor");
+ editor.setOutputMarkupId(true);
+ Button saveButton = new Button("save") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ OneDev.getInstance(SettingManager.class).saveJobExecutor(bean.getJobExecutor());
+ getSession().success("Job executor setting has been saved");
+ }
+
+ };
+
+ Form<?> form = new Form<Void>("jobExecutor");
+
+ form.add(editor);
+ form.add(saveButton);
+
+ add(form);
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
index dd623d79bb..5af307ad22 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html
@@ -32,6 +32,8 @@
<li wicket:id="issueSetting"><a wicket:id="link"><i class="fa fa-fw fa-bug"></i> Issue Setting</a></li>
<li wicket:id="mailSetting"><a wicket:id="link"><i class="fa fa-fw fa-envelope"></i> Mail Setting</a></li>
<li role="separator" class="divider"></li>
+ <li wicket:id="jobExecutor"><a wicket:id="link"><i class="fa fa-fw fa-cogs"></i> Job Executor</a></li>
+ <li role="separator" class="divider"></li>
<li wicket:id="databaseBackup"><a wicket:id="link"><i class="fa fa-fw fa-database"></i> Database Backup</a></li>
<li wicket:id="serverLog"><a wicket:id="link"><i class="fa fa-fw fa-file-text-o"></i> Server Log</a></li>
<li wicket:id="serverInformation"><a wicket:id="link"><i class="fa fa-fw fa-desktop"></i> Server Information</a></li>
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index fdc5e48ae1..2bdd6bb9b7 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -37,6 +37,7 @@ import io.onedev.server.web.page.admin.group.GroupPage;
import io.onedev.server.web.page.admin.group.NewGroupPage;
import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
+import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
@@ -130,6 +131,11 @@ public abstract class LayoutPage extends BasePage {
if (getPage() instanceof AuthenticatorPage)
item.add(AttributeAppender.append("class", "active"));
+ administrationContainer.add(item = new WebMarkupContainer("jobExecutor"));
+ item.add(new ViewStateAwarePageLink<Void>("link", JobExecutorPage.class));
+ if (getPage() instanceof JobExecutorPage)
+ item.add(AttributeAppender.append("class", "active"));
+
administrationContainer.add(item = new WebMarkupContainer("systemSetting"));
item.add(new ViewStateAwarePageLink<Void>("link", SystemSettingPage.class));
if (getPage() instanceof SystemSettingPage)