Skip to content

The Unified and Autonomous Development Platform

Add agent support

Robin Shenfd7135fc8dfe
diff --git a/pom.xml b/pom.xml
index d520072be1..5ba92a11cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<plugin>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
- <version>2.0.5</version>
+ <version>2.0.6</version>
<executions>
<execution>
<?m2e execute onConfiguration,onIncremental?>
@@ -419,11 +419,6 @@
<artifactId>jaxen</artifactId>
<version>1.1.6</version>
</dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>k8s-helper</artifactId>
- <version>${k8shelper.version}</version>
- </dependency>
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
@@ -539,6 +534,11 @@
<artifactId>jackson-jaxrs-json-provider</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>agent</artifactId>
+ <version>${agent.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<repositories>
@@ -558,8 +558,8 @@
</repository>
</repositories>
<properties>
- <commons.version>2.0.12</commons.version>
- <k8shelper.version>2.1.7</k8shelper.version>
+ <commons.version>2.0.13</commons.version>
+ <agent.version>1.0.4</agent.version>
<slf4j.version>1.7.5</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 00a615e87b..129dc273f3 100644
--- a/server-core/pom.xml
+++ b/server-core/pom.xml
@@ -314,7 +314,7 @@
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>k8s-helper</artifactId>
+ <artifactId>agent</artifactId>
</dependency>
<dependency>
<groupId>org.objenesis</groupId>
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 e94cfbc866..8e759cfb59 100644
--- a/server-core/src/main/java/io/onedev/server/CoreModule.java
+++ b/server-core/src/main/java/io/onedev/server/CoreModule.java
@@ -25,7 +25,9 @@ import javax.inject.Singleton;
import javax.persistence.EntityManager;
import javax.persistence.EntityManagerFactory;
import javax.persistence.EntityNotFoundException;
+import javax.persistence.JoinColumn;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Transient;
import javax.persistence.Version;
import javax.validation.Configuration;
@@ -90,28 +92,29 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.buildspec.job.DefaultJobManager;
import io.onedev.server.buildspec.job.JobManager;
-import io.onedev.server.buildspec.job.log.DefaultLogManager;
-import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
import io.onedev.server.code.CodeProblem;
import io.onedev.server.code.CodeProblemContribution;
import io.onedev.server.code.LineCoverageContribution;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.AgentTokenManager;
import io.onedev.server.entitymanager.BuildDependenceManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.entitymanager.BuildParamManager;
-import io.onedev.server.entitymanager.BuildQuerySettingManager;
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
import io.onedev.server.entitymanager.CodeCommentManager;
-import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.CodeCommentReplyManager;
-import io.onedev.server.entitymanager.CommitQuerySettingManager;
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.GroupAuthorizationManager;
import io.onedev.server.entitymanager.GroupManager;
import io.onedev.server.entitymanager.IssueChangeManager;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.IssueQuerySettingManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.IssueVoteManager;
import io.onedev.server.entitymanager.IssueWatchManager;
import io.onedev.server.entitymanager.MembershipManager;
@@ -121,7 +124,7 @@ import io.onedev.server.entitymanager.PullRequestAssignmentManager;
import io.onedev.server.entitymanager.PullRequestChangeManager;
import io.onedev.server.entitymanager.PullRequestCommentManager;
import io.onedev.server.entitymanager.PullRequestManager;
-import io.onedev.server.entitymanager.PullRequestQuerySettingManager;
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.PullRequestReviewManager;
import io.onedev.server.entitymanager.PullRequestUpdateManager;
import io.onedev.server.entitymanager.PullRequestWatchManager;
@@ -131,22 +134,25 @@ import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.entitymanager.UserAuthorizationManager;
import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentAttributeManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentManager;
+import io.onedev.server.entitymanager.impl.DefaultAgentTokenManager;
import io.onedev.server.entitymanager.impl.DefaultBuildDependenceManager;
import io.onedev.server.entitymanager.impl.DefaultBuildManager;
import io.onedev.server.entitymanager.impl.DefaultBuildMetricManager;
import io.onedev.server.entitymanager.impl.DefaultBuildParamManager;
-import io.onedev.server.entitymanager.impl.DefaultBuildQuerySettingManager;
+import io.onedev.server.entitymanager.impl.DefaultBuildQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentManager;
-import io.onedev.server.entitymanager.impl.DefaultCodeCommentQuerySettingManager;
+import io.onedev.server.entitymanager.impl.DefaultCodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultCodeCommentReplyManager;
-import io.onedev.server.entitymanager.impl.DefaultCommitQuerySettingManager;
+import io.onedev.server.entitymanager.impl.DefaultCommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultGroupAuthorizationManager;
import io.onedev.server.entitymanager.impl.DefaultGroupManager;
import io.onedev.server.entitymanager.impl.DefaultIssueChangeManager;
import io.onedev.server.entitymanager.impl.DefaultIssueCommentManager;
import io.onedev.server.entitymanager.impl.DefaultIssueFieldManager;
import io.onedev.server.entitymanager.impl.DefaultIssueManager;
-import io.onedev.server.entitymanager.impl.DefaultIssueQuerySettingManager;
+import io.onedev.server.entitymanager.impl.DefaultIssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultIssueVoteManager;
import io.onedev.server.entitymanager.impl.DefaultIssueWatchManager;
import io.onedev.server.entitymanager.impl.DefaultMembershipManager;
@@ -156,7 +162,7 @@ import io.onedev.server.entitymanager.impl.DefaultPullRequestAssignmentManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestChangeManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestCommentManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestManager;
-import io.onedev.server.entitymanager.impl.DefaultPullRequestQuerySettingManager;
+import io.onedev.server.entitymanager.impl.DefaultPullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestReviewManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestUpdateManager;
import io.onedev.server.entitymanager.impl.DefaultPullRequestWatchManager;
@@ -178,6 +184,8 @@ import io.onedev.server.infomanager.DefaultPullRequestInfoManager;
import io.onedev.server.infomanager.DefaultUserInfoManager;
import io.onedev.server.infomanager.PullRequestInfoManager;
import io.onedev.server.infomanager.UserInfoManager;
+import io.onedev.server.job.resource.DefaultResourceManager;
+import io.onedev.server.job.resource.ResourceManager;
import io.onedev.server.maintenance.ApplyDatabaseConstraints;
import io.onedev.server.maintenance.BackupDatabase;
import io.onedev.server.maintenance.CheckDataVersion;
@@ -249,6 +257,8 @@ import io.onedev.server.storage.AttachmentStorageManager;
import io.onedev.server.storage.DefaultAttachmentStorageManager;
import io.onedev.server.storage.DefaultStorageManager;
import io.onedev.server.storage.StorageManager;
+import io.onedev.server.tasklog.DefaultLogManager;
+import io.onedev.server.tasklog.LogManager;
import io.onedev.server.util.jackson.ObjectMapperConfigurator;
import io.onedev.server.util.jackson.ObjectMapperProvider;
import io.onedev.server.util.jackson.git.GitObjectMapperConfigurator;
@@ -340,7 +350,7 @@ public class CoreModule extends AbstractPluginModule {
configurePersistence();
configureSecurity();
- configureRestServices();
+ configureRestful();
configureWeb();
configureSsh();
configureGit();
@@ -399,11 +409,11 @@ public class CoreModule extends AbstractPluginModule {
bind(SessionFactory.class).toProvider(SessionFactoryProvider.class);
bind(EntityManagerFactory.class).toProvider(SessionFactoryProvider.class);
bind(IssueCommentManager.class).to(DefaultIssueCommentManager.class);
- bind(IssueQuerySettingManager.class).to(DefaultIssueQuerySettingManager.class);
- bind(PullRequestQuerySettingManager.class).to(DefaultPullRequestQuerySettingManager.class);
- bind(CodeCommentQuerySettingManager.class).to(DefaultCodeCommentQuerySettingManager.class);
- bind(CommitQuerySettingManager.class).to(DefaultCommitQuerySettingManager.class);
- bind(BuildQuerySettingManager.class).to(DefaultBuildQuerySettingManager.class);
+ bind(IssueQueryPersonalizationManager.class).to(DefaultIssueQueryPersonalizationManager.class);
+ bind(PullRequestQueryPersonalizationManager.class).to(DefaultPullRequestQueryPersonalizationManager.class);
+ bind(CodeCommentQueryPersonalizationManager.class).to(DefaultCodeCommentQueryPersonalizationManager.class);
+ bind(CommitQueryPersonalizationManager.class).to(DefaultCommitQueryPersonalizationManager.class);
+ bind(BuildQueryPersonalizationManager.class).to(DefaultBuildQueryPersonalizationManager.class);
bind(PullRequestAssignmentManager.class).to(DefaultPullRequestAssignmentManager.class);
bind(SshKeyManager.class).to(DefaultSshKeyManager.class);
bind(BuildMetricManager.class).to(DefaultBuildMetricManager.class);
@@ -576,7 +586,7 @@ public class CoreModule extends AbstractPluginModule {
contribute(SshCommandCreator.class, GitSshCommandCreator.class);
}
- private void configureRestServices() {
+ private void configureRestful() {
bind(ResourceConfig.class).toProvider(ResourceConfigProvider.class).in(Singleton.class);
bind(ServletContainer.class).to(DefaultServletContainer.class);
@@ -670,6 +680,11 @@ public class CoreModule extends AbstractPluginModule {
}
private void configureBuild() {
+ bind(ResourceManager.class).to(DefaultResourceManager.class);
+ bind(AgentManager.class).to(DefaultAgentManager.class);
+ bind(AgentTokenManager.class).to(DefaultAgentTokenManager.class);
+ bind(AgentAttributeManager.class).to(DefaultAgentAttributeManager.class);
+
contribute(ScriptContribution.class, new ScriptContribution() {
@Override
@@ -776,10 +791,11 @@ public class CoreModule extends AbstractPluginModule {
public boolean shouldSerializeMember(Class definedIn, String fieldName) {
Field field = reflectionProvider.getField(definedIn, fieldName);
- return field.getAnnotation(XStreamOmitField.class) == null &&
- field.getAnnotation(Transient.class) == null &&
- field.getAnnotation(OneToMany.class) == null &&
- field.getAnnotation(Version.class) == null;
+ return field.getAnnotation(XStreamOmitField.class) == null
+ && field.getAnnotation(Transient.class) == null
+ && field.getAnnotation(OneToMany.class) == null
+ && (field.getAnnotation(OneToOne.class) == null || field.getAnnotation(JoinColumn.class) != null)
+ && field.getAnnotation(Version.class) == null;
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/ServerSocket.java b/server-core/src/main/java/io/onedev/server/ServerSocket.java
new file mode 100644
index 0000000000..dd52f53cc2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ServerSocket.java
@@ -0,0 +1,163 @@
+package io.onedev.server;
+
+import java.io.IOException;
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ExecutorService;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.eclipse.jetty.websocket.api.Session;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketClose;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketConnect;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketError;
+import org.eclipse.jetty.websocket.api.annotations.OnWebSocketMessage;
+import org.eclipse.jetty.websocket.api.annotations.WebSocket;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.agent.AgentData;
+import io.onedev.agent.CallData;
+import io.onedev.agent.Message;
+import io.onedev.agent.MessageType;
+import io.onedev.agent.WebsocketUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.buildspec.job.JobContext;
+import io.onedev.server.buildspec.job.JobManager;
+import io.onedev.server.entitymanager.AgentManager;
+
+@WebSocket
+public class ServerSocket {
+
+ private static final Logger logger = LoggerFactory.getLogger(ServerSocket.class);
+
+ private Session session;
+
+ private Long agentId;
+
+ @OnWebSocketClose
+ public void onClose(int statusCode, String reason) {
+ if (agentId != null)
+ getAgentManager().agentDisconnected(agentId);
+
+ StringBuilder builder = new StringBuilder("Websocket closed (");
+ if (session != null)
+ builder.append("remote address: " + session.getRemoteAddress().toString() + ", ");
+ builder.append("status code: " + statusCode);
+ if (reason != null)
+ builder.append(", reason: " + reason);
+ builder.append(")");
+ logger.trace(builder.toString());
+ }
+
+ @OnWebSocketError
+ public void onError(Throwable t) {
+ if (session != null) {
+ logger.error("Websocket error (remote address: " + session.getRemoteAddress().toString() + ")", t);
+ try {
+ session.disconnect();
+ } catch (IOException e) {
+ }
+ } else {
+ logger.error("Websocket error", t);
+ }
+ }
+
+ private AgentManager getAgentManager() {
+ return OneDev.getInstance(AgentManager.class);
+ }
+
+ @OnWebSocketConnect
+ public void onConnect(Session session) {
+ this.session = session;
+ try {
+ new Message(MessageType.UPDATE, getAgentManager().getAgentVersion()).sendBy(session);
+ } catch (Exception e) {
+ logger.error("Error sending websocket message", e);
+ try {
+ session.disconnect();
+ } catch (IOException e2) {
+ }
+ }
+ }
+
+ @OnWebSocketMessage
+ public void onMessage(byte[] bytes, int offset, int count) {
+ Message message = Message.of(bytes, offset, count);
+ byte[] messageData = message.getData();
+ try {
+ switch (message.getType()) {
+ case AGENT_DATA:
+ // It is fine to deserialize from agent as they have valid agent token which can only
+ // be retrieved via Administrator
+ AgentData data = (AgentData) SerializationUtils.deserialize(message.getData());
+ try {
+ agentId = getAgentManager().agentConnected(data, session);
+ } catch (ExplicitException e) {
+ new Message(MessageType.ERROR, e.getMessage()).sendBy(session);
+ }
+ break;
+ case REQUEST:
+ OneDev.getInstance(ExecutorService.class).execute(new Runnable() {
+
+ @Override
+ public void run() {
+ try {
+ CallData request = SerializationUtils.deserialize(messageData);
+ CallData response = new CallData(request.getUuid(), service(request.getPayload()));
+ new Message(MessageType.RESPONSE, response).sendBy(session);
+ } catch (Exception e) {
+ logger.error("Error processing websocket request", e);
+ }
+ }
+
+ });
+ break;
+ case RESPONSE:
+ WebsocketUtils.onResponse(SerializationUtils.deserialize(messageData));
+ break;
+ case JOB_LOG:
+ try {
+ String dataString = new String(messageData, StandardCharsets.UTF_8);
+ String jobToken = StringUtils.substringBefore(dataString, ":");
+ String remaining = StringUtils.substringAfter(dataString, ":");
+ String taskId = StringUtils.substringBefore(remaining, ":");
+ if (taskId.length() == 0)
+ taskId = null;
+ String logMessage = StringUtils.substringAfter(remaining, ":");
+ JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(jobToken, false);
+ if (jobContext != null)
+ jobContext.getLogger().log(logMessage, taskId);
+ } catch (Exception e) {
+ logger.error("Error processing job log", e);
+ }
+ break;
+ case REPORT_JOB_WORKSPACE:
+ String dataString = new String(messageData, StandardCharsets.UTF_8);
+ String jobToken = StringUtils.substringBefore(dataString, ":");
+ String jobWorkspace = StringUtils.substringAfter(dataString, ":");
+ JobContext jobContext = OneDev.getInstance(JobManager.class).getJobContext(jobToken, false);
+ if (jobContext != null)
+ jobContext.reportJobWorkspace(jobWorkspace);
+ break;
+ default:
+ }
+ } catch (Exception e) {
+ logger.error("Error processing websocket message (remote address: " + session.getRemoteAddress().toString() + ")", e);
+ try {
+ session.disconnect();
+ } catch (IOException e2) {
+ }
+ }
+ }
+
+ private Serializable service(Serializable request) {
+ try {
+ throw new ExplicitException("Unknown request: " + request.getClass());
+ } catch (Exception e) {
+ logger.error("Error servicing websocket request", e);
+ return e;
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/ServerSocketServlet.java b/server-core/src/main/java/io/onedev/server/ServerSocketServlet.java
new file mode 100644
index 0000000000..f2d316b094
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/ServerSocketServlet.java
@@ -0,0 +1,55 @@
+package io.onedev.server;
+
+import java.io.IOException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.ws.rs.core.HttpHeaders;
+
+import org.eclipse.jetty.websocket.servlet.WebSocketServlet;
+import org.eclipse.jetty.websocket.servlet.WebSocketServletFactory;
+
+import io.onedev.agent.Agent;
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.model.AgentToken;
+
+@Singleton
+public class ServerSocketServlet extends WebSocketServlet {
+
+ private static final long serialVersionUID = 1L;
+
+ private final AgentTokenManager tokenManager;
+
+ @Inject
+ public ServerSocketServlet(AgentTokenManager tokenManager) {
+ this.tokenManager = tokenManager;
+ }
+
+ @Override
+ public void configure(WebSocketServletFactory factory) {
+ factory.register(ServerSocket.class);
+ factory.getPolicy().setIdleTimeout(Agent.SOCKET_IDLE_TIMEOUT);
+ factory.getPolicy().setMaxBinaryMessageSize(Agent.MAX_MESSAGE_BYTES);
+ factory.getPolicy().setMaxTextMessageSize(Agent.MAX_MESSAGE_BYTES);
+ }
+
+ @Override
+ protected void service(HttpServletRequest request, HttpServletResponse response)
+ throws ServletException, IOException {
+ String bearer = request.getHeader(HttpHeaders.AUTHORIZATION);
+ if (bearer != null && bearer.startsWith(Agent.BEARER + " ")) {
+ String tokenValue = bearer.substring(Agent.BEARER.length() + 1);
+ AgentToken token = tokenManager.find(tokenValue);
+ if (token != null)
+ super.service(request, response);
+ else
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "Invalid agent token");
+ } else {
+ response.sendError(HttpServletResponse.SC_UNAUTHORIZED, "No agent token");
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/Service.java b/server-core/src/main/java/io/onedev/server/buildspec/Service.java
index b84e7c1507..7e9c5756a9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/Service.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/Service.java
@@ -2,7 +2,9 @@ package io.onedev.server.buildspec;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import org.hibernate.validator.constraints.NotEmpty;
@@ -30,9 +32,9 @@ public class Service implements NamedElement, Serializable {
private String readinessCheckCommand;
- private String cpuRequirement = "500m";
+ private int cpuRequirement = 250;
- private String memoryRequirement = "128m";
+ private int memoryRequirement = 256;
@Editable(order=100, description="Specify name of the service, which will be used as host name to access the service")
@SuggestionProvider("getNameSuggestions")
@@ -102,27 +104,22 @@ public class Service implements NamedElement, Serializable {
this.readinessCheckCommand = readinessCheckCommand;
}
- @Editable(order=10000, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")
- @Interpolative(variableSuggester="suggestVariables")
- @NotEmpty
- public String getCpuRequirement() {
+ @Editable(order=10000, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the service in millis. "
+ + "1000 millis means a single CPU core")
+ public int getCpuRequirement() {
return cpuRequirement;
}
- public void setCpuRequirement(String cpuRequirement) {
+ public void setCpuRequirement(int cpuRequirement) {
this.cpuRequirement = cpuRequirement;
}
- @Editable(order=10100, group="More Settings", description="Specify memory requirement of the job. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")
- @Interpolative(variableSuggester="suggestVariables")
- @NotEmpty
- public String getMemoryRequirement() {
+ @Editable(order=10100, group="More Settings", description="Specify memory requirement of the service in mega bytes")
+ public int getMemoryRequirement() {
return memoryRequirement;
}
- public void setMemoryRequirement(String memoryRequirement) {
+ public void setMemoryRequirement(int memoryRequirement) {
this.memoryRequirement = memoryRequirement;
}
@@ -131,4 +128,21 @@ public class Service implements NamedElement, Serializable {
return BuildSpec.suggestVariables(matchWith, false, false);
}
+ public Map<String, Serializable> toMap() {
+ Map<String, Serializable> serviceMap = new HashMap<>();
+
+ serviceMap.put("name", getName());
+ serviceMap.put("image", getImage());
+ serviceMap.put("readinessCheckCommand", getReadinessCheckCommand());
+ serviceMap.put("cpuRequirement", getCpuRequirement());
+ serviceMap.put("memoryRequirement", getMemoryRequirement());
+ serviceMap.put("arguments", getArguments());
+ Map<String, String> envVars = new HashMap<>();
+ for (EnvVar var: getEnvVars())
+ envVars.put(var.getName(), var.getValue());
+ serviceMap.put("envVars", (Serializable) envVars);
+
+ return serviceMap;
+ }
+
}
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 27f4ba6493..37166ee3ae 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
@@ -54,6 +54,7 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.Action;
import io.onedev.k8shelper.CacheInstance;
import io.onedev.k8shelper.CompositeExecutable;
@@ -66,7 +67,6 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.Service;
import io.onedev.server.buildspec.job.action.PostBuildAction;
import io.onedev.server.buildspec.job.action.condition.ActionCondition;
-import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.buildspec.job.projectdependency.ProjectDependency;
import io.onedev.server.buildspec.job.retrycondition.RetryCondition;
import io.onedev.server.buildspec.job.trigger.JobTrigger;
@@ -76,6 +76,7 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
import io.onedev.server.buildspec.param.spec.SecretParam;
import io.onedev.server.buildspec.step.ServerStep;
import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildParamManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -91,7 +92,6 @@ import io.onedev.server.event.build.BuildPending;
import io.onedev.server.event.build.BuildRetrying;
import io.onedev.server.event.build.BuildRunning;
import io.onedev.server.event.build.BuildSubmitted;
-import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.pullrequest.PullRequestEvent;
import io.onedev.server.event.system.SystemStarted;
@@ -103,8 +103,6 @@ import io.onedev.server.model.BuildDependence;
import io.onedev.server.model.BuildParam;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.Setting;
-import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.User;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
import io.onedev.server.model.support.inputspec.SecretInput;
@@ -117,10 +115,10 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessBuild;
import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.ProjectPermission;
+import io.onedev.server.tasklog.LogManager;
import io.onedev.server.util.CommitAware;
import io.onedev.server.util.JobSecretAuthorizationContext;
import io.onedev.server.util.MatrixRunner;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.interpolative.VariableInterpolator;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.schedule.SchedulableTask;
@@ -165,12 +163,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
private final PullRequestManager pullRequestManager;
+ private final AgentManager agentManager;
+
private final TaskScheduler taskScheduler;
private final Validator validator;
- private volatile List<JobExecutor> jobExecutors;
-
private volatile Thread thread;
@Inject
@@ -178,7 +176,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
SettingManager settingManager, TransactionManager transactionManager, LogManager logManager,
ExecutorService executorService, SessionManager sessionManager, BuildParamManager buildParamManager,
PullRequestManager pullRequestManager, ProjectManager projectManager, Validator validator,
- TaskScheduler taskScheduler) {
+ TaskScheduler taskScheduler, AgentManager agentManager) {
this.settingManager = settingManager;
this.buildManager = buildManager;
this.userManager = userManager;
@@ -192,6 +190,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
this.pullRequestManager = pullRequestManager;
this.validator = validator;
this.taskScheduler = taskScheduler;
+ this.agentManager = agentManager;
}
private void validateBuildSpec(Project project, ObjectId commitId, BuildSpec buildSpec) {
@@ -397,7 +396,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Nullable
private JobExecutor getJobExecutor(Build build) {
- for (JobExecutor executor: jobExecutors) {
+ for (JobExecutor executor: settingManager.getJobExecutors()) {
if (executor.isApplicable(build))
return executor;
}
@@ -416,7 +415,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
JobExecutor executor = getJobExecutor(build);
if (executor != null) {
- SimpleLogger jobLogger = logManager.getLogger(build, jobSecretsToMask);
+ TaskLogger jobLogger = logManager.getLogger(build, jobSecretsToMask);
ObjectId commitId = ObjectId.fromString(build.getCommitHash());
Long buildId = build.getId();
@@ -484,7 +483,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
services, jobLogger) {
@Override
- public void notifyJobRunning() {
+ public void notifyJobRunning(Long agentId) {
transactionManager.run(new Runnable() {
@Override
@@ -492,6 +491,8 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
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));
}
@@ -515,7 +516,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public Map<String, byte[]> doRunServerStep(List<Integer> stepPosition, File filesDir,
- Map<String, String> placeholderValues, SimpleLogger logger) {
+ Map<String, String> placeholderValues, TaskLogger logger) {
return sessionManager.call(new Callable<Map<String, byte[]>>() {
@Override
@@ -687,7 +688,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
}
}
- private void log(Throwable e, SimpleLogger logger) {
+ private void log(Throwable e, TaskLogger logger) {
if (e instanceof ExplicitException)
logger.error(e.getMessage());
else
@@ -899,20 +900,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
});
}
- @SuppressWarnings("unchecked")
- @Listen
- public void on(EntityPersisted event) {
- if (event.getEntity() instanceof Setting) {
- Setting setting = (Setting) event.getEntity();
- if (setting.getKey() == Key.JOB_EXECUTORS)
- jobExecutors = (List<JobExecutor>) setting.getValue();
- }
- }
-
@Sessional
@Listen
public void on(SystemStarted event) {
- jobExecutors = settingManager.getJobExecutors();
thread = new Thread(this);
thread.start();
@@ -1303,7 +1293,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz
@Override
public Map<String, byte[]> runServerStep(String jobToken, List<Integer> stepPosition,
- File filesDir, Map<String, String> placeholderValues, SimpleLogger logger) {
+ File filesDir, Map<String, String> placeholderValues, TaskLogger logger) {
return getJobContext(jobToken, true).runServerStep(stepPosition, filesDir, placeholderValues, logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
index d55ddefcdf..20c812dbb4 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java
@@ -52,7 +52,6 @@ import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.RetryCondition;
import io.onedev.server.web.editable.annotation.SuggestionProvider;
import io.onedev.server.web.util.WicketUtils;
@@ -93,9 +92,9 @@ public class Job implements NamedElement, Serializable, Validatable {
private List<CacheSpec> caches = new ArrayList<>();
- private String cpuRequirement = "250m";
+ private int cpuRequirement = 500;
- private String memoryRequirement = "128m";
+ private int memoryRequirement = 256;
private long timeout = 3600;
@@ -242,27 +241,22 @@ public class Job implements NamedElement, Serializable, Validatable {
this.retryDelay = retryDelay;
}
- @Editable(order=10050, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-cpu' target='_blank'>kubernetes documentation</a> for details")
- @Interpolative(variableSuggester="suggestVariables")
- @NotEmpty
- public String getCpuRequirement() {
+ @Editable(order=10050, name="CPU Requirement", group="More Settings", description="Specify CPU requirement of the job in millis. "
+ + "1000 millis means a single CPU core")
+ public int getCpuRequirement() {
return cpuRequirement;
}
- public void setCpuRequirement(String cpuRequirement) {
+ public void setCpuRequirement(int cpuRequirement) {
this.cpuRequirement = cpuRequirement;
}
- @Editable(order=10060, group="More Settings", description="Specify memory requirement of the job. "
- + "Refer to <a href='https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/#meaning-of-memory' target='_blank'>kubernetes documentation</a> for details")
- @Interpolative(variableSuggester="suggestVariables")
- @NotEmpty
- public String getMemoryRequirement() {
+ @Editable(order=10060, group="More Settings", description="Specify memory requirement of the job in mega bytes")
+ public int getMemoryRequirement() {
return memoryRequirement;
}
- public void setMemoryRequirement(String memoryRequirement) {
+ public void setMemoryRequirement(int memoryRequirement) {
this.memoryRequirement = memoryRequirement;
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
index 44ae32b41b..6fa6b719d0 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java
@@ -3,16 +3,20 @@ package io.onedev.server.buildspec.job;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import javax.annotation.Nullable;
+
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.Action;
import io.onedev.server.buildspec.Service;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.server.job.resource.ResourceHolder;
public abstract class JobContext {
@@ -24,9 +28,9 @@ public abstract class JobContext {
private final List<Action> actions;
- private final String cpuRequirement;
+ private final int cpuRequirement;
- private final String memoryRequirement;
+ private final int memoryRequirement;
private final ObjectId commitId;
@@ -38,7 +42,7 @@ public abstract class JobContext {
private final int retried;
- private final SimpleLogger logger;
+ private final TaskLogger logger;
private final Collection<String> allocatedCaches = new HashSet<>();
@@ -47,9 +51,9 @@ public abstract class JobContext {
protected final Collection<Thread> serverStepThreads = new ArrayList<>();
public JobContext(String projectName, Long buildNumber, File projectGitDir,
- List<Action> actions, String cpuRequirement, String memoryRequirement,
- ObjectId commitId, Collection<CacheSpec> caches, int cacheTTL,
- int retried, List<Service> services, SimpleLogger logger) {
+ List<Action> actions, int cpuRequirement, int memoryRequirement, ObjectId commitId,
+ Collection<CacheSpec> caches, int cacheTTL, int retried, List<Service> services,
+ TaskLogger logger) {
this.projectName = projectName;
this.buildNumber = buildNumber;
this.projectGitDir = projectGitDir;
@@ -84,11 +88,11 @@ public abstract class JobContext {
return commitId;
}
- public String getCpuRequirement() {
+ public int getCpuRequirement() {
return cpuRequirement;
}
- public String getMemoryRequirement() {
+ public int getMemoryRequirement() {
return memoryRequirement;
}
@@ -96,7 +100,7 @@ public abstract class JobContext {
return cacheSpecs;
}
- public SimpleLogger getLogger() {
+ public TaskLogger getLogger() {
return logger;
}
@@ -120,12 +124,12 @@ public abstract class JobContext {
return cacheCounts;
}
- public abstract void notifyJobRunning();
+ public abstract void notifyJobRunning(@Nullable Long agentId);
public abstract void reportJobWorkspace(String jobWorkspace);
public Map<String, byte[]> runServerStep(List<Integer> stepPosition,
- File filesDir, Map<String, String> placeholderValues, SimpleLogger logger) {
+ File filesDir, Map<String, String> placeholderValues, TaskLogger logger) {
Thread thread = Thread.currentThread();
synchronized (serverStepThreads) {
serverStepThreads.add(thread);
@@ -140,7 +144,7 @@ public abstract class JobContext {
}
protected abstract Map<String, byte[]> doRunServerStep(List<Integer> stepPosition,
- File filesDir, Map<String, String> placeholderValues, SimpleLogger logger);
+ File filesDir, Map<String, String> placeholderValues, TaskLogger logger);
public abstract void copyDependencies(File targetDir);
@@ -151,4 +155,19 @@ public abstract class JobContext {
}
}
+ public Map<String, Integer> getResourceRequirements() {
+ int cpu = getCpuRequirement();
+ int memory = getMemoryRequirement();
+ for (Service service: getServices()) {
+ cpu += service.getCpuRequirement();
+ memory += service.getMemoryRequirement();
+ }
+
+ Map<String, Integer> resourceRequirements = new HashMap<>();
+ resourceRequirements.put(ResourceHolder.CPU, cpu);
+ resourceRequirements.put(ResourceHolder.MEMORY, memory);
+
+ return resourceRequirements;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java
index 3fb629c07c..a524f9320a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java
@@ -71,7 +71,9 @@ public class JobDependency implements Serializable {
}
@Editable(order=300, name="Artifacts to Retrieve", description="Optionally specify artifacts to retrieve "
- + "from the dependency into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. Leave empty to do not retrieve any artifacts")
+ + "from the dependency into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. "
+ + "Only published artifacts (via artifact publish step) can be retrieved. Leave empty to not "
+ + "retrieve any artifacts")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(path=true)
@NameOfEmptyValue("Do not retrieve")
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
index 33ade3140f..c8fce7306a 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java
@@ -10,10 +10,10 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.CacheInstance;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.util.SimpleLogger;
public interface JobManager {
@@ -35,6 +35,6 @@ public interface JobManager {
@Nullable
Map<String, byte[]> runServerStep(String jobToken, List<Integer> stepPosition,
- File filesDir, Map<String, String> placeholderValues, SimpleLogger logger);
+ File filesDir, Map<String, String> placeholderValues, TaskLogger logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
index 1e05043962..6d0dfabc9f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java
@@ -3,8 +3,8 @@ package io.onedev.server.buildspec.job.action.condition;
import java.util.regex.Pattern;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.model.Build;
+import io.onedev.server.tasklog.LogManager;
import io.onedev.server.util.criteria.Criteria;
public class LogCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
index c2672e4000..423554d7f9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntryEx.java
@@ -13,6 +13,9 @@ import javax.annotation.Nullable;
import com.google.common.base.Splitter;
import com.google.common.collect.Lists;
+import io.onedev.server.tasklog.Style;
+import io.onedev.server.tasklog.StyleBuilder;
+
public class JobLogEntryEx implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/Message.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/Message.java
index 83b7b4ca40..3f939bed9b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/Message.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/Message.java
@@ -5,6 +5,8 @@ import java.io.Serializable;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
+import io.onedev.server.tasklog.Style;
+
public class Message implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
index 2f47959232..0ace4b3146 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java
@@ -87,7 +87,8 @@ public class ProjectDependency implements Serializable {
return null;
}
- @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>")
+ @Editable(order=400, name="Artifacts to Retrieve", description="Specify artifacts to retrieve into <a href='$docRoot/pages/concepts.md#job-workspace'>job workspace</a>. "
+ + "Only published artifacts (via artifact publish step) can be retrieved.")
@Interpolative(variableSuggester="suggestVariables")
@Patterns(path=true)
@NotEmpty
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
index 27352e869c..f926bffc0f 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java
@@ -3,8 +3,8 @@ package io.onedev.server.buildspec.job.retrycondition;
import java.util.regex.Pattern;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.model.Build;
+import io.onedev.server.tasklog.LogManager;
import io.onedev.server.util.criteria.Criteria;
public class LogCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
index e89e4b0bd2..74c55c0a6c 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CloseMilestoneStep.java
@@ -8,6 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.MilestoneManager;
@@ -15,7 +16,6 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -43,7 +43,7 @@ public class CloseMilestoneStep extends ServerStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger) {
OneDev.getInstance(TransactionManager.class).run(new Runnable() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
index b54715e0fb..3007d3d46b 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/CreateTagStep.java
@@ -10,13 +10,13 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Multiline;
@@ -58,7 +58,7 @@ public class CreateTagStep extends ServerStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger) {
PersonIdent tagIdent = OneDev.getInstance(UserManager.class).getSystem().asPerson();
Project project = build.getProject();
String tagName = getTagName();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
index b2ae02679f..6f74e19e36 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/PublishArtifactStep.java
@@ -10,9 +10,9 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.model.Build;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -49,7 +49,7 @@ public class PublishArtifactStep extends ServerStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger jobLogger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger jobLogger) {
LockUtils.write(build.getArtifactsLockKey(), new Callable<Void>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java
index 04706d9c04..d4c5da90d3 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/ServerStep.java
@@ -8,12 +8,12 @@ import java.util.function.Consumer;
import javax.annotation.Nullable;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.Executable;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.k8shelper.ServerExecutable;
import io.onedev.server.buildspec.param.ParamCombination;
import io.onedev.server.model.Build;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.web.editable.EditableStringVisitor;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -32,7 +32,7 @@ public abstract class ServerStep extends Step {
}
@Nullable
- public abstract Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger);
+ public abstract Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger);
public Collection<String> getPlaceholders() {
Collection<String> placeholders = new HashSet<>();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java
index 9aae16b23d..6efe66a218 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/step/SetBuildVersionStep.java
@@ -13,12 +13,12 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.event.build.BuildUpdated;
import io.onedev.server.model.Build;
import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -46,7 +46,7 @@ public class SetBuildVersionStep extends ServerStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger jobLogger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger jobLogger) {
return OneDev.getInstance(TransactionManager.class).call(new Callable<Map<String, byte[]>>() {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java
new file mode 100644
index 0000000000..989c5f0bc2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentAttributeManager.java
@@ -0,0 +1,16 @@
+package io.onedev.server.entitymanager;
+
+import java.util.List;
+import java.util.Map;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface AgentAttributeManager extends EntityManager<AgentAttribute> {
+
+ List<String> getAttributeNames();
+
+ void syncAttributes(Agent agent, Map<String, String> attributeMap);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
new file mode 100644
index 0000000000..09bc984f94
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentManager.java
@@ -0,0 +1,53 @@
+package io.onedev.server.entitymanager;
+
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jetty.websocket.api.Session;
+
+import io.onedev.agent.AgentData;
+import io.onedev.server.model.Agent;
+import io.onedev.server.persistence.dao.EntityManager;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+
+public interface AgentManager extends EntityManager<Agent> {
+
+ String getAgentVersion();
+
+ Collection<String> getAgentLibs();
+
+ Long agentConnected(AgentData data, Session session);
+
+ void agentDisconnected(Long agentId);
+
+ Agent findByName(String name);
+
+ Collection<Long> getOnlineAgentIds();
+
+ List<String> getOsArchs();
+
+ List<Agent> query(EntityQuery<Agent> agentQuery, int firstResult, int maxResults);
+
+ int count(@Nullable EntityCriteria<Agent> agentCriteria);
+
+ void restart(Agent agent);
+
+ void delete(Collection<Agent> agents);
+
+ void restart(Collection<Agent> agents);
+
+ void pause(Collection<Agent> agents);
+
+ void resume(Collection<Agent> agents);
+
+ void attributesUpdated(Agent agent);
+
+ List<String> getAgentLog(Agent agent);
+
+ @Nullable
+ Session getAgentSession(Long agentId);
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java
new file mode 100644
index 0000000000..6ad3afdee4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/AgentTokenManager.java
@@ -0,0 +1,17 @@
+package io.onedev.server.entitymanager;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.AgentToken;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface AgentTokenManager extends EntityManager<AgentToken> {
+
+ @Nullable
+ AgentToken find(String value);
+
+ List<AgentToken> queryUnused();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
index 3cfe4cf506..4b36ab350b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java
@@ -9,6 +9,7 @@ import javax.annotation.Nullable;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.server.model.Agent;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
@@ -78,4 +79,6 @@ public interface BuildManager extends EntityManager<Build> {
void delete(Collection<Build> builds);
+ Collection<Build> query(Agent agent, @Nullable Build.Status status);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java
index 344450a2aa..71e3223c87 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildParamManager.java
@@ -13,6 +13,6 @@ public interface BuildParamManager extends EntityManager<BuildParam> {
void deleteParams(Build build);
- Collection<String> getBuildParamNames(@Nullable Project project);
+ Collection<String> getParamNames(@Nullable Project project);
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java
new file mode 100644
index 0000000000..27aa7c7486
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildQueryPersonalizationManager.java
@@ -0,0 +1,12 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.BuildQueryPersonalization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface BuildQueryPersonalizationManager extends EntityManager<BuildQueryPersonalization> {
+
+ BuildQueryPersonalization find(Project project, User user);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildQuerySettingManager.java
deleted file mode 100644
index 936accca47..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildQuerySettingManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.entitymanager;
-
-import io.onedev.server.model.BuildQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface BuildQuerySettingManager extends EntityManager<BuildQuerySetting> {
-
- BuildQuerySetting find(Project project, User user);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java
new file mode 100644
index 0000000000..1ca350f286
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQueryPersonalizationManager.java
@@ -0,0 +1,12 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.CodeCommentQueryPersonalization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface CodeCommentQueryPersonalizationManager extends EntityManager<CodeCommentQueryPersonalization> {
+
+ CodeCommentQueryPersonalization find(Project project, User user);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQuerySettingManager.java
deleted file mode 100644
index 8eca109303..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CodeCommentQuerySettingManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.entitymanager;
-
-import io.onedev.server.model.CodeCommentQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface CodeCommentQuerySettingManager extends EntityManager<CodeCommentQuerySetting> {
-
- CodeCommentQuerySetting find(Project project, User user);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java
new file mode 100644
index 0000000000..97564ce2d3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/CommitQueryPersonalizationManager.java
@@ -0,0 +1,12 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.CommitQueryPersonalization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface CommitQueryPersonalizationManager extends EntityManager<CommitQueryPersonalization> {
+
+ CommitQueryPersonalization find(Project project, User user);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/CommitQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/CommitQuerySettingManager.java
deleted file mode 100644
index f112f9a71a..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/CommitQuerySettingManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.entitymanager;
-
-import io.onedev.server.model.CommitQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface CommitQuerySettingManager extends EntityManager<CommitQuerySetting> {
-
- CommitQuerySetting find(Project project, User user);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
new file mode 100644
index 0000000000..4d1f6bd0bd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQueryPersonalizationManager.java
@@ -0,0 +1,12 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.IssueQueryPersonalization;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface IssueQueryPersonalizationManager extends EntityManager<IssueQueryPersonalization> {
+
+ IssueQueryPersonalization find(Project project, User user);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueQuerySettingManager.java
deleted file mode 100644
index 9f9f87835e..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueQuerySettingManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.entitymanager;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.IssueQuerySetting;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface IssueQuerySettingManager extends EntityManager<IssueQuerySetting> {
-
- IssueQuerySetting find(Project project, User user);
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
new file mode 100644
index 0000000000..15f430066c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQueryPersonalizationManager.java
@@ -0,0 +1,12 @@
+package io.onedev.server.entitymanager;
+
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequestQueryPersonalization;
+import io.onedev.server.model.User;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface PullRequestQueryPersonalizationManager extends EntityManager<PullRequestQueryPersonalization> {
+
+ PullRequestQueryPersonalization find(Project project, User user);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQuerySettingManager.java
deleted file mode 100644
index 9241b61f62..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/PullRequestQuerySettingManager.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package io.onedev.server.entitymanager;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequestQuerySetting;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface PullRequestQuerySettingManager extends EntityManager<PullRequestQuerySetting> {
-
- PullRequestQuerySetting find(Project project, User user);
-
-}
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 46e6beb7a8..ea6c002543 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
@@ -7,6 +7,7 @@ import java.util.Map;
import javax.annotation.Nullable;
import io.onedev.server.model.Setting;
+import io.onedev.server.model.support.administration.AgentSetting;
import io.onedev.server.model.support.administration.BackupSetting;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
@@ -145,6 +146,10 @@ public interface SettingManager extends EntityManager<Setting> {
void saveProjectSetting(GlobalProjectSetting projectSetting);
+ AgentSetting getAgentSetting();
+
+ void saveAgentSetting(AgentSetting agentSetting);
+
SshSetting getSshSetting();
void saveSshSetting(SshSetting sshSetting);
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java
new file mode 100644
index 0000000000..c0c5278d11
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentAttributeManager.java
@@ -0,0 +1,118 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.locks.ReadWriteLock;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.query.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+
+@Singleton
+public class DefaultAgentAttributeManager extends BaseEntityManager<AgentAttribute> implements AgentAttributeManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultAgentAttributeManager.class);
+
+ private final TransactionManager transactionManager;
+
+ private final Collection<String> attributeNames = new HashSet<>();
+
+ private final ReadWriteLock attributeNamesLock = new ReentrantReadWriteLock();
+
+ @Inject
+ public DefaultAgentAttributeManager(Dao dao, TransactionManager transactionManager) {
+ super(dao);
+ this.transactionManager = transactionManager;
+ }
+
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ logger.info("Caching agent attribute info...");
+
+ Query<?> query = dao.getSession().createQuery("select name from AgentAttribute");
+ for (Object name: query.list())
+ attributeNames.add((String) name);
+ }
+
+ @Transactional
+ @Override
+ public void save(AgentAttribute attribute) {
+ super.save(attribute);
+
+ transactionManager.runAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ attributeNamesLock.writeLock().lock();
+ try {
+ attributeNames.add(attribute.getName());
+ } finally {
+ attributeNamesLock.writeLock().unlock();
+ }
+ }
+
+ });
+ }
+
+ @Override
+ public List<String> getAttributeNames() {
+ attributeNamesLock.readLock().lock();
+ try {
+ List<String> copy = new ArrayList<>(attributeNames);
+ Collections.sort(copy);
+ return copy;
+ } finally {
+ attributeNamesLock.readLock().unlock();
+ }
+ }
+
+ @Transactional
+ @Override
+ public void syncAttributes(Agent agent, Map<String, String> attributeMap) {
+ for (Iterator<AgentAttribute> it = agent.getAttributes().iterator(); it.hasNext();) {
+ AgentAttribute attribute = it.next();
+ String newValue = attributeMap.get(attribute.getName());
+ if (newValue == null) {
+ delete(attribute);
+ it.remove();
+ } else {
+ attribute.setValue(newValue);
+ }
+ }
+
+ Map<String, String> currentAttributeMap = agent.getAttributeMap();
+
+ for (Map.Entry<String, String> entry: attributeMap.entrySet()) {
+ if (!currentAttributeMap.containsKey(entry.getKey())) {
+ AgentAttribute attribute = new AgentAttribute();
+ attribute.setAgent(agent);
+ attribute.setName(entry.getKey());
+ attribute.setValue(entry.getValue());
+ save(attribute);
+ agent.getAttributes().add(attribute);
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
new file mode 100644
index 0000000000..7ce2e4c6bc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentManager.java
@@ -0,0 +1,353 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeoutException;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+import org.apache.commons.lang.SerializationUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.eclipse.jetty.websocket.api.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.query.Query;
+
+import com.google.common.base.Splitter;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.agent.AgentData;
+import io.onedev.agent.Message;
+import io.onedev.agent.MessageType;
+import io.onedev.agent.WebsocketUtils;
+import io.onedev.agent.job.LogRequest;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.event.agent.AgentConnected;
+import io.onedev.server.event.agent.AgentDisconnected;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.model.AgentToken;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.EntitySort.Direction;
+import io.onedev.server.search.entity.agent.AgentQuery;
+
+@Singleton
+public class DefaultAgentManager extends BaseEntityManager<Agent> implements AgentManager {
+
+ private final AgentAttributeManager attributeManager;
+
+ private final AgentTokenManager tokenManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final String agentVersion;
+
+ private final Collection<String> agentLibs;
+
+ private final Map<Long, Session> agentSessions = new ConcurrentHashMap<>();
+
+ private final Set<String> osArchs = new HashSet<>();
+
+ @Inject
+ public DefaultAgentManager(Dao dao, AgentAttributeManager attributeManager, AgentTokenManager tokenManager,
+ ListenerRegistry listenerRegistry) {
+ super(dao);
+
+ this.attributeManager = attributeManager;
+ this.tokenManager = tokenManager;
+ this.listenerRegistry = listenerRegistry;
+
+ Properties props = new Properties();
+ agentLibs = new HashSet<>();
+ try (InputStream is = Agent.class.getClassLoader().getResourceAsStream("META-INF/onedev-agent.properties")) {
+ props = new Properties();
+ props.load(is);
+ for (String dependency: Splitter.on(';').omitEmptyStrings().split(props.getProperty("dependencies")))
+ agentLibs.add(StringUtils.replace(dependency, ":", "-") + ".jar");
+ agentVersion = props.getProperty("version");
+ agentLibs.add(props.getProperty("id") + "-" + agentVersion + ".jar");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ @Sessional
+ @Listen
+ public void on(SystemStarted event) {
+ Query<String> query = dao.getSession().createQuery(String.format("select %s from Agent", Agent.PROP_OS_ARCH));
+ for (String osArch: query.list())
+ osArchs.add(osArch);
+ }
+
+ @Override
+ public String getAgentVersion() {
+ return agentVersion;
+ }
+
+ @Override
+ public Collection<String> getAgentLibs() {
+ return agentLibs;
+ }
+
+ @Transactional
+ @Override
+ public Long agentConnected(AgentData data, Session session) {
+ for (String attributeName: data.getAttributes().keySet()) {
+ if (Agent.ALL_FIELDS.contains(attributeName))
+ throw new ExplicitException("Attribute '" + attributeName + "' is reserved");
+ }
+
+ AgentToken token = tokenManager.find(data.getToken());
+ if (token == null) {
+ throw new ExplicitException("Invalid agent token");
+ } else {
+ Agent agent = token.getAgent();
+ if (agent == null) {
+ if (findByName(data.getName()) != null)
+ throw new ExplicitException("Name '" + data.getName() + "' already used by another agent");
+ agent = new Agent();
+ agent.setToken(token);
+ agent.setOs(data.getOs());
+ agent.setOsVersion(data.getOsVersion());
+ agent.setOsArch(data.getOsArch());
+ agent.setName(data.getName());
+ agent.setCpu(data.getCpu());
+ agent.setMemory(data.getMemory());
+ agent.setIpAddress(session.getRemoteAddress().getAddress().getHostAddress());
+ save(agent);
+
+ for (Map.Entry<String, String> entry: data.getAttributes().entrySet()) {
+ AgentAttribute attribute = new AgentAttribute();
+ attribute.setAgent(agent);
+ attribute.setName(entry.getKey());
+ attribute.setValue(entry.getValue());
+ attributeManager.save(attribute);
+ agent.getAttributes().add(attribute);
+ }
+ } else if (!agentSessions.containsKey(agent.getId())) {
+ Agent agentWithSameName = findByName(data.getName());
+ if (agentWithSameName != null && !agentWithSameName.equals(agent))
+ throw new ExplicitException("Name '" + data.getName() + "' already used by another agent");
+ agent.setName(data.getName());
+ agent.setOs(data.getOs());
+ agent.setOsVersion(data.getOsVersion());
+ agent.setOsArch(data.getOsArch());
+ agent.setIpAddress(session.getRemoteAddress().getAddress().getHostAddress());
+ agent.setCpu(data.getCpu());
+ agent.setMemory(data.getMemory());
+ save(agent);
+ attributeManager.syncAttributes(agent, data.getAttributes());
+ } else {
+ throw new ExplicitException("Token already used by another agent");
+ }
+
+ Session prevSession = agentSessions.put(agent.getId(), session);
+ if (prevSession != null) {
+ try {
+ prevSession.disconnect();
+ } catch (IOException e) {
+ }
+ }
+
+ listenerRegistry.post(new AgentConnected(agent));
+
+ return agent.getId();
+ }
+ }
+
+ @Transactional
+ @Override
+ public void agentDisconnected(Long agentId) {
+ agentSessions.remove(agentId);
+ listenerRegistry.post(new AgentDisconnected(load(agentId)));
+ }
+
+ @Override
+ public void save(Agent agent) {
+ super.save(agent);
+ osArchs.add(agent.getOsArch());
+ }
+
+ @Transactional
+ @Override
+ public void delete(Agent agent) {
+ Query<?> query = getSession().createQuery("update Build set agent=null where agent=:agent");
+ query.setParameter("agent", agent);
+ query.executeUpdate();
+
+ super.delete(agent);
+ dao.remove(agent.getToken());
+
+ Session prevSession = agentSessions.remove(agent.getId());
+ if (prevSession != null) {
+ try {
+ prevSession.disconnect();
+ } catch (IOException e) {
+ }
+ }
+ }
+
+ @Sessional
+ @Override
+ public Agent findByName(String name) {
+ EntityCriteria<Agent> criteria = newCriteria();
+ criteria.add(Restrictions.eq(Agent.PROP_NAME, name));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+ @Override
+ public Collection<Long> getOnlineAgentIds() {
+ return agentSessions.keySet();
+ }
+
+ @Sessional
+ @Override
+ public List<String> getOsArchs() {
+ List<String> osArchs = new ArrayList<>(this.osArchs);
+ Collections.sort(osArchs);
+ return osArchs;
+ }
+
+ private CriteriaQuery<Agent> buildCriteriaQuery(org.hibernate.Session session, EntityQuery<Agent> agentQuery) {
+ CriteriaBuilder builder = session.getCriteriaBuilder();
+ CriteriaQuery<Agent> query = builder.createQuery(Agent.class);
+ Root<Agent> root = query.from(Agent.class);
+ query.select(root);
+
+ if (agentQuery.getCriteria() != null)
+ query.where(agentQuery.getCriteria().getPredicate(root, builder));
+
+ List<javax.persistence.criteria.Order> orders = new ArrayList<>();
+ for (EntitySort sort: agentQuery.getSorts()) {
+ if (sort.getDirection() == Direction.ASCENDING)
+ orders.add(builder.asc(AgentQuery.getPath(root, Agent.ORDER_FIELDS.get(sort.getField()))));
+ else
+ orders.add(builder.desc(AgentQuery.getPath(root, Agent.ORDER_FIELDS.get(sort.getField()))));
+ }
+
+ if (orders.isEmpty())
+ orders.add(builder.asc(AgentQuery.getPath(root, Agent.PROP_NAME)));
+ query.orderBy(orders);
+
+ return query;
+ }
+
+ @Sessional
+ @Override
+ public List<Agent> query(EntityQuery<Agent> agentQuery, int firstResult, int maxResults) {
+ CriteriaQuery<Agent> criteriaQuery = buildCriteriaQuery(getSession(), agentQuery);
+ Query<Agent> query = getSession().createQuery(criteriaQuery);
+ query.setFirstResult(firstResult);
+ query.setMaxResults(maxResults);
+ return query.getResultList();
+ }
+
+ @Sessional
+ @Override
+ public int count(io.onedev.server.search.entity.EntityCriteria<Agent> agentCriteria) {
+ CriteriaBuilder builder = getSession().getCriteriaBuilder();
+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);
+ Root<Agent> root = criteriaQuery.from(Agent.class);
+
+ if (agentCriteria != null)
+ criteriaQuery.where(agentCriteria.getPredicate(root, builder));
+
+ criteriaQuery.select(builder.count(root));
+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();
+ }
+
+ @Sessional
+ @Override
+ public void restart(Agent agent) {
+ Session session = agentSessions.get(agent.getId());
+ if (session != null)
+ new Message(MessageType.RESTART, new byte[0]).sendBy(session);
+ }
+
+ @Transactional
+ @Override
+ public void delete(Collection<Agent> agents) {
+ for (Agent agent: agents)
+ delete(agent);
+ }
+
+ @Transactional
+ @Override
+ public void restart(Collection<Agent> agents) {
+ for (Agent agent: agents)
+ restart(agent);
+ }
+
+ @Transactional
+ @Override
+ public void pause(Collection<Agent> agents) {
+ for (Agent agent: agents) {
+ agent.setPaused(true);
+ save(agent);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void resume(Collection<Agent> agents) {
+ for (Agent agent: agents) {
+ agent.setPaused(false);
+ save(agent);
+ }
+ }
+
+ @Override
+ public void attributesUpdated(Agent agent) {
+ Session session = agentSessions.get(agent.getId());
+ if (session != null) {
+ byte[] attributeBytes = SerializationUtils.serialize((Serializable) agent.getAttributeMap());
+ new Message(MessageType.UPDATE_ATTRIBUTES, attributeBytes).sendBy(session);
+ }
+ }
+
+ @Override
+ public List<String> getAgentLog(Agent agent) {
+ Session session = agentSessions.get(agent.getId());
+ if (session != null) {
+ try {
+ return WebsocketUtils.call(session, new LogRequest(), 60000);
+ } catch (InterruptedException | TimeoutException e) {
+ throw new RuntimeException(e);
+ }
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ @Override
+ public Session getAgentSession(Long agentId) {
+ return agentSessions.get(agentId);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java
new file mode 100644
index 0000000000..f561397a56
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultAgentTokenManager.java
@@ -0,0 +1,38 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.model.AgentToken;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultAgentTokenManager extends BaseEntityManager<AgentToken> implements AgentTokenManager {
+
+ @Inject
+ public DefaultAgentTokenManager(Dao dao) {
+ super(dao);
+ }
+
+ @Override
+ public AgentToken find(String value) {
+ EntityCriteria<AgentToken> criteria = newCriteria();
+ criteria.add(Restrictions.eq(AgentToken.PROP_VALUE, value));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public List<AgentToken> queryUnused() {
+ return getSession().createQuery("select token from AgentToken token left join token.agent agent where agent = null").list();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 2e4c12b96f..41e9a0c749 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -54,6 +54,7 @@ import io.onedev.server.event.entity.EntityPersisted;
import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.model.Agent;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.BuildDependence;
@@ -1010,5 +1011,15 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
for (Build build: builds)
delete(build);
}
+
+ @Sessional
+ @Override
+ public Collection<Build> query(Agent agent, Status status) {
+ EntityCriteria<Build> criteria = EntityCriteria.of(Build.class);
+ EntityCriteria<Build> agentCriteria = criteria.createCriteria(Build.PROP_AGENT, org.hibernate.sql.JoinType.INNER_JOIN);
+ if (status != null)
+ agentCriteria.add(Restrictions.eq(Build.PROP_STATUS, status));
+ return query(criteria);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
index 04904f76de..d205dbf4ab 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java
@@ -38,9 +38,9 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
private final TransactionManager transactionManager;
- private final Map<Long, Collection<String>> buildParams = new HashMap<>();
+ private final Map<Long, Collection<String>> paramNames = new HashMap<>();
- private final ReadWriteLock buildParamsLock = new ReentrantReadWriteLock();
+ private final ReadWriteLock paramNamesLock = new ReentrantReadWriteLock();
@Inject
public DefaultBuildParamManager(Dao dao, TransactionManager transactionManager) {
@@ -73,7 +73,7 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
for (Object[] fields: (List<Object[]>)query.list()) {
Long projectId = projectIds.get(fields[0]);
if (projectId != null)
- addBuildParam(projectId, (String) fields[1]);
+ addParam(projectId, (String) fields[1]);
}
}
@@ -90,11 +90,11 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
@Override
public void run() {
- buildParamsLock.writeLock().lock();
+ paramNamesLock.writeLock().lock();
try {
- addBuildParam(projectId, paramName);
+ addParam(projectId, paramName);
} finally {
- buildParamsLock.writeLock().unlock();
+ paramNamesLock.writeLock().unlock();
}
}
@@ -102,27 +102,27 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
}
}
- private void addBuildParam(Long projectId, String paramName) {
- Collection<String> paramsOfProject = buildParams.get(projectId);
+ private void addParam(Long projectId, String paramName) {
+ Collection<String> paramsOfProject = paramNames.get(projectId);
if (paramsOfProject == null) {
paramsOfProject = new HashSet<>();
- buildParams.put(projectId, paramsOfProject);
+ paramNames.put(projectId, paramsOfProject);
}
paramsOfProject.add(paramName);
}
@Override
- public Collection<String> getBuildParamNames(@Nullable Project project) {
- buildParamsLock.readLock().lock();
+ public Collection<String> getParamNames(@Nullable Project project) {
+ paramNamesLock.readLock().lock();
try {
- Collection<String> buildParams = new HashSet<>();
- for (Map.Entry<Long, Collection<String>> entry: this.buildParams.entrySet()) {
+ Collection<String> paramNames = new HashSet<>();
+ for (Map.Entry<Long, Collection<String>> entry: this.paramNames.entrySet()) {
if (project == null || project.getId().equals(entry.getKey()))
- buildParams.addAll(entry.getValue());
+ paramNames.addAll(entry.getValue());
}
- return buildParams;
+ return paramNames;
} finally {
- buildParamsLock.readLock().unlock();
+ paramNamesLock.readLock().unlock();
}
}
@@ -135,14 +135,14 @@ public class DefaultBuildParamManager extends BaseEntityManager<BuildParam> impl
@Override
public void run() {
- buildParamsLock.writeLock().lock();
+ paramNamesLock.writeLock().lock();
try {
- for (Iterator<Map.Entry<Long, Collection<String>>> it = buildParams.entrySet().iterator(); it.hasNext();) {
+ for (Iterator<Map.Entry<Long, Collection<String>>> it = paramNames.entrySet().iterator(); it.hasNext();) {
if (it.next().getKey().equals(projectId))
it.remove();
}
} finally {
- buildParamsLock.writeLock().unlock();
+ paramNamesLock.writeLock().unlock();
}
}
});
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
new file mode 100644
index 0000000000..823a194d09
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
@@ -0,0 +1,59 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
+import io.onedev.server.model.BuildQueryPersonalization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.NamedQuery;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultBuildQueryPersonalizationManager extends BaseEntityManager<BuildQueryPersonalization>
+ implements BuildQueryPersonalizationManager {
+
+ @Inject
+ public DefaultBuildQueryPersonalizationManager(Dao dao) {
+ super(dao);
+ }
+
+ @Sessional
+ @Override
+ public BuildQueryPersonalization find(Project project, User user) {
+ EntityCriteria<BuildQueryPersonalization> criteria = newCriteria();
+ criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+ @Transactional
+ @Override
+ public void save(BuildQueryPersonalization personalization) {
+ Collection<String> retainNames = new HashSet<>();
+ retainNames.addAll(personalization.getQueries().stream()
+ .map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getBuildSetting().getNamedQueries(true).stream()
+ .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(retainNames);
+
+ if (personalization.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && personalization.getQueries().isEmpty()) {
+ if (!personalization.isNew())
+ delete(personalization);
+ } else {
+ super.save(personalization);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java
deleted file mode 100644
index 18a9d801ae..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.BuildQuerySettingManager;
-import io.onedev.server.model.BuildQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultBuildQuerySettingManager extends BaseEntityManager<BuildQuerySetting>
- implements BuildQuerySettingManager {
-
- @Inject
- public DefaultBuildQuerySettingManager(Dao dao) {
- super(dao);
- }
-
- @Sessional
- @Override
- public BuildQuerySetting find(Project project, User user) {
- EntityCriteria<BuildQuerySetting> criteria = newCriteria();
- criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
- criteria.setCacheable(true);
- return find(criteria);
- }
-
- @Transactional
- @Override
- public void save(BuildQuerySetting setting) {
- setting.getQuerySubscriptionSupport().getUserQuerySubscriptions().retainAll(
- setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
- setting.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(
- setting.getProject().getBuildSetting().getNamedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));
- if (setting.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {
- if (!setting.isNew())
- delete(setting);
- } else {
- super.save(setting);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java
similarity index 57%
rename from server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java
rename to server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java
index 3b3d883841..ebb7a58db2 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQuerySettingManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCodeCommentQueryPersonalizationManager.java
@@ -5,8 +5,8 @@ import javax.inject.Singleton;
import org.hibernate.criterion.Restrictions;
-import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;
-import io.onedev.server.model.CodeCommentQuerySetting;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
+import io.onedev.server.model.CodeCommentQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.persistence.annotation.Sessional;
@@ -16,18 +16,18 @@ import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.persistence.dao.EntityCriteria;
@Singleton
-public class DefaultCodeCommentQuerySettingManager extends BaseEntityManager<CodeCommentQuerySetting>
- implements CodeCommentQuerySettingManager {
+public class DefaultCodeCommentQueryPersonalizationManager extends BaseEntityManager<CodeCommentQueryPersonalization>
+ implements CodeCommentQueryPersonalizationManager {
@Inject
- public DefaultCodeCommentQuerySettingManager(Dao dao) {
+ public DefaultCodeCommentQueryPersonalizationManager(Dao dao) {
super(dao);
}
@Sessional
@Override
- public CodeCommentQuerySetting find(Project project, User user) {
- EntityCriteria<CodeCommentQuerySetting> criteria = newCriteria();
+ public CodeCommentQueryPersonalization find(Project project, User user) {
+ EntityCriteria<CodeCommentQueryPersonalization> criteria = newCriteria();
criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
criteria.setCacheable(true);
return find(criteria);
@@ -35,8 +35,8 @@ public class DefaultCodeCommentQuerySettingManager extends BaseEntityManager<Cod
@Transactional
@Override
- public void save(CodeCommentQuerySetting setting) {
- if (setting.getUserQueries().isEmpty()) {
+ public void save(CodeCommentQueryPersonalization setting) {
+ if (setting.getQueries().isEmpty()) {
if (!setting.isNew())
delete(setting);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
new file mode 100644
index 0000000000..c9f73bce23
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
@@ -0,0 +1,59 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
+import io.onedev.server.model.CommitQueryPersonalization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.NamedQuery;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<CommitQueryPersonalization>
+ implements CommitQueryPersonalizationManager {
+
+ @Inject
+ public DefaultCommitQueryPersonalizationManager(Dao dao) {
+ super(dao);
+ }
+
+ @Sessional
+ @Override
+ public CommitQueryPersonalization find(Project project, User user) {
+ EntityCriteria<CommitQueryPersonalization> criteria = newCriteria();
+ criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+ @Transactional
+ @Override
+ public void save(CommitQueryPersonalization personalization) {
+ Collection<String> retainNames = new HashSet<>();
+ retainNames.addAll(personalization.getQueries().stream()
+ .map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getNamedCommitQueries().stream()
+ .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(retainNames);
+
+ if (personalization.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && personalization.getQueries().isEmpty()) {
+ if (!personalization.isNew())
+ delete(personalization);
+ } else {
+ super.save(personalization);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java
deleted file mode 100644
index 751a7cdca7..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.CommitQuerySettingManager;
-import io.onedev.server.model.CommitQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultCommitQuerySettingManager extends BaseEntityManager<CommitQuerySetting>
- implements CommitQuerySettingManager {
-
- @Inject
- public DefaultCommitQuerySettingManager(Dao dao) {
- super(dao);
- }
-
- @Sessional
- @Override
- public CommitQuerySetting find(Project project, User user) {
- EntityCriteria<CommitQuerySetting> criteria = newCriteria();
- criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
- criteria.setCacheable(true);
- return find(criteria);
- }
-
- @Transactional
- @Override
- public void save(CommitQuerySetting setting) {
- setting.getQuerySubscriptionSupport().getUserQuerySubscriptions().retainAll(
- setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
- setting.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(
- setting.getProject().getNamedCommitQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
- if (setting.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {
- if (!setting.isNew())
- delete(setting);
- } else {
- super.save(setting);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index 1583bd9907..ec598c41d9 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -40,7 +40,7 @@ import io.onedev.commons.launcher.loader.ListenerRegistry;
import io.onedev.server.entitymanager.IssueCommentManager;
import io.onedev.server.entitymanager.IssueFieldManager;
import io.onedev.server.entitymanager.IssueManager;
-import io.onedev.server.entitymanager.IssueQuerySettingManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -56,7 +56,7 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueComment;
import io.onedev.server.model.IssueField;
-import io.onedev.server.model.IssueQuerySetting;
+import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -98,7 +98,7 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
private final ListenerRegistry listenerRegistry;
- private final IssueQuerySettingManager issueQuerySettingManager;
+ private final IssueQueryPersonalizationManager issueQueryPersonalizationManager;
private final AttachmentStorageManager attachmentStorageManager;
@@ -122,14 +122,14 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
@Inject
public DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,
- TransactionManager transactionManager, IssueQuerySettingManager issueQuerySettingManager,
+ TransactionManager transactionManager, IssueQueryPersonalizationManager issueQueryPersonalizationManager,
SettingManager settingManager, ListenerRegistry listenerRegistry,
ProjectManager projectManager, UserManager userManager,
RoleManager roleManager, AttachmentStorageManager attachmentStorageManager,
IssueCommentManager issueCommentManager, EntityReferenceManager entityReferenceManager) {
super(dao);
this.issueFieldManager = issueFieldManager;
- this.issueQuerySettingManager = issueQuerySettingManager;
+ this.issueQueryPersonalizationManager = issueQueryPersonalizationManager;
this.listenerRegistry = listenerRegistry;
this.settingManager = settingManager;
this.projectManager = projectManager;
@@ -345,11 +345,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
undefinedStates.addAll(project.getBuildSetting().getUndefinedStates(project));
}
- for (IssueQuerySetting setting: issueQuerySettingManager.query())
- populateUndefinedStates(undefinedStates, setting.getProject(), setting.getUserQueries());
+ for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ populateUndefinedStates(undefinedStates, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
- populateUndefinedStates(undefinedStates, null, user.getIssueQuerySetting().getUserQueries());
+ populateUndefinedStates(undefinedStates, null, user.getIssueQueryPersonalization().getQueries());
return undefinedStates;
}
@@ -384,11 +384,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
undefinedFields.addAll(project.getBuildSetting().getUndefinedFields(project));
}
- for (IssueQuerySetting setting: issueQuerySettingManager.query())
- populateUndefinedFields(undefinedFields, setting.getProject(), setting.getUserQueries());
+ for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ populateUndefinedFields(undefinedFields, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
- populateUndefinedFields(undefinedFields, null, user.getIssueQuerySetting().getUserQueries());
+ populateUndefinedFields(undefinedFields, null, user.getIssueQueryPersonalization().getQueries());
return undefinedFields;
}
@@ -428,11 +428,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
undefinedFieldValues.addAll(project.getBuildSetting().getUndefinedFieldValues(project));
}
- for (IssueQuerySetting setting: issueQuerySettingManager.query())
- populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getUserQueries());
+ for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
- populateUndefinedFieldValues(undefinedFieldValues, null, user.getIssueQuerySetting().getUserQueries());
+ populateUndefinedFieldValues(undefinedFieldValues, null, user.getIssueQueryPersonalization().getQueries());
return undefinedFieldValues;
}
@@ -490,11 +490,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
project.getBuildSetting().fixUndefinedStates(project, resolutions);
}
- for (IssueQuerySetting setting: issueQuerySettingManager.query())
- fixUndefinedStates(setting.getProject(), resolutions, setting.getUserQueries());
+ for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ fixUndefinedStates(setting.getProject(), resolutions, setting.getQueries());
for (User user: userManager.query())
- fixUndefinedStates(null, resolutions, user.getIssueQuerySetting().getUserQueries());
+ fixUndefinedStates(null, resolutions, user.getIssueQueryPersonalization().getQueries());
}
private void fixUndefinedStates(@Nullable Project project, Map<String, UndefinedStateResolution> resolutions,
@@ -535,11 +535,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
project.getBuildSetting().fixUndefinedFields(project, resolutions);
}
- for (IssueQuerySetting setting: issueQuerySettingManager.query())
- fixUndefinedFields(resolutions, setting.getProject(), setting.getUserQueries());
+ for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ fixUndefinedFields(resolutions, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
- fixUndefinedFields(resolutions, null, user.getIssueQuerySetting().getUserQueries());
+ fixUndefinedFields(resolutions, null, user.getIssueQueryPersonalization().getQueries());
Map<String, UndefinedFieldResolution> derivedDeletions =
getFieldResolutions(settingManager.fixUndefinedIssueFields(resolutions));
@@ -587,11 +587,11 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
project.getBuildSetting().fixUndefinedFieldValues(project, resolutions);
}
- for (IssueQuerySetting setting: issueQuerySettingManager.query())
- fixUndefinedFieldValues(resolutions, setting.getProject(), setting.getUserQueries());
+ for (IssueQueryPersonalization setting: issueQueryPersonalizationManager.query())
+ fixUndefinedFieldValues(resolutions, setting.getProject(), setting.getQueries());
for (User user: userManager.query())
- fixUndefinedFieldValues(resolutions, null, user.getIssueQuerySetting().getUserQueries());
+ fixUndefinedFieldValues(resolutions, null, user.getIssueQueryPersonalization().getQueries());
Map<String, UndefinedFieldResolution> derivedDeletions =
getFieldResolutions(settingManager.fixUndefinedIssueFieldValues(resolutions));
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
new file mode 100644
index 0000000000..09ed69c17d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
@@ -0,0 +1,59 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.model.IssueQueryPersonalization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.NamedQuery;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<IssueQueryPersonalization>
+ implements IssueQueryPersonalizationManager {
+
+ @Inject
+ public DefaultIssueQueryPersonalizationManager(Dao dao) {
+ super(dao);
+ }
+
+ @Sessional
+ @Override
+ public IssueQueryPersonalization find(Project project, User user) {
+ EntityCriteria<IssueQueryPersonalization> criteria = newCriteria();
+ criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+ @Transactional
+ @Override
+ public void save(IssueQueryPersonalization personalization) {
+ Collection<String> retainNames = new HashSet<>();
+ retainNames.addAll(personalization.getQueries().stream()
+ .map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getIssueSetting().getNamedQueries(true).stream()
+ .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ personalization.getQueryWatchSupport().getQueryWatches().keySet().retainAll(retainNames);
+
+ if (personalization.getQueryWatchSupport().getQueryWatches().isEmpty() && personalization.getQueries().isEmpty()) {
+ if (!personalization.isNew())
+ delete(personalization);
+ } else {
+ super.save(personalization);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java
deleted file mode 100644
index 9332b3d9da..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.IssueQuerySettingManager;
-import io.onedev.server.model.IssueQuerySetting;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultIssueQuerySettingManager extends BaseEntityManager<IssueQuerySetting>
- implements IssueQuerySettingManager {
-
- @Inject
- public DefaultIssueQuerySettingManager(Dao dao) {
- super(dao);
- }
-
- @Sessional
- @Override
- public IssueQuerySetting find(Project project, User user) {
- EntityCriteria<IssueQuerySetting> criteria = newCriteria();
- criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
- criteria.setCacheable(true);
- return find(criteria);
- }
-
- @Transactional
- @Override
- public void save(IssueQuerySetting setting) {
- setting.getQueryWatchSupport().getUserQueryWatches().keySet().retainAll(
- setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
- setting.getQueryWatchSupport().getQueryWatches().keySet().retainAll(
- setting.getProject().getIssueSetting().getNamedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));
- if (setting.getQueryWatchSupport().getQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {
- if (!setting.isNew())
- delete(setting);
- } else {
- super.save(setting);
- }
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
new file mode 100644
index 0000000000..884b8ca844
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
@@ -0,0 +1,59 @@
+package io.onedev.server.entitymanager.impl;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequestQueryPersonalization;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.NamedQuery;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.BaseEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityManager<PullRequestQueryPersonalization>
+ implements PullRequestQueryPersonalizationManager {
+
+ @Inject
+ public DefaultPullRequestQueryPersonalizationManager(Dao dao) {
+ super(dao);
+ }
+
+ @Sessional
+ @Override
+ public PullRequestQueryPersonalization find(Project project, User user) {
+ EntityCriteria<PullRequestQueryPersonalization> criteria = newCriteria();
+ criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
+ criteria.setCacheable(true);
+ return find(criteria);
+ }
+
+ @Transactional
+ @Override
+ public void save(PullRequestQueryPersonalization personalization) {
+ Collection<String> retainNames = new HashSet<>();
+ retainNames.addAll(personalization.getQueries().stream()
+ .map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getPullRequestSetting().getNamedQueries(true).stream()
+ .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ personalization.getQueryWatchSupport().getQueryWatches().keySet().retainAll(retainNames);
+
+ if (personalization.getQueryWatchSupport().getQueryWatches().isEmpty() && personalization.getQueries().isEmpty()) {
+ if (!personalization.isNew())
+ delete(personalization);
+ } else {
+ super.save(personalization);
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java
deleted file mode 100644
index fa03b295fc..0000000000
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.util.stream.Collectors;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.hibernate.criterion.Restrictions;
-
-import io.onedev.server.entitymanager.PullRequestQuerySettingManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequestQuerySetting;
-import io.onedev.server.model.User;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.BaseEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-
-@Singleton
-public class DefaultPullRequestQuerySettingManager extends BaseEntityManager<PullRequestQuerySetting>
- implements PullRequestQuerySettingManager {
-
- @Inject
- public DefaultPullRequestQuerySettingManager(Dao dao) {
- super(dao);
- }
-
- @Sessional
- @Override
- public PullRequestQuerySetting find(Project project, User user) {
- EntityCriteria<PullRequestQuerySetting> criteria = newCriteria();
- criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));
- criteria.setCacheable(true);
- return find(criteria);
- }
-
- @Transactional
- @Override
- public void save(PullRequestQuerySetting setting) {
- setting.getQueryWatchSupport().getUserQueryWatches().keySet().retainAll(
- setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
- setting.getQueryWatchSupport().getQueryWatches().keySet().retainAll(
- setting.getProject().getIssueSetting().getNamedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));
- if (setting.getQueryWatchSupport().getQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {
- if (!setting.isNew())
- delete(setting);
- } else {
- super.save(setting);
- }
- }
-
-}
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 ac82442fcb..8eaeaae7aa 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
@@ -20,6 +20,7 @@ import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.maintenance.DataManager;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.support.administration.AgentSetting;
import io.onedev.server.model.support.administration.BackupSetting;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
@@ -77,6 +78,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
private volatile Long projectSettingId;
+ private volatile Long agentSettingId;
+
private volatile Long sshSettingId;
private volatile Long ssoConnectorsId;
@@ -414,6 +417,32 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements
dao.persist(setting);
}
+ @Sessional
+ @Override
+ public AgentSetting getAgentSetting() {
+ Setting setting;
+ if (agentSettingId == null) {
+ setting = getSetting(Key.AGENT);
+ Preconditions.checkNotNull(setting);
+ agentSettingId = setting.getId();
+ } else {
+ setting = load(agentSettingId);
+ }
+ return (AgentSetting)setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveAgentSetting(AgentSetting agentSetting) {
+ Setting setting = getSetting(Key.AGENT);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.AGENT);
+ }
+ setting.setValue(agentSetting);
+ dao.persist(setting);
+ }
+
@Sessional
@Override
public SshSetting getSshSetting() {
diff --git a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
index fcbb5a1412..5a7cea7804 100644
--- a/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
+++ b/server-core/src/main/java/io/onedev/server/entityreference/ReferenceParser.java
@@ -64,8 +64,7 @@ public class ReferenceParser {
}
};
- NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(document);
+ NodeTraversor.traverse(visitor, document);
for (TextNode node : visitor.getMatchedNodes()) {
Matcher matcher = pattern.matcher(node.getWholeText());
diff --git a/server-core/src/main/java/io/onedev/server/event/JobExecutorStatusChanged.java b/server-core/src/main/java/io/onedev/server/event/JobExecutorStatusChanged.java
deleted file mode 100644
index 9292b7d7be..0000000000
--- a/server-core/src/main/java/io/onedev/server/event/JobExecutorStatusChanged.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package io.onedev.server.event;
-
-import java.util.Date;
-
-public class JobExecutorStatusChanged extends Event {
-
- public JobExecutorStatusChanged() {
- super(null, new Date());
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java b/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java
new file mode 100644
index 0000000000..58d28d9ab9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/agent/AgentConnected.java
@@ -0,0 +1,11 @@
+package io.onedev.server.event.agent;
+
+import io.onedev.server.model.Agent;
+
+public class AgentConnected extends AgentEvent {
+
+ public AgentConnected(Agent agent) {
+ super(agent);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/agent/AgentDisconnected.java b/server-core/src/main/java/io/onedev/server/event/agent/AgentDisconnected.java
new file mode 100644
index 0000000000..8b3b6e61a3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/agent/AgentDisconnected.java
@@ -0,0 +1,11 @@
+package io.onedev.server.event.agent;
+
+import io.onedev.server.model.Agent;
+
+public class AgentDisconnected extends AgentEvent {
+
+ public AgentDisconnected(Agent agent) {
+ super(agent);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java b/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java
new file mode 100644
index 0000000000..860fa4e96a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/event/agent/AgentEvent.java
@@ -0,0 +1,21 @@
+package io.onedev.server.event.agent;
+
+import java.util.Date;
+
+import io.onedev.server.event.Event;
+import io.onedev.server.model.Agent;
+
+public abstract class AgentEvent extends Event {
+
+ private final Agent agent;
+
+ public AgentEvent(Agent agent) {
+ super(null, new Date());
+ this.agent = agent;
+ }
+
+ public Agent getAgent() {
+ return agent;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/git/GitVersion.java b/server-core/src/main/java/io/onedev/server/git/GitVersion.java
deleted file mode 100644
index b4cf0c6a23..0000000000
--- a/server-core/src/main/java/io/onedev/server/git/GitVersion.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package io.onedev.server.git;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.apache.commons.lang3.math.NumberUtils;
-
-import io.onedev.commons.utils.StringUtils;
-
-public class GitVersion implements Comparable<GitVersion> {
-
- private List<Integer> parts = new ArrayList<Integer>();
-
- private boolean msysgit = false;
-
- public GitVersion(String versionStr) {
- for (String each: StringUtils.splitAndTrim(versionStr, ".")) {
- if (NumberUtils.isDigits(each))
- parts.add(Integer.valueOf(each));
- else if (each.equals("msysgit"))
- msysgit = true;
- }
- }
-
- public List<Integer> getParts() {
- return Collections.unmodifiableList(parts);
- }
-
- public boolean isMsysgit() {
- return msysgit;
- }
-
- @Override
- public int compareTo(GitVersion version) {
- List<Integer> otherParts = version.getParts();
- int index = 0;
- for (int part: parts) {
- int otherPart = 0;
- if (index < otherParts.size())
- otherPart = otherParts.get(index);
- if (part < otherPart)
- return -1;
- else if (part > otherPart)
- return 1;
- index++;
- }
-
- for (int i=index; i<otherParts.size(); i++) {
- int otherPart = otherParts.get(i);
- if (otherPart > 0)
- return -1;
- else if (otherPart < 0)
- return 1;
- }
-
- return 0;
- }
-
- public boolean isNotOlderThan(GitVersion version) {
- return compareTo(version) >= 0;
- }
-
- public boolean isNewerThan(GitVersion version) {
- return compareTo(version) > 0;
- }
-
- public boolean isNotNewerThan(GitVersion version) {
- return compareTo(version) <= 0;
- }
-
- public boolean isOlderThan(GitVersion version) {
- return compareTo(version) < 0;
- }
-
- @Override
- public String toString() {
- List<String> parts = new ArrayList<String>();
- for (Integer each: this.parts)
- parts.add(each.toString());
-
- return StringUtils.join(parts, ".");
- }
-}
diff --git a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java
index 4114b33d38..3b2695a7a7 100644
--- a/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java
+++ b/server-core/src/main/java/io/onedev/server/git/command/GitCommand.java
@@ -6,22 +6,16 @@ import java.util.StringTokenizer;
import javax.annotation.Nullable;
-import org.apache.commons.lang3.exception.ExceptionUtils;
import org.eclipse.jgit.util.QuotedString;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import io.onedev.agent.Agent;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-import io.onedev.server.git.GitVersion;
import io.onedev.server.git.config.GitConfig;
public abstract class GitCommand<V> {
- private static final Logger logger = LoggerFactory.getLogger(GitCommand.class);
-
// requires at least 2.11.1 to use allowAnySHA1InWant
private static final String MIN_VERSION = "2.11.1";
@@ -50,45 +44,7 @@ public abstract class GitCommand<V> {
*
*/
public static String checkError(String gitExe) {
- try {
- final String[] version = new String[]{null};
-
- new Commandline(gitExe).addArgs("--version").execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.startsWith("git version "))
- version[0] = line.substring("git version ".length());
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.error(line);
- }
-
- }).checkReturnCode();
-
- if (version[0] == null)
- return "Unable to determine git version of '" + gitExe + "'";
-
- GitVersion gitVersion = new GitVersion(version[0]);
-
- if (gitVersion.isOlderThan(new GitVersion(MIN_VERSION)))
- return "Version of git is " + gitVersion + ". OneDev requires at least " + MIN_VERSION;
-
- return null;
-
- } catch (Exception e) {
- String message = ExceptionUtils.getMessage(e);
- if (message.contains("CreateProcess error=2"))
- return "Unable to find git command: " + gitExe;
- else if (message.contains("error launching git"))
- return "Unable to launch git command: " + gitExe;
- else
- return message;
- }
+ return Agent.checkGitError(gitExe, MIN_VERSION);
}
public Commandline cmd() {
diff --git a/server-core/src/main/java/io/onedev/server/imports/Importer.java b/server-core/src/main/java/io/onedev/server/imports/Importer.java
index 2108262788..753a49d4a9 100644
--- a/server-core/src/main/java/io/onedev/server/imports/Importer.java
+++ b/server-core/src/main/java/io/onedev/server/imports/Importer.java
@@ -3,8 +3,8 @@ package io.onedev.server.imports;
import java.io.Serializable;
import java.util.List;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.util.SimpleLogger;
public abstract class Importer<Where extends Serializable, What extends Serializable, How extends Serializable> implements Serializable {
@@ -38,8 +38,8 @@ public abstract class Importer<Where extends Serializable, What extends Seriali
public abstract String getName();
- public abstract What getWhat(Where where, SimpleLogger logger);
+ public abstract What getWhat(Where where, TaskLogger logger);
- public abstract How getHow(Where where, What what, SimpleLogger logger);
+ public abstract How getHow(Where where, What what, TaskLogger logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/imports/IssueImporter.java b/server-core/src/main/java/io/onedev/server/imports/IssueImporter.java
index d9bcbc8c65..592f84ac97 100644
--- a/server-core/src/main/java/io/onedev/server/imports/IssueImporter.java
+++ b/server-core/src/main/java/io/onedev/server/imports/IssueImporter.java
@@ -4,8 +4,8 @@ import java.io.Serializable;
import javax.annotation.Nullable;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.model.Project;
-import io.onedev.server.util.SimpleLogger;
public abstract class IssueImporter<Where extends Serializable, What extends Serializable, How extends Serializable>
extends Importer<Where, What, How> {
@@ -14,6 +14,6 @@ public abstract class IssueImporter<Where extends Serializable, What extends Se
@Nullable
public abstract String doImport(Where where, What what, How how, Project project,
- boolean dryRun, SimpleLogger logger);
+ boolean dryRun, TaskLogger logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java
index 65f8db6ecb..c1b44d7a38 100644
--- a/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java
+++ b/server-core/src/main/java/io/onedev/server/imports/ProjectImporter.java
@@ -4,7 +4,7 @@ import java.io.Serializable;
import javax.annotation.Nullable;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.commons.utils.TaskLogger;
public abstract class ProjectImporter<Where extends Serializable, What extends Serializable, How extends Serializable>
extends Importer<Where, What, How> {
@@ -13,6 +13,6 @@ public abstract class ProjectImporter<Where extends Serializable, What extends
@Nullable
public abstract String doImport(Where where, What what, How how,
- boolean dryRun, SimpleLogger logger);
+ boolean dryRun, TaskLogger logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/AlwaysCriteria.java
similarity index 67%
rename from server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/match/AlwaysCriteria.java
index c9dcbda12b..6ed7f7980c 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/AlwaysCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/AlwaysCriteria.java
@@ -1,7 +1,7 @@
-package io.onedev.server.util.jobmatch;
+package io.onedev.server.job.match;
-import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
-import static io.onedev.server.util.jobmatch.JobMatchLexer.All;
+import static io.onedev.server.job.match.JobMatch.getRuleName;
+import static io.onedev.server.job.match.JobMatchLexer.All;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
similarity index 75%
rename from server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
index 2854bc5ebd..4406e30c5d 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/BranchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/BranchCriteria.java
@@ -1,10 +1,10 @@
-package io.onedev.server.util.jobmatch;
+package io.onedev.server.job.match;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
-import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
-import static io.onedev.server.util.jobmatch.JobMatchLexer.OnBranch;
+import static io.onedev.server.job.match.JobMatch.getRuleName;
+import static io.onedev.server.job.match.JobMatchLexer.OnBranch;
public class BranchCriteria extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.g4 b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.g4
rename to server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
similarity index 89%
rename from server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
rename to server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
index 57c0f538ff..17967fa060 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
@@ -1,4 +1,4 @@
-package io.onedev.server.util.jobmatch;
+package io.onedev.server.job.match;
import java.util.ArrayList;
import java.util.List;
@@ -15,19 +15,19 @@ import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.job.match.JobMatchParser.AndCriteriaContext;
+import io.onedev.server.job.match.JobMatchParser.CriteriaContext;
+import io.onedev.server.job.match.JobMatchParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.job.match.JobMatchParser.JobMatchContext;
+import io.onedev.server.job.match.JobMatchParser.NotCriteriaContext;
+import io.onedev.server.job.match.JobMatchParser.OperatorValueCriteriaContext;
+import io.onedev.server.job.match.JobMatchParser.OrCriteriaContext;
+import io.onedev.server.job.match.JobMatchParser.ParensCriteriaContext;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import io.onedev.server.util.jobmatch.JobMatchParser.AndCriteriaContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.CriteriaContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.FieldOperatorValueCriteriaContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.JobMatchContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.NotCriteriaContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.OperatorValueCriteriaContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.OrCriteriaContext;
-import io.onedev.server.util.jobmatch.JobMatchParser.ParensCriteriaContext;
public class JobMatch extends Criteria<Build> {
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/NameCriteria.java
similarity index 79%
rename from server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/match/NameCriteria.java
index 5e606894cc..59fc61b930 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/NameCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/NameCriteria.java
@@ -1,8 +1,8 @@
-package io.onedev.server.util.jobmatch;
+package io.onedev.server.job.match;
+import static io.onedev.server.job.match.JobMatch.getRuleName;
import static io.onedev.server.model.Build.NAME_JOB;
-import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
-import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;
+import static io.onedev.server.job.match.JobMatchLexer.Is;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
diff --git a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
similarity index 84%
rename from server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java
rename to server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
index ebbb06cf61..c512751ef1 100644
--- a/server-core/src/main/java/io/onedev/server/util/jobmatch/ProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/ProjectCriteria.java
@@ -1,8 +1,8 @@
-package io.onedev.server.util.jobmatch;
+package io.onedev.server.job.match;
+import static io.onedev.server.job.match.JobMatch.getRuleName;
import static io.onedev.server.model.Build.NAME_PROJECT;
-import static io.onedev.server.util.jobmatch.JobMatch.getRuleName;
-import static io.onedev.server.util.jobmatch.JobMatchLexer.Is;
+import static io.onedev.server.job.match.JobMatchLexer.Is;
import io.onedev.server.model.Build;
import io.onedev.server.util.criteria.Criteria;
diff --git a/server-core/src/main/java/io/onedev/server/job/resource/AgentAwareRunnable.java b/server-core/src/main/java/io/onedev/server/job/resource/AgentAwareRunnable.java
new file mode 100644
index 0000000000..6850a0f108
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/resource/AgentAwareRunnable.java
@@ -0,0 +1,11 @@
+package io.onedev.server.job.resource;
+
+import org.eclipse.jetty.websocket.api.Session;
+
+import io.onedev.agent.AgentData;
+
+public interface AgentAwareRunnable {
+
+ void runOn(Long agentId, Session agentSession, AgentData agentData);
+
+}
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
new file mode 100644
index 0000000000..66c5babf62
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/resource/DefaultResourceManager.java
@@ -0,0 +1,230 @@
+package io.onedev.server.job.resource;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Collectors;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jetty.websocket.api.Session;
+import org.hibernate.query.Query;
+
+import io.onedev.agent.AgentData;
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.event.agent.AgentConnected;
+import io.onedev.server.event.agent.AgentDisconnected;
+import io.onedev.server.event.entity.EntityPersisted;
+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.GlobalBuildSetting;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.search.entity.agent.AgentQuery;
+
+@Singleton
+public class DefaultResourceManager implements ResourceManager {
+
+ private final SettingManager settingManager;
+
+ private final AgentManager agentManager;
+
+ private ResourceHolder serverResourceHolder;
+
+ private final Map<Long, Boolean> agentPaused = new HashMap<>();
+
+ private final Map<Long, ResourceHolder> agentResourceHolders = new HashMap<>();
+
+ private final Map<String, QueryCache> queryCaches = new HashMap<>();
+
+ private final Dao dao;
+
+ @Inject
+ public DefaultResourceManager(Dao dao, SettingManager settingManager, AgentManager agentManager) {
+ this.dao = dao;
+ this.settingManager = settingManager;
+ this.agentManager = agentManager;
+ }
+
+ @SuppressWarnings("unchecked")
+ @Transactional
+ @Listen
+ public synchronized void on(SystemStarted event) {
+ Map<String, Integer> resources = new HashMap<>();
+ resources.put(ResourceHolder.CPU, settingManager.getBuildSetting().getCpu());
+ resources.put(ResourceHolder.MEMORY, settingManager.getBuildSetting().getMemory());
+ serverResourceHolder = new ResourceHolder(resources);
+
+ Query<?> query = dao.getSession().createQuery(String.format("select id, %s from Agent", Agent.PROP_PAUSED));
+ for (Object[] fields: (List<Object[]>)query.list())
+ agentPaused.put((Long)fields[0], (Boolean)fields[1]);
+ }
+
+ @Transactional
+ @Listen
+ public synchronized void on(AgentConnected event) {
+ Agent agent = event.getAgent();
+ agentResourceHolders.put(agent.getId(), new ResourceHolder(agent.getResources()));
+ for (QueryCache cache: queryCaches.values()) {
+ if (cache.query.matches(agent))
+ cache.result.add(agent.getId());
+ }
+ notifyAll();
+ }
+
+ @Transactional
+ @Listen
+ public synchronized void on(AgentDisconnected event) {
+ Long agentId = event.getAgent().getId();
+ agentResourceHolders.remove(agentId);
+ for (QueryCache cache: queryCaches.values())
+ cache.result.remove(agentId);
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityPersisted event) {
+ if (serverResourceHolder != null && event.getEntity() instanceof Setting) {
+ Setting setting = (Setting) event.getEntity();
+ if (setting.getKey() == Setting.Key.BUILD) {
+ GlobalBuildSetting buildSetting = (GlobalBuildSetting) setting.getValue();
+ synchronized (this) {
+ serverResourceHolder.updateTotalResource(ResourceHolder.CPU, buildSetting.getCpu());
+ serverResourceHolder.updateTotalResource(ResourceHolder.MEMORY, buildSetting.getMemory());
+ notifyAll();
+ }
+ }
+ } else if (event.getEntity() instanceof Agent) {
+ synchronized (this) {
+ Agent agent = (Agent) event.getEntity();
+ agentPaused.put(agent.getId(), agent.isPaused());
+ notifyAll();
+ }
+ }
+ }
+
+ @Transactional
+ @Listen
+ public void on(EntityRemoved event) {
+ if (event.getEntity() instanceof Agent) {
+ synchronized (this) {
+ agentPaused.remove(((Agent) event.getEntity()).getId());
+ }
+ }
+ }
+
+ @Override
+ public void run(Runnable runnable, Map<String, Integer> serverResourceRequirements, TaskLogger logger) {
+ logger.log("Waiting for resources...");
+ synchronized(this) {
+ while (serverResourceHolder.getSpareResources(serverResourceRequirements) == 0) {
+ try {
+ wait();
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ serverResourceHolder.acquireResources(serverResourceRequirements);
+ }
+
+ try {
+ runnable.run();
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ synchronized (this) {
+ serverResourceHolder.releaseResources(serverResourceRequirements);
+ notifyAll();
+ }
+ }
+ }
+
+ @Sessional
+ protected AgentData getAgentData(Long agentId) {
+ return agentManager.load(agentId).getAgentData();
+ }
+
+ @Override
+ public void run(AgentAwareRunnable runnable, Map<String, Integer> serverResourceRequirements,
+ AgentQuery agentQuery, Map<String, Integer> agentResourceRequirements, TaskLogger logger) {
+ Set<Long> agentIds = agentManager.query(agentQuery, 0, Integer.MAX_VALUE)
+ .stream().map(it->it.getId()).collect(Collectors.toSet());
+ Long agentId = 0L;
+ synchronized(this) {
+ logger.log("Waiting for resources...");
+ String uuid = UUID.randomUUID().toString();
+ queryCaches.put(uuid, new QueryCache(agentQuery, agentIds));
+ try {
+ while (true) {
+ if (serverResourceHolder.getSpareResources(serverResourceRequirements) != 0) {
+ int maxSpareResources = 0;
+ for (Long each: agentIds) {
+ ResourceHolder agentResourceHolder = agentResourceHolders.get(each);
+ Boolean paused = agentPaused.get(each);
+ if (agentResourceHolder != null && paused != null && !paused) {
+ int spareResources = agentResourceHolder.getSpareResources(agentResourceRequirements);
+ if (spareResources > maxSpareResources) {
+ agentId = each;
+ maxSpareResources = spareResources;
+ }
+ }
+ }
+ if (agentId != 0)
+ break;
+ }
+ try {
+ wait();
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ agentResourceHolders.get(agentId).acquireResources(agentResourceRequirements);
+ serverResourceHolder.acquireResources(serverResourceRequirements);
+ } finally {
+ queryCaches.remove(uuid);
+ }
+ }
+
+ try {
+ Session agentSession = agentManager.getAgentSession(agentId);
+ if (agentSession == null)
+ throw new ExplicitException("Agent goes offline");
+ runnable.runOn(agentId, agentSession, getAgentData(agentId));
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ } finally {
+ synchronized (this) {
+ serverResourceHolder.releaseResources(serverResourceRequirements);
+ ResourceHolder agentResourceHolder = agentResourceHolders.get(agentId);
+ if(agentResourceHolder != null)
+ agentResourceHolder.releaseResources(agentResourceRequirements);
+ notifyAll();
+ }
+ }
+ }
+
+ private static class QueryCache {
+
+ AgentQuery query;
+
+ Collection<Long> result;
+
+ QueryCache(AgentQuery query, Collection<Long> result) {
+ this.query = query;
+ this.result = result;
+ }
+
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/resource/ResourceHolder.java b/server-core/src/main/java/io/onedev/server/job/resource/ResourceHolder.java
new file mode 100644
index 0000000000..e8c2a19fde
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/resource/ResourceHolder.java
@@ -0,0 +1,87 @@
+package io.onedev.server.job.resource;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ResourceHolder {
+
+ public static final String CPU = "cpu";
+
+ public static final String MEMORY = "memory";
+
+ private final Map<String, Integer> totalResources;
+
+ private final Map<String, Integer> usedResources = new HashMap<>();
+
+ public ResourceHolder(Map<String, Integer> totalResources) {
+ this.totalResources = totalResources;
+ }
+
+ public int getSpareResources(Map<String, Integer> resourceRequirements) {
+ for (Map.Entry<String, Integer> entry: resourceRequirements.entrySet()) {
+ Integer totalCount = totalResources.get(entry.getKey());
+ if (totalCount == null)
+ totalCount = 0;
+ Integer usedCount = usedResources.get(entry.getKey());
+ if (usedCount == null)
+ usedCount = 0;
+ if (usedCount + entry.getValue() > totalCount)
+ return 0;
+ }
+
+ Integer cpuTotal = totalResources.get(CPU);
+ if (cpuTotal == null)
+ cpuTotal = 0;
+ Integer memoryTotal = totalResources.get(MEMORY);
+ if (memoryTotal == null)
+ memoryTotal = 0;
+
+ Integer cpuUsed = usedResources.get(CPU);
+ if (cpuUsed == null)
+ cpuUsed = 0;
+ Integer cpuRequired = resourceRequirements.get(CPU);
+ if (cpuRequired == null)
+ cpuRequired = 0;
+ cpuUsed += cpuRequired;
+ if (cpuUsed == 0)
+ cpuUsed = 1;
+
+ Integer memoryUsed = usedResources.get(CPU);
+ if (memoryUsed == null)
+ memoryUsed = 0;
+ Integer memoryRequired = resourceRequirements.get(CPU);
+ if (memoryRequired == null)
+ memoryRequired = 0;
+ memoryUsed += memoryRequired;
+ if (memoryUsed == 0)
+ memoryUsed = 1;
+
+ int spare = cpuTotal*400/cpuUsed + memoryTotal*100/memoryUsed;
+ if (spare <= 0)
+ spare = 1;
+ return spare;
+ }
+
+ public void acquireResources(Map<String, Integer> resourceRequirements) {
+ for (Map.Entry<String, Integer> entry: resourceRequirements.entrySet()) {
+ Integer usedCount = usedResources.get(entry.getKey());
+ if (usedCount == null)
+ usedCount = 0;
+ usedResources.put(entry.getKey(), usedCount + entry.getValue());
+ }
+ }
+
+ public void releaseResources(Map<String, Integer> resourceRequirements) {
+ for (Map.Entry<String, Integer> entry: resourceRequirements.entrySet()) {
+ Integer usedCount = usedResources.get(entry.getKey());
+ if (usedCount == null)
+ usedCount = 0;
+ usedResources.put(entry.getKey(), usedCount - entry.getValue());
+ }
+ }
+
+ public void updateTotalResource(String name, int count) {
+ totalResources.put(name, count);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/job/resource/ResourceManager.java b/server-core/src/main/java/io/onedev/server/job/resource/ResourceManager.java
new file mode 100644
index 0000000000..e6af6510d2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/job/resource/ResourceManager.java
@@ -0,0 +1,15 @@
+package io.onedev.server.job.resource;
+
+import java.util.Map;
+
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.search.entity.agent.AgentQuery;
+
+public interface ResourceManager {
+
+ void run(Runnable runnable, Map<String, Integer> serverResourceRequirements, TaskLogger logger);
+
+ void run(AgentAwareRunnable runnable, Map<String, Integer> serverResourceRequirements,
+ AgentQuery agentQuery, Map<String, Integer> agentResourceRequirements, TaskLogger logger);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
index d5d892b6dd..1fe28cd349 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/BackupDatabase.java
@@ -12,9 +12,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.BootstrapUtils;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
@@ -67,7 +67,7 @@ public class BackupDatabase extends DefaultPersistManager {
File tempDir = FileUtils.createTempDir("backup");
try {
exportData(tempDir);
- ZipUtils.zip(tempDir, backupFile);
+ BootstrapUtils.zip(tempDir, backupFile);
} catch (Exception e) {
throw ExceptionUtils.unchecked(e);
} finally {
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 0f63302898..6d42bd6814 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
@@ -27,12 +27,12 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.BootstrapUtils;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.launcher.loader.ManagedSerializedForm;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.RoleManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -42,6 +42,7 @@ import io.onedev.server.model.Role;
import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.administration.AgentSetting;
import io.onedev.server.model.support.administration.BackupSetting;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
@@ -225,6 +226,10 @@ public class DefaultDataManager implements DataManager, Serializable {
if (setting == null) {
settingManager.saveProjectSetting(new GlobalProjectSetting());
}
+ setting = settingManager.getSetting(Key.AGENT);
+ if (setting == null) {
+ settingManager.saveAgentSetting(new AgentSetting());
+ }
setting = settingManager.getSetting(Key.SERVICE_DESK_SETTING);
if (setting == null) {
settingManager.saveServiceDeskSetting(null);
@@ -320,7 +325,7 @@ public class DefaultDataManager implements DataManager, Serializable {
persistManager.exportData(tempDir);
File backupFile = new File(backupDir,
DateTimeFormat.forPattern(Upgrade.BACKUP_DATETIME_FORMAT).print(new DateTime()) + ".zip");
- ZipUtils.zip(tempDir, backupFile);
+ BootstrapUtils.zip(tempDir, backupFile);
} catch (Exception e) {
notifyBackupError(e);
throw ExceptionUtils.unchecked(e);
diff --git a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
index 22aaf83fd8..2e5f38bc27 100644
--- a/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
+++ b/server-core/src/main/java/io/onedev/server/maintenance/RestoreDatabase.java
@@ -12,9 +12,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.BootstrapUtils;
import io.onedev.commons.launcher.bootstrap.Command;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.persistence.DefaultPersistManager;
import io.onedev.server.persistence.HibernateProperties;
import io.onedev.server.persistence.IdManager;
@@ -65,7 +65,7 @@ public class RestoreDatabase extends DefaultPersistManager {
if (backupFile.isFile()) {
File dataDir = FileUtils.createTempDir("restore");
try {
- ZipUtils.unzip(backupFile, dataDir);
+ BootstrapUtils.unzip(backupFile, dataDir);
doRestore(metadata, dataDir);
} finally {
FileUtils.deleteDir(dataDir);
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
index 0544b3054e..316e1a3202 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CodeProcessor.java
@@ -26,7 +26,7 @@ public class CodeProcessor implements MarkdownProcessor {
@Override
public void process(Document rendered, @Nullable Project project, Object context) {
Collection<Element> codeElements = new ArrayList<>();
- new NodeTraversor(new NodeVisitor() {
+ NodeTraversor.traverse(new NodeVisitor() {
@Override
public void head(Node node, int depth) {
@@ -44,7 +44,7 @@ public class CodeProcessor implements MarkdownProcessor {
}
}
- }).traverse(rendered);
+ }, rendered);
for (Element codeElement: codeElements) {
String code = HtmlEscape.unescapeHtml(codeElement.html());
diff --git a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
index 5b59f5a9e1..f585235a42 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/CommitProcessor.java
@@ -37,8 +37,7 @@ public class CommitProcessor implements MarkdownProcessor {
}
};
- NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(rendered);
+ NodeTraversor.traverse(visitor, rendered);
for (TextNode node : visitor.getMatchedNodes()) {
Matcher matcher = PATTERN_COMMIT.matcher(node.getWholeText());
diff --git a/server-core/src/main/java/io/onedev/server/markdown/MentionParser.java b/server-core/src/main/java/io/onedev/server/markdown/MentionParser.java
index 374541f28b..135d9f9dc5 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/MentionParser.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/MentionParser.java
@@ -39,8 +39,7 @@ public class MentionParser {
}
};
- NodeTraversor tranversor = new NodeTraversor(visitor);
- tranversor.traverse(document);
+ NodeTraversor.traverse(visitor, document);
for (TextNode node : visitor.getMatchedNodes()) {
Matcher matcher = PATTERN.matcher(node.getWholeText());
diff --git a/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
index 35ea2e0175..7489794f50 100644
--- a/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
+++ b/server-core/src/main/java/io/onedev/server/markdown/UrlProcessor.java
@@ -44,7 +44,7 @@ public class UrlProcessor implements MarkdownProcessor {
commit = null;
}
- new NodeTraversor(new NodeVisitor() {
+ NodeTraversor.traverse(new NodeVisitor() {
@Override
public void head(Node node, int depth) {
@@ -109,7 +109,7 @@ public class UrlProcessor implements MarkdownProcessor {
}
}
}
- }).traverse(rendered);
+ }, rendered);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/Agent.java b/server-core/src/main/java/io/onedev/server/model/Agent.java
new file mode 100644
index 0000000000..a4f7bc3bca
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/Agent.java
@@ -0,0 +1,254 @@
+package io.onedev.server.model;
+
+import static io.onedev.server.model.Agent.PROP_IP_ADDRESS;
+import static io.onedev.server.model.Agent.PROP_LAST_USED_DATE;
+import static io.onedev.server.model.Agent.PROP_NAME;
+import static io.onedev.server.model.Agent.PROP_OS;
+import static io.onedev.server.model.Agent.PROP_OS_ARCH;
+import static io.onedev.server.model.Agent.PROP_OS_VERSION;
+import static io.onedev.server.model.Agent.PROP_CPU;
+import static io.onedev.server.model.Agent.PROP_MEMORY;
+import static io.onedev.server.model.Agent.PROP_PAUSED;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.JoinColumn;
+import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+
+import io.onedev.agent.AgentData;
+import io.onedev.agent.AgentOs;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.job.resource.ResourceHolder;
+import io.onedev.server.util.CollectionUtils;
+
+@Entity
+@Table(indexes={
+ @Index(columnList="o_token_id"), @Index(columnList=PROP_IP_ADDRESS),
+ @Index(columnList=PROP_PAUSED), @Index(columnList=PROP_NAME),
+ @Index(columnList=PROP_OS), @Index(columnList=PROP_OS_VERSION),
+ @Index(columnList=PROP_CPU), @Index(columnList=PROP_MEMORY),
+ @Index(columnList=PROP_OS_ARCH), @Index(columnList=PROP_LAST_USED_DATE)})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
+public class Agent extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String NAME_NAME = "Name";
+
+ public static final String PROP_NAME = "name";
+
+ public static final String PROP_PAUSED = "paused";
+
+ public static final String PROP_BUILDS = "builds";
+
+ public static final String PROP_ATTRIBUTES = "attributes";
+
+ public static final String NAME_IP_ADDRESS = "Ip Address";
+
+ public static final String PROP_IP_ADDRESS = "ipAddress";
+
+ public static final String NAME_OS = "Os";
+
+ public static final String PROP_OS = "os";
+
+ public static final String NAME_OS_VERSION = "Os Version";
+
+ public static final String PROP_OS_VERSION = "osVersion";
+
+ public static final String NAME_OS_ARCH = "Os Arch";
+
+ public static final String PROP_OS_ARCH = "osArch";
+
+ public static final String NAME_CPU = "CPU";
+
+ public static final String PROP_CPU = "cpu";
+
+ public static final String NAME_MEMORY = "Memory";
+
+ public static final String PROP_MEMORY = "memory";
+
+ public static final String PROP_LAST_USED_DATE = "lastUsedDate";
+
+ public static final Set<String> ALL_FIELDS = Sets.newHashSet(
+ NAME_NAME, NAME_IP_ADDRESS, NAME_OS, NAME_OS_VERSION, NAME_OS_ARCH, NAME_CPU, NAME_MEMORY);
+
+ public static final List<String> QUERY_FIELDS = Lists.newArrayList(
+ NAME_NAME, NAME_IP_ADDRESS, NAME_OS, NAME_OS_VERSION, NAME_OS_ARCH, NAME_CPU, NAME_MEMORY);
+
+ public static final Map<String, String> ORDER_FIELDS = CollectionUtils.newLinkedHashMap(
+ NAME_NAME, PROP_NAME,
+ NAME_IP_ADDRESS, PROP_IP_ADDRESS,
+ NAME_OS, PROP_OS,
+ NAME_OS_VERSION, PROP_OS_VERSION,
+ NAME_OS_ARCH, PROP_OS_ARCH,
+ NAME_CPU, PROP_CPU,
+ NAME_MEMORY, PROP_MEMORY);
+
+ @OneToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false, unique=true)
+ private AgentToken token;
+
+ @OneToMany(mappedBy="agent", cascade=CascadeType.REMOVE)
+ private Collection<AgentAttribute> attributes = new ArrayList<>();
+
+ @OneToMany(mappedBy="agent")
+ private Collection<Build> builds = new ArrayList<>();
+
+ @Column(nullable=false, unique=true)
+ private String name;
+
+ @Column(nullable=false)
+ private String ipAddress;
+
+ @Column(nullable=false)
+ private AgentOs os;
+
+ @Column(nullable=false)
+ private String osVersion;
+
+ @Column(nullable=false)
+ private String osArch;
+
+ private int cpu;
+
+ private int memory;
+
+ private boolean paused;
+
+ private Date lastUsedDate;
+
+ private transient Boolean online;
+
+ public AgentToken getToken() {
+ return token;
+ }
+
+ public void setToken(AgentToken token) {
+ this.token = token;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public AgentOs getOs() {
+ return os;
+ }
+
+ public void setOs(AgentOs os) {
+ this.os = os;
+ }
+
+ public String getOsVersion() {
+ return osVersion;
+ }
+
+ public void setOsVersion(String osVersion) {
+ this.osVersion = osVersion;
+ }
+
+ public String getOsArch() {
+ return osArch;
+ }
+
+ public void setOsArch(String osArch) {
+ this.osArch = osArch;
+ }
+
+ public String getIpAddress() {
+ return ipAddress;
+ }
+
+ public void setIpAddress(String ipAddress) {
+ this.ipAddress = ipAddress;
+ }
+
+ public boolean isPaused() {
+ return paused;
+ }
+
+ public void setPaused(boolean paused) {
+ this.paused = paused;
+ }
+
+ public int getCpu() {
+ return cpu;
+ }
+
+ public void setCpu(int cpu) {
+ this.cpu = cpu;
+ }
+
+ public int getMemory() {
+ return memory;
+ }
+
+ public void setMemory(int memory) {
+ this.memory = memory;
+ }
+
+ public Collection<AgentAttribute> getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(Collection<AgentAttribute> attributes) {
+ this.attributes = attributes;
+ }
+
+ public Date getLastUsedDate() {
+ return lastUsedDate;
+ }
+
+ public void setLastUsedDate(Date lastUsedDate) {
+ this.lastUsedDate = lastUsedDate;
+ }
+
+ public Map<String, String> getAttributeMap() {
+ Map<String, String> attributeMap = new HashMap<>();
+ for (AgentAttribute attribute: getAttributes())
+ attributeMap.put(attribute.getName(), attribute.getValue());
+ return attributeMap;
+ }
+
+ public boolean isOnline() {
+ if (online == null)
+ online = OneDev.getInstance(AgentManager.class).getOnlineAgentIds().contains(getId());
+ return online;
+ }
+
+ public Map<String, Integer> getResources() {
+ Map<String, Integer> resources = new HashMap<>();
+ resources.put(ResourceHolder.CPU, cpu);
+ resources.put(ResourceHolder.MEMORY, memory);
+ return resources;
+ }
+
+ public AgentData getAgentData() {
+ return new AgentData(getToken().getValue(), os, osVersion, osArch, name, cpu, memory, getAttributeMap());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java b/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java
new file mode 100644
index 0000000000..f2b40e2b9d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/AgentAttribute.java
@@ -0,0 +1,79 @@
+package io.onedev.server.model;
+
+import static io.onedev.server.model.AgentAttribute.PROP_NAME;
+import static io.onedev.server.model.AgentAttribute.PROP_VALUE;
+
+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 javax.persistence.UniqueConstraint;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.util.validation.annotation.AttributeName;
+import io.onedev.server.web.editable.annotation.Editable;
+
+/**
+ * @author robin
+ *
+ */
+@Entity
+@Table(
+ indexes={@Index(columnList="o_agent_id"), @Index(columnList=PROP_NAME), @Index(columnList=PROP_VALUE)},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_agent_id", PROP_NAME})})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
+@Editable
+public class AgentAttribute extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_NAME = "name";
+
+ public static final String PROP_VALUE = "value";
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Agent agent;
+
+ @Column(nullable=false)
+ private String name;
+
+ @Column(nullable=false)
+ private String value;
+
+ public Agent getAgent() {
+ return agent;
+ }
+
+ public void setAgent(Agent agent) {
+ this.agent = agent;
+ }
+
+ @Editable(order=100, name="Name")
+ @AttributeName
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=200, name="Value")
+ @NotEmpty
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/AgentToken.java b/server-core/src/main/java/io/onedev/server/model/AgentToken.java
new file mode 100644
index 0000000000..bf333b9059
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/AgentToken.java
@@ -0,0 +1,55 @@
+package io.onedev.server.model;
+
+import static io.onedev.server.model.AgentToken.PROP_VALUE;
+
+import javax.annotation.Nullable;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.Index;
+import javax.persistence.OneToOne;
+import javax.persistence.Table;
+
+import org.hibernate.annotations.Cache;
+import org.hibernate.annotations.CacheConcurrencyStrategy;
+
+@Entity
+@Table(indexes={@Index(columnList=PROP_VALUE)})
+@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
+public class AgentToken extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String PROP_VALUE = "value";
+
+ @OneToOne(mappedBy="token", fetch=FetchType.LAZY)
+ private Agent agent;
+
+ @Column(nullable=false, unique=true)
+ private String value;
+
+ private String note;
+
+ @Nullable
+ public Agent getAgent() {
+ return agent;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Nullable
+ public String getNote() {
+ return note;
+ }
+
+ public void setNote(String note) {
+ this.note = note;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 3cd180b5ad..89ba42e18b 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -124,6 +124,8 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String PROP_VERSION = "version";
+ public static final String PROP_AGENT = "agent";
+
public static final String NAME_PROJECT = "Project";
public static final String PROP_PROJECT = "project";
@@ -178,12 +180,8 @@ public class Build extends AbstractEntity implements Referenceable {
public static final String PROP_PARAMS = "params";
- public static final String NAME_DEPENDENCIES = "Dependencies";
-
public static final String PROP_DEPENDENCIES = "dependencies";
- public static final String NAME_DEPENDENTS = "Dependents";
-
public static final String PROP_DEPENDENTS = "dependents";
public static final String NAME_PULL_REQUEST = "Pull Request";
@@ -199,8 +197,8 @@ public class Build extends AbstractEntity implements Referenceable {
public static final Set<String> ALL_FIELDS = Sets.newHashSet(
NAME_PROJECT, NAME_NUMBER, NAME_JOB, NAME_STATUS, NAME_SUBMITTER, NAME_CANCELLER,
NAME_SUBMIT_DATE, NAME_PENDING_DATE, NAME_RUNNING_DATE, NAME_FINISH_DATE,
- NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION, NAME_DEPENDENCIES,
- NAME_DEPENDENTS, NAME_ERROR_MESSAGE, NAME_LOG, BuildMetric.NAME_REPORT);
+ NAME_PULL_REQUEST, NAME_BRANCH, NAME_TAG, NAME_COMMIT, NAME_VERSION,
+ NAME_ERROR_MESSAGE, NAME_LOG, BuildMetric.NAME_REPORT);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION, NAME_PULL_REQUEST,
@@ -268,6 +266,9 @@ public class Build extends AbstractEntity implements Referenceable {
@JoinColumn(nullable=false)
private Project project;
+ @ManyToOne(fetch=FetchType.LAZY)
+ private Agent agent;
+
@ManyToOne(fetch=FetchType.LAZY)
@JoinColumn(nullable=false)
private User submitter;
@@ -363,13 +364,22 @@ public class Build extends AbstractEntity implements Referenceable {
return project;
}
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
@Override
public String getType() {
return "build";
}
-
- public void setProject(Project project) {
- this.project = project;
+
+ @Nullable
+ public Agent getAgent() {
+ return agent;
+ }
+
+ public void setAgent(Agent agent) {
+ this.agent = agent;
}
public User getSubmitter() {
diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
similarity index 73%
rename from server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
rename to server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
index 7d78ee2612..f43fbb33f5 100644
--- a/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java
@@ -13,7 +13,9 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@@ -23,7 +25,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
-public class BuildQuerySetting extends AbstractEntity implements QuerySetting<NamedBuildQuery> {
+public class BuildQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedBuildQuery> {
private static final long serialVersionUID = 1L;
@@ -37,12 +39,8 @@ public class BuildQuerySetting extends AbstractEntity implements QuerySetting<Na
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedBuildQuery> userQueries = new ArrayList<>();
+ private ArrayList<NamedBuildQuery> queries = new ArrayList<>();
- @Lob
- @Column(nullable=false, length=65535)
- private LinkedHashSet<String> userQuerySubscriptions = new LinkedHashSet<>();
-
@Lob
@Column(nullable=false, length=65535)
private LinkedHashSet<String> querySubscriptions = new LinkedHashSet<>();
@@ -66,13 +64,13 @@ public class BuildQuerySetting extends AbstractEntity implements QuerySetting<Na
}
@Override
- public ArrayList<NamedBuildQuery> getUserQueries() {
- return userQueries;
+ public ArrayList<NamedBuildQuery> getQueries() {
+ return queries;
}
@Override
- public void setUserQueries(ArrayList<NamedBuildQuery> userQueries) {
- this.userQueries = userQueries;
+ public void setQueries(ArrayList<NamedBuildQuery> queries) {
+ this.queries = queries;
}
@Override
@@ -84,11 +82,6 @@ public class BuildQuerySetting extends AbstractEntity implements QuerySetting<Na
public QuerySubscriptionSupport<NamedBuildQuery> getQuerySubscriptionSupport() {
return new QuerySubscriptionSupport<NamedBuildQuery>() {
- @Override
- public LinkedHashSet<String> getUserQuerySubscriptions() {
- return userQuerySubscriptions;
- }
-
@Override
public LinkedHashSet<String> getQuerySubscriptions() {
return querySubscriptions;
@@ -97,4 +90,9 @@ public class BuildQuerySetting extends AbstractEntity implements QuerySetting<Na
};
}
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(BuildQueryPersonalizationManager.class).save(this);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java
similarity index 69%
rename from server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
rename to server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java
index be9e6f994d..7755b9ab40 100644
--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentQueryPersonalization.java
@@ -12,8 +12,10 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
import io.onedev.server.model.support.NamedCodeCommentQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@@ -22,7 +24,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
-public class CodeCommentQuerySetting extends AbstractEntity implements QuerySetting<NamedCodeCommentQuery> {
+public class CodeCommentQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedCodeCommentQuery> {
private static final long serialVersionUID = 1L;
@@ -36,7 +38,7 @@ public class CodeCommentQuerySetting extends AbstractEntity implements QuerySett
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedCodeCommentQuery> userQueries = new ArrayList<>();
+ private ArrayList<NamedCodeCommentQuery> queries = new ArrayList<>();
@Override
public Project getProject() {
@@ -57,13 +59,13 @@ public class CodeCommentQuerySetting extends AbstractEntity implements QuerySett
}
@Override
- public ArrayList<NamedCodeCommentQuery> getUserQueries() {
- return userQueries;
+ public ArrayList<NamedCodeCommentQuery> getQueries() {
+ return queries;
}
@Override
- public void setUserQueries(ArrayList<NamedCodeCommentQuery> userQueries) {
- this.userQueries = userQueries;
+ public void setQueries(ArrayList<NamedCodeCommentQuery> queries) {
+ this.queries = queries;
}
@Override
@@ -75,5 +77,10 @@ public class CodeCommentQuerySetting extends AbstractEntity implements QuerySett
public QuerySubscriptionSupport<NamedCodeCommentQuery> getQuerySubscriptionSupport() {
return null;
}
+
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).save(this);
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
similarity index 61%
rename from server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
rename to server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
index 33c97bfe49..c954ce14d0 100644
--- a/server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java
@@ -13,8 +13,10 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.model.support.NamedCommitQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@@ -23,7 +25,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
-public class CommitQuerySetting extends AbstractEntity implements QuerySetting<NamedCommitQuery> {
+public class CommitQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedCommitQuery> {
private static final long serialVersionUID = 1L;
@@ -37,15 +39,11 @@ public class CommitQuerySetting extends AbstractEntity implements QuerySetting<N
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedCommitQuery> userQueries = new ArrayList<>();
+ private ArrayList<NamedCommitQuery> queries = new ArrayList<>();
@Lob
@Column(nullable=false, length=65535)
- private LinkedHashSet<String> userQuerySubscriptions = new LinkedHashSet<>();
-
- @Lob
- @Column(nullable=false, length=65535)
- private LinkedHashSet<String> projectQuerySubscriptions = new LinkedHashSet<>();
+ private LinkedHashSet<String> querySubscriptions = new LinkedHashSet<>();
@Override
public Project getProject() {
@@ -66,35 +64,26 @@ public class CommitQuerySetting extends AbstractEntity implements QuerySetting<N
}
@Override
- public ArrayList<NamedCommitQuery> getUserQueries() {
- return userQueries;
+ public ArrayList<NamedCommitQuery> getQueries() {
+ return queries;
}
@Override
- public void setUserQueries(ArrayList<NamedCommitQuery> userQueries) {
- this.userQueries = userQueries;
+ public void setQueries(ArrayList<NamedCommitQuery> queries) {
+ this.queries = queries;
}
- public void setUserQuerySubscriptions(LinkedHashSet<String> userQuerySubscriptions) {
- this.userQuerySubscriptions = userQuerySubscriptions;
- }
-
- public void setProjectQuerySubscriptions(LinkedHashSet<String> projectQuerySubscriptions) {
- this.projectQuerySubscriptions = projectQuerySubscriptions;
+ public void setQuerySubscriptions(LinkedHashSet<String> querySubscriptions) {
+ this.querySubscriptions = querySubscriptions;
}
@Override
public QuerySubscriptionSupport<NamedCommitQuery> getQuerySubscriptionSupport() {
return new QuerySubscriptionSupport<NamedCommitQuery>() {
- @Override
- public LinkedHashSet<String> getUserQuerySubscriptions() {
- return userQuerySubscriptions;
- }
-
@Override
public LinkedHashSet<String> getQuerySubscriptions() {
- return projectQuerySubscriptions;
+ return querySubscriptions;
}
};
@@ -105,4 +94,9 @@ public class CommitQuerySetting extends AbstractEntity implements QuerySetting<N
return null;
}
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(CommitQueryPersonalizationManager.class).save(this);
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
similarity index 67%
rename from server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
rename to server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
index 6b671fd463..9d1bf796ba 100644
--- a/server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java
@@ -13,7 +13,9 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@@ -23,7 +25,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
-public class IssueQuerySetting extends AbstractEntity implements QuerySetting<NamedIssueQuery> {
+public class IssueQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedIssueQuery> {
private static final long serialVersionUID = 1L;
@@ -37,12 +39,8 @@ public class IssueQuerySetting extends AbstractEntity implements QuerySetting<Na
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedIssueQuery> userQueries = new ArrayList<>();
+ private ArrayList<NamedIssueQuery> queries = new ArrayList<>();
- @Lob
- @Column(nullable=false, length=65535)
- private LinkedHashMap<String, Boolean> userQueryWatches = new LinkedHashMap<>();
-
@Lob
@Column(nullable=false, length=65535)
private LinkedHashMap<String, Boolean> queryWatches = new LinkedHashMap<>();
@@ -66,32 +64,24 @@ public class IssueQuerySetting extends AbstractEntity implements QuerySetting<Na
}
@Override
- public ArrayList<NamedIssueQuery> getUserQueries() {
- return userQueries;
+ public ArrayList<NamedIssueQuery> getQueries() {
+ return queries;
}
@Override
- public void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {
- this.userQueries = userQueries;
+ public void setQueries(ArrayList<NamedIssueQuery> queries) {
+ this.queries = queries;
}
- public void setUserQueryWatches(LinkedHashMap<String, Boolean> userQueryWatches) {
- this.userQueryWatches = userQueryWatches;
- }
- public void setQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {
- this.queryWatches = projectQueryWatches;
+ public void setQueryWatches(LinkedHashMap<String, Boolean> queryWatches) {
+ this.queryWatches = queryWatches;
}
@Override
public QueryWatchSupport<NamedIssueQuery> getQueryWatchSupport() {
return new QueryWatchSupport<NamedIssueQuery>() {
- @Override
- public LinkedHashMap<String, Boolean> getUserQueryWatches() {
- return userQueryWatches;
- }
-
@Override
public LinkedHashMap<String, Boolean> getQueryWatches() {
return queryWatches;
@@ -105,4 +95,9 @@ public class IssueQuerySetting extends AbstractEntity implements QuerySetting<Na
return null;
}
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(IssueQueryPersonalizationManager.class).save(this);
+ }
+
}
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 e77507a65d..6b52894d0a 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
@@ -80,12 +80,12 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobManager;
import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.BuildQuerySettingManager;
-import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;
-import io.onedev.server.entitymanager.CommitQuerySettingManager;
-import io.onedev.server.entitymanager.IssueQuerySettingManager;
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestQuerySettingManager;
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.event.RefUpdated;
@@ -262,19 +262,19 @@ public class Project extends AbstractEntity implements NameAware {
private Collection<CodeComment> codeComments = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
- private Collection<IssueQuerySetting> userIssueQuerySettings = new ArrayList<>();
+ private Collection<IssueQueryPersonalization> issueQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
- private Collection<CommitQuerySetting> userCommitQuerySettings = new ArrayList<>();
+ private Collection<CommitQueryPersonalization> commitQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
- private Collection<PullRequestQuerySetting> userPullRequestQuerySettings = new ArrayList<>();
+ private Collection<PullRequestQueryPersonalization> pullRequestQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
- private Collection<CodeCommentQuerySetting> userCodeCommentQuerySettings = new ArrayList<>();
+ private Collection<CodeCommentQueryPersonalization> codeCommentQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
- private Collection<BuildQuerySetting> userBuildQuerySettings = new ArrayList<>();
+ private Collection<BuildQueryPersonalization> buildQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
private Collection<Milestone> milestones = new ArrayList<>();
@@ -327,15 +327,15 @@ public class Project extends AbstractEntity implements NameAware {
private transient Optional<String> defaultBranchOptional;
- private transient Optional<IssueQuerySetting> issueQuerySettingOfCurrentUserHolder;
+ private transient Optional<IssueQueryPersonalization> issueQueryPersonalizationOfCurrentUserHolder;
- private transient Optional<PullRequestQuerySetting> pullRequestQuerySettingOfCurrentUserHolder;
+ private transient Optional<PullRequestQueryPersonalization> pullRequestQueryPersonalizationOfCurrentUserHolder;
- private transient Optional<CodeCommentQuerySetting> codeCommentQuerySettingOfCurrentUserHolder;
+ private transient Optional<CodeCommentQueryPersonalization> codeCommentQueryPersonalizationOfCurrentUserHolder;
- private transient Optional<BuildQuerySetting> buildQuerySettingOfCurrentUserHolder;
+ private transient Optional<BuildQueryPersonalization> buildQueryPersonalizationOfCurrentUserHolder;
- private transient Optional<CommitQuerySetting> commitQuerySettingOfCurrentUserHolder;
+ private transient Optional<CommitQueryPersonalization> commitQueryPersonalizationOfCurrentUserHolder;
private transient Optional<RevCommit> lastCommitHolder;
@@ -1113,44 +1113,44 @@ public class Project extends AbstractEntity implements NameAware {
this.namedCodeCommentQueries = namedCodeCommentQueries;
}
- public Collection<IssueQuerySetting> getUserIssueQuerySettings() {
- return userIssueQuerySettings;
+ public Collection<IssueQueryPersonalization> getIssueQueryPersonalizations() {
+ return issueQueryPersonalizations;
}
- public void setUserIssueQuerySettings(Collection<IssueQuerySetting> userIssueQuerySettings) {
- this.userIssueQuerySettings = userIssueQuerySettings;
+ public void setIssueQueryPersonalizations(Collection<IssueQueryPersonalization> issueQueryPersonalizations) {
+ this.issueQueryPersonalizations = issueQueryPersonalizations;
}
- public Collection<CommitQuerySetting> getUserCommitQuerySettings() {
- return userCommitQuerySettings;
+ public Collection<CommitQueryPersonalization> getCommitQueryPersonalizations() {
+ return commitQueryPersonalizations;
}
- public void setUserCommitQuerySettings(Collection<CommitQuerySetting> userCommitQuerySettings) {
- this.userCommitQuerySettings = userCommitQuerySettings;
+ public void setCommitQueryPersonalizations(Collection<CommitQueryPersonalization> commitQueryPersonalizations) {
+ this.commitQueryPersonalizations = commitQueryPersonalizations;
}
- public Collection<PullRequestQuerySetting> getUserPullRequestQuerySettings() {
- return userPullRequestQuerySettings;
+ public Collection<PullRequestQueryPersonalization> getPullRequestQueryPersonalizations() {
+ return pullRequestQueryPersonalizations;
}
- public void setUserPullRequestQuerySettings(Collection<PullRequestQuerySetting> userPullRequestQuerySettings) {
- this.userPullRequestQuerySettings = userPullRequestQuerySettings;
+ public void setPullRequestQueryPersonalizations(Collection<PullRequestQueryPersonalization> pullRequestQueryPersonalizations) {
+ this.pullRequestQueryPersonalizations = pullRequestQueryPersonalizations;
}
- public Collection<CodeCommentQuerySetting> getUserCodeCommentQuerySettings() {
- return userCodeCommentQuerySettings;
+ public Collection<CodeCommentQueryPersonalization> getCodeCommentQueryPersonalizations() {
+ return codeCommentQueryPersonalizations;
}
- public void setUserCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> userCodeCommentQuerySettings) {
- this.userCodeCommentQuerySettings = userCodeCommentQuerySettings;
+ public void setCodeCommentQueryPersonalizations(Collection<CodeCommentQueryPersonalization> codeCommentQueryPersonalizations) {
+ this.codeCommentQueryPersonalizations = codeCommentQueryPersonalizations;
}
- public Collection<BuildQuerySetting> getUserBuildQuerySettings() {
- return userBuildQuerySettings;
+ public Collection<BuildQueryPersonalization> getBuildQueryPersonalizations() {
+ return buildQueryPersonalizations;
}
- public void setUserBuildQuerySettings(Collection<BuildQuerySetting> userBuildQuerySettings) {
- this.userBuildQuerySettings = userBuildQuerySettings;
+ public void setBuildQueryPersonalizations(Collection<BuildQueryPersonalization> buildQueryPersonalizations) {
+ this.buildQueryPersonalizations = buildQueryPersonalizations;
}
public Collection<Build> getBuilds() {
@@ -1321,97 +1321,102 @@ public class Project extends AbstractEntity implements NameAware {
return authors;
}
- public IssueQuerySetting getIssueQuerySettingOfCurrentUser() {
- if (issueQuerySettingOfCurrentUserHolder == null) {
+ public IssueQueryPersonalization getIssueQueryPersonalizationOfCurrentUser() {
+ if (issueQueryPersonalizationOfCurrentUserHolder == null) {
User user = SecurityUtils.getUser();
if (user != null) {
- IssueQuerySetting setting = OneDev.getInstance(IssueQuerySettingManager.class).find(this, user);
- if (setting == null) {
- setting = new IssueQuerySetting();
- setting.setProject(this);
- setting.setUser(user);
+ IssueQueryPersonalization personalization =
+ OneDev.getInstance(IssueQueryPersonalizationManager.class).find(this, user);
+ if (personalization == null) {
+ personalization = new IssueQueryPersonalization();
+ personalization.setProject(this);
+ personalization.setUser(user);
}
- issueQuerySettingOfCurrentUserHolder = Optional.of(setting);
+ issueQueryPersonalizationOfCurrentUserHolder = Optional.of(personalization);
} else {
- issueQuerySettingOfCurrentUserHolder = Optional.absent();
+ issueQueryPersonalizationOfCurrentUserHolder = Optional.absent();
}
}
- return issueQuerySettingOfCurrentUserHolder.orNull();
+ return issueQueryPersonalizationOfCurrentUserHolder.orNull();
}
- public CommitQuerySetting getCommitQuerySettingOfCurrentUser() {
- if (commitQuerySettingOfCurrentUserHolder == null) {
+ public CommitQueryPersonalization getCommitQueryPersonalizationOfCurrentUser() {
+ if (commitQueryPersonalizationOfCurrentUserHolder == null) {
User user = SecurityUtils.getUser();
if (user != null) {
- CommitQuerySetting setting = OneDev.getInstance(CommitQuerySettingManager.class).find(this, user);
- if (setting == null) {
- setting = new CommitQuerySetting();
- setting.setProject(this);
- setting.setUser(user);
+ CommitQueryPersonalization personalization =
+ OneDev.getInstance(CommitQueryPersonalizationManager.class).find(this, user);
+ if (personalization == null) {
+ personalization = new CommitQueryPersonalization();
+ personalization.setProject(this);
+ personalization.setUser(user);
}
- commitQuerySettingOfCurrentUserHolder = Optional.of(setting);
+ commitQueryPersonalizationOfCurrentUserHolder = Optional.of(personalization);
} else {
- commitQuerySettingOfCurrentUserHolder = Optional.absent();
+ commitQueryPersonalizationOfCurrentUserHolder = Optional.absent();
}
}
- return commitQuerySettingOfCurrentUserHolder.orNull();
+ return commitQueryPersonalizationOfCurrentUserHolder.orNull();
}
@Nullable
- public PullRequestQuerySetting getPullRequestQuerySettingOfCurrentUser() {
- if (pullRequestQuerySettingOfCurrentUserHolder == null) {
+ public PullRequestQueryPersonalization getPullRequestQueryPersonalizationOfCurrentUser() {
+ if (pullRequestQueryPersonalizationOfCurrentUserHolder == null) {
User user = SecurityUtils.getUser();
if (user != null) {
- PullRequestQuerySetting setting = OneDev.getInstance(PullRequestQuerySettingManager.class).find(this, user);
- if (setting == null) {
- setting = new PullRequestQuerySetting();
- setting.setProject(this);
- setting.setUser(user);
+ PullRequestQueryPersonalization personalization =
+ OneDev.getInstance(PullRequestQueryPersonalizationManager.class).find(this, user);
+ if (personalization == null) {
+ personalization = new PullRequestQueryPersonalization();
+ personalization.setProject(this);
+ personalization.setUser(user);
}
- pullRequestQuerySettingOfCurrentUserHolder = Optional.of(setting);
+ pullRequestQueryPersonalizationOfCurrentUserHolder = Optional.of(personalization);
} else {
- pullRequestQuerySettingOfCurrentUserHolder = Optional.absent();
+ pullRequestQueryPersonalizationOfCurrentUserHolder = Optional.absent();
}
}
- return pullRequestQuerySettingOfCurrentUserHolder.orNull();
+ return pullRequestQueryPersonalizationOfCurrentUserHolder.orNull();
}
@Nullable
- public CodeCommentQuerySetting getCodeCommentQuerySettingOfCurrentUser() {
- if (codeCommentQuerySettingOfCurrentUserHolder == null) {
+ public CodeCommentQueryPersonalization getCodeCommentQueryPersonalizationOfCurrentUser() {
+ if (codeCommentQueryPersonalizationOfCurrentUserHolder == null) {
User user = SecurityUtils.getUser();
if (user != null) {
- CodeCommentQuerySetting setting = OneDev.getInstance(CodeCommentQuerySettingManager.class).find(this, user);
- if (setting == null) {
- setting = new CodeCommentQuerySetting();
- setting.setProject(this);
- setting.setUser(user);
+ CodeCommentQueryPersonalization personalization =
+ OneDev.getInstance(CodeCommentQueryPersonalizationManager.class).find(this, user);
+ if (personalization == null) {
+ personalization = new CodeCommentQueryPersonalization();
+ personalization.setProject(this);
+ personalization.setUser(user);
}
- codeCommentQuerySettingOfCurrentUserHolder = Optional.of(setting);
+ codeCommentQueryPersonalizationOfCurrentUserHolder = Optional.of(personalization);
} else {
- codeCommentQuerySettingOfCurrentUserHolder = Optional.absent();
+ codeCommentQueryPersonalizationOfCurrentUserHolder = Optional.absent();
}
}
- return codeCommentQuerySettingOfCurrentUserHolder.orNull();
+ return codeCommentQueryPersonalizationOfCurrentUserHolder.orNull();
}
@Nullable
- public BuildQuerySetting getBuildQuerySettingOfCurrentUser() {
- if (buildQuerySettingOfCurrentUserHolder == null) {
+ public BuildQueryPersonalization getBuildQueryPersonalizationOfCurrentUser() {
+ if (buildQueryPersonalizationOfCurrentUserHolder == null) {
User user = SecurityUtils.getUser();
if (user != null) {
- BuildQuerySetting setting = OneDev.getInstance(BuildQuerySettingManager.class).find(this, user);
- if (setting == null) {
- setting = new BuildQuerySetting();
- setting.setProject(this);
- setting.setUser(user);
+ BuildQueryPersonalization personalization =
+ OneDev.getInstance(BuildQueryPersonalizationManager.class).find(this, user);
+ if (personalization == null) {
+ personalization = new BuildQueryPersonalization();
+ personalization.setProject(this);
+ personalization.setUser(user);
}
- buildQuerySettingOfCurrentUserHolder = Optional.of(setting);
+ buildQueryPersonalizationOfCurrentUserHolder = Optional.of(personalization);
} else {
- buildQuerySettingOfCurrentUserHolder = Optional.absent();
+ buildQueryPersonalizationOfCurrentUserHolder = Optional.absent();
}
}
- return buildQuerySettingOfCurrentUserHolder.orNull();
+ return buildQueryPersonalizationOfCurrentUserHolder.orNull();
}
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
similarity index 71%
rename from server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
rename to server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
index b0186434d4..078885abfa 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java
@@ -13,7 +13,9 @@ import javax.persistence.ManyToOne;
import javax.persistence.Table;
import javax.persistence.UniqueConstraint;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@@ -23,7 +25,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;
indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},
uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})}
)
-public class PullRequestQuerySetting extends AbstractEntity implements QuerySetting<NamedPullRequestQuery> {
+public class PullRequestQueryPersonalization extends AbstractEntity implements QueryPersonalization<NamedPullRequestQuery> {
private static final long serialVersionUID = 1L;
@@ -37,11 +39,7 @@ public class PullRequestQuerySetting extends AbstractEntity implements QuerySett
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedPullRequestQuery> userQueries = new ArrayList<>();
-
- @Lob
- @Column(nullable=false, length=65535)
- private LinkedHashMap<String, Boolean> userQueryWatches = new LinkedHashMap<>();
+ private ArrayList<NamedPullRequestQuery> queries = new ArrayList<>();
@Lob
@Column(nullable=false, length=65535)
@@ -66,17 +64,13 @@ public class PullRequestQuerySetting extends AbstractEntity implements QuerySett
}
@Override
- public ArrayList<NamedPullRequestQuery> getUserQueries() {
- return userQueries;
+ public ArrayList<NamedPullRequestQuery> getQueries() {
+ return queries;
}
@Override
- public void setUserQueries(ArrayList<NamedPullRequestQuery> userQueries) {
- this.userQueries = userQueries;
- }
-
- public void setUserQueryWatches(LinkedHashMap<String, Boolean> userQueryWatches) {
- this.userQueryWatches = userQueryWatches;
+ public void setQueries(ArrayList<NamedPullRequestQuery> queries) {
+ this.queries = queries;
}
public void setQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {
@@ -87,11 +81,6 @@ public class PullRequestQuerySetting extends AbstractEntity implements QuerySett
public QueryWatchSupport<NamedPullRequestQuery> getQueryWatchSupport() {
return new QueryWatchSupport<NamedPullRequestQuery>() {
- @Override
- public LinkedHashMap<String, Boolean> getUserQueryWatches() {
- return userQueryWatches;
- }
-
@Override
public LinkedHashMap<String, Boolean> getQueryWatches() {
return queryWatches;
@@ -105,4 +94,9 @@ public class PullRequestQuerySetting extends AbstractEntity implements QuerySett
return null;
}
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(PullRequestQueryPersonalizationManager.class).save(this);
+ }
+
}
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 53b68a4fa3..c3f2e47063 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
@@ -22,7 +22,8 @@ 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};
+ NOTIFICATION_TEMPLATE_SETTING, CONTRIBUTED_SETTINGS, SERVICE_DESK_SETTING,
+ AGENT};
@Column(nullable=false, unique=true)
private Key key;
diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.java
index 25f97226c7..72b20d74a9 100644
--- a/server-core/src/main/java/io/onedev/server/model/User.java
+++ b/server-core/src/main/java/io/onedev/server/model/User.java
@@ -40,8 +40,9 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.support.NamedProjectQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.SsoInfo;
import io.onedev.server.model.support.administration.authenticator.Authenticator;
import io.onedev.server.model.support.administration.sso.SsoConnector;
@@ -165,19 +166,19 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
private Collection<IssueVote> issueVotes = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<IssueQuerySetting> projectIssueQuerySettings = new ArrayList<>();
+ private Collection<IssueQueryPersonalization> issueQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<BuildQuerySetting> projectBuildQuerySettings = new ArrayList<>();
+ private Collection<BuildQueryPersonalization> buildQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<PullRequestQuerySetting> projectPullRequestQuerySettings = new ArrayList<>();
+ private Collection<PullRequestQueryPersonalization> pullRequestQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<CommitQuerySetting> projectCommitQuerySettings = new ArrayList<>();
+ private Collection<CommitQueryPersonalization> commitQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)
- private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();
+ private Collection<CodeCommentQueryPersonalization> codeCommentQueryPersonalizations = new ArrayList<>();
@OneToMany(mappedBy="owner", cascade=CascadeType.REMOVE)
@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)
@@ -186,48 +187,33 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedProjectQuery> userProjectQueries = new ArrayList<>();
+ private ArrayList<NamedProjectQuery> projectQueries = new ArrayList<>();
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedIssueQuery> userIssueQueries = new ArrayList<>();
+ private ArrayList<NamedIssueQuery> issueQueries = new ArrayList<>();
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- private LinkedHashMap<String, Boolean> userIssueQueryWatches = new LinkedHashMap<>();
-
- @JsonIgnore
- @Lob
- @Column(nullable=false, length=65535)
- private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();
-
- @JsonIgnore
- @Lob
- @Column(nullable=false, length=65535)
- private ArrayList<NamedPullRequestQuery> userPullRequestQueries = new ArrayList<>();
+ private ArrayList<NamedPullRequestQuery> pullRequestQueries = new ArrayList<>();
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- private LinkedHashMap<String, Boolean> userPullRequestQueryWatches = new LinkedHashMap<>();
+ private ArrayList<NamedBuildQuery> buildQueries = new ArrayList<>();
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();
+ private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
- private ArrayList<NamedBuildQuery> userBuildQueries = new ArrayList<>();
-
- @JsonIgnore
- @Lob
- @Column(nullable=false, length=65535)
- private LinkedHashSet<String> userBuildQuerySubscriptions = new LinkedHashSet<>();
-
+ private LinkedHashMap<String, Boolean> pullRequestQueryWatches = new LinkedHashMap<>();
+
@JsonIgnore
@Lob
@Column(nullable=false, length=65535)
@@ -235,8 +221,8 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
private transient Collection<Group> groups;
- public QuerySetting<NamedProjectQuery> getProjectQuerySetting() {
- return new QuerySetting<NamedProjectQuery>() {
+ public QueryPersonalization<NamedProjectQuery> getProjectQueryPersonalization() {
+ return new QueryPersonalization<NamedProjectQuery>() {
@Override
public Project getProject() {
@@ -249,13 +235,13 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
}
@Override
- public ArrayList<NamedProjectQuery> getUserQueries() {
- return userProjectQueries;
+ public ArrayList<NamedProjectQuery> getQueries() {
+ return projectQueries;
}
@Override
- public void setUserQueries(ArrayList<NamedProjectQuery> userQueries) {
- userProjectQueries = userQueries;
+ public void setQueries(ArrayList<NamedProjectQuery> userQueries) {
+ projectQueries = userQueries;
}
@Override
@@ -268,11 +254,16 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
return null;
}
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(UserManager.class).save(User.this);
+ }
+
};
}
- public QuerySetting<NamedIssueQuery> getIssueQuerySetting() {
- return new QuerySetting<NamedIssueQuery>() {
+ public QueryPersonalization<NamedIssueQuery> getIssueQueryPersonalization() {
+ return new QueryPersonalization<NamedIssueQuery>() {
@Override
public Project getProject() {
@@ -285,24 +276,19 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
}
@Override
- public ArrayList<NamedIssueQuery> getUserQueries() {
- return userIssueQueries;
+ public ArrayList<NamedIssueQuery> getQueries() {
+ return issueQueries;
}
@Override
- public void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {
- userIssueQueries = userQueries;
+ public void setQueries(ArrayList<NamedIssueQuery> userQueries) {
+ issueQueries = userQueries;
}
@Override
public QueryWatchSupport<NamedIssueQuery> getQueryWatchSupport() {
return new QueryWatchSupport<NamedIssueQuery>() {
- @Override
- public LinkedHashMap<String, Boolean> getUserQueryWatches() {
- return userIssueQueryWatches;
- }
-
@Override
public LinkedHashMap<String, Boolean> getQueryWatches() {
return issueQueryWatches;
@@ -315,12 +301,17 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
public QuerySubscriptionSupport<NamedIssueQuery> getQuerySubscriptionSupport() {
return null;
}
+
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(UserManager.class).save(User.this);
+ }
};
}
- public QuerySetting<NamedPullRequestQuery> getPullRequestQuerySetting() {
- return new QuerySetting<NamedPullRequestQuery>() {
+ public QueryPersonalization<NamedPullRequestQuery> getPullRequestQueryPersonalization() {
+ return new QueryPersonalization<NamedPullRequestQuery>() {
@Override
public Project getProject() {
@@ -333,24 +324,19 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
}
@Override
- public ArrayList<NamedPullRequestQuery> getUserQueries() {
- return userPullRequestQueries;
+ public ArrayList<NamedPullRequestQuery> getQueries() {
+ return pullRequestQueries;
}
@Override
- public void setUserQueries(ArrayList<NamedPullRequestQuery> userQueries) {
- userPullRequestQueries = userQueries;
+ public void setQueries(ArrayList<NamedPullRequestQuery> userQueries) {
+ pullRequestQueries = userQueries;
}
@Override
public QueryWatchSupport<NamedPullRequestQuery> getQueryWatchSupport() {
return new QueryWatchSupport<NamedPullRequestQuery>() {
- @Override
- public LinkedHashMap<String, Boolean> getUserQueryWatches() {
- return userPullRequestQueryWatches;
- }
-
@Override
public LinkedHashMap<String, Boolean> getQueryWatches() {
return pullRequestQueryWatches;
@@ -363,12 +349,17 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
public QuerySubscriptionSupport<NamedPullRequestQuery> getQuerySubscriptionSupport() {
return null;
}
+
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(UserManager.class).save(User.this);
+ }
};
}
- public QuerySetting<NamedBuildQuery> getBuildQuerySetting() {
- return new QuerySetting<NamedBuildQuery>() {
+ public QueryPersonalization<NamedBuildQuery> getBuildQueryPersonalization() {
+ return new QueryPersonalization<NamedBuildQuery>() {
@Override
public Project getProject() {
@@ -381,13 +372,13 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
}
@Override
- public ArrayList<NamedBuildQuery> getUserQueries() {
- return userBuildQueries;
+ public ArrayList<NamedBuildQuery> getQueries() {
+ return buildQueries;
}
@Override
- public void setUserQueries(ArrayList<NamedBuildQuery> userQueries) {
- userBuildQueries = userQueries;
+ public void setQueries(ArrayList<NamedBuildQuery> userQueries) {
+ buildQueries = userQueries;
}
@Override
@@ -399,11 +390,6 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
public QuerySubscriptionSupport<NamedBuildQuery> getQuerySubscriptionSupport() {
return new QuerySubscriptionSupport<NamedBuildQuery>() {
- @Override
- public LinkedHashSet<String> getUserQuerySubscriptions() {
- return userBuildQuerySubscriptions;
- }
-
@Override
public LinkedHashSet<String> getQuerySubscriptions() {
return buildQuerySubscriptions;
@@ -411,6 +397,11 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
};
}
+
+ @Override
+ public void onUpdated() {
+ OneDev.getInstance(UserManager.class).save(User.this);
+ }
};
}
@@ -706,68 +697,60 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
this.issueVotes = issueVotes;
}
- public Collection<IssueQuerySetting> getProjectIssueQuerySettings() {
- return projectIssueQuerySettings;
+ public Collection<IssueQueryPersonalization> getIssueQueryPersonalizations() {
+ return issueQueryPersonalizations;
}
- public void setProjectIssueQuerySettings(Collection<IssueQuerySetting> projectIssueQuerySettings) {
- this.projectIssueQuerySettings = projectIssueQuerySettings;
+ public void setIssueQueryPersonalizations(Collection<IssueQueryPersonalization> issueQueryPersonalizations) {
+ this.issueQueryPersonalizations = issueQueryPersonalizations;
}
- public Collection<BuildQuerySetting> getProjectBuildQuerySettings() {
- return projectBuildQuerySettings;
+ public Collection<BuildQueryPersonalization> getBuildQueryPersonalizations() {
+ return buildQueryPersonalizations;
}
- public void setProjectBuildQuerySettings(Collection<BuildQuerySetting> projectBuildQuerySettings) {
- this.projectBuildQuerySettings = projectBuildQuerySettings;
+ public void setBuildQueryPersonalizations(Collection<BuildQueryPersonalization> buildQueryPersonalizations) {
+ this.buildQueryPersonalizations = buildQueryPersonalizations;
}
- public Collection<PullRequestQuerySetting> getProjectPullRequestQuerySettings() {
- return projectPullRequestQuerySettings;
+ public Collection<PullRequestQueryPersonalization> getPullRequestQueryPersonalizations() {
+ return pullRequestQueryPersonalizations;
}
- public void setProjectPullRequestQuerySettings(Collection<PullRequestQuerySetting> projectPullRequestQuerySettings) {
- this.projectPullRequestQuerySettings = projectPullRequestQuerySettings;
+ public void setPullRequestQueryPersonalizations(Collection<PullRequestQueryPersonalization> pullRequestQueryPersonalizations) {
+ this.pullRequestQueryPersonalizations = pullRequestQueryPersonalizations;
}
- public Collection<CommitQuerySetting> getProjectCommitQuerySettings() {
- return projectCommitQuerySettings;
+ public Collection<CommitQueryPersonalization> getCommitQueryPersonalizations() {
+ return commitQueryPersonalizations;
}
- public void setProjectCommitQuerySettings(Collection<CommitQuerySetting> projectCommitQuerySettings) {
- this.projectCommitQuerySettings = projectCommitQuerySettings;
+ public void setCommitQueryPersonalizations(Collection<CommitQueryPersonalization> commitQueryPersonalizations) {
+ this.commitQueryPersonalizations = commitQueryPersonalizations;
}
- public Collection<CodeCommentQuerySetting> getProjectCodeCommentQuerySettings() {
- return projectCodeCommentQuerySettings;
+ public Collection<CodeCommentQueryPersonalization> getCodeCommentQueryPersonalizations() {
+ return codeCommentQueryPersonalizations;
}
- public void setProjectCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings) {
- this.projectCodeCommentQuerySettings = projectCodeCommentQuerySettings;
+ public void setCodeCommentQueryPersonalizations(Collection<CodeCommentQueryPersonalization> codeCommentQueryPersonalizations) {
+ this.codeCommentQueryPersonalizations = codeCommentQueryPersonalizations;
}
public ArrayList<NamedProjectQuery> getUserProjectQueries() {
- return userProjectQueries;
+ return projectQueries;
}
- public void setUserProjectQueries(ArrayList<NamedProjectQuery> userProjectQueries) {
- this.userProjectQueries = userProjectQueries;
+ public void setProjectQueries(ArrayList<NamedProjectQuery> userProjectQueries) {
+ this.projectQueries = userProjectQueries;
}
public ArrayList<NamedIssueQuery> getUserIssueQueries() {
- return userIssueQueries;
+ return issueQueries;
}
- public void setUserIssueQueries(ArrayList<NamedIssueQuery> userIssueQueries) {
- this.userIssueQueries = userIssueQueries;
- }
-
- public LinkedHashMap<String, Boolean> getUserIssueQueryWatches() {
- return userIssueQueryWatches;
- }
-
- public void setUserIssueQueryWatches(LinkedHashMap<String, Boolean> userIssueQueryWatches) {
- this.userIssueQueryWatches = userIssueQueryWatches;
+ public void setIssueQueries(ArrayList<NamedIssueQuery> userIssueQueries) {
+ this.issueQueries = userIssueQueries;
}
public LinkedHashMap<String, Boolean> getIssueQueryWatches() {
@@ -779,19 +762,11 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
}
public ArrayList<NamedPullRequestQuery> getUserPullRequestQueries() {
- return userPullRequestQueries;
- }
-
- public void setUserPullRequestQueries(ArrayList<NamedPullRequestQuery> userPullRequestQueries) {
- this.userPullRequestQueries = userPullRequestQueries;
+ return pullRequestQueries;
}
- public LinkedHashMap<String, Boolean> getUserPullRequestQueryWatches() {
- return userPullRequestQueryWatches;
- }
-
- public void setUserPullRequestQueryWatches(LinkedHashMap<String, Boolean> userPullRequestQueryWatches) {
- this.userPullRequestQueryWatches = userPullRequestQueryWatches;
+ public void setPullRequestQueries(ArrayList<NamedPullRequestQuery> userPullRequestQueries) {
+ this.pullRequestQueries = userPullRequestQueries;
}
public LinkedHashMap<String, Boolean> getPullRequestQueryWatches() {
@@ -803,19 +778,11 @@ public class User extends AbstractEntity implements AuthenticationInfo, NameAwar
}
public ArrayList<NamedBuildQuery> getUserBuildQueries() {
- return userBuildQueries;
- }
-
- public void setUserBuildQueries(ArrayList<NamedBuildQuery> userBuildQueries) {
- this.userBuildQueries = userBuildQueries;
+ return buildQueries;
}
- public LinkedHashSet<String> getUserBuildQuerySubscriptions() {
- return userBuildQuerySubscriptions;
- }
-
- public void setUserBuildQuerySubscriptions(LinkedHashSet<String> userBuildQuerySubscriptions) {
- this.userBuildQuerySubscriptions = userBuildQuerySubscriptions;
+ public void setBuildQueries(ArrayList<NamedBuildQuery> buildQueries) {
+ this.buildQueries = buildQueries;
}
public LinkedHashSet<String> getBuildQuerySubscriptions() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java
new file mode 100644
index 0000000000..ffdab9ea5e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedAgentQuery.java
@@ -0,0 +1,49 @@
+package io.onedev.server.model.support;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.web.editable.annotation.AgentQuery;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+
+@Editable
+public class NamedAgentQuery implements NamedQuery {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String query;
+
+ public NamedAgentQuery(String name, String query) {
+ this.name = name;
+ this.query = query;
+ }
+
+ public NamedAgentQuery() {
+ }
+
+ @Editable
+ @NotEmpty
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable
+ @AgentQuery(forExecutor=false)
+ @NameOfEmptyValue("All")
+ @Override
+ public String getQuery() {
+ return query;
+ }
+
+ public void setQuery(String query) {
+ this.query = query;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
index 2ef4abcd88..a65056fd52 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
@@ -10,6 +10,10 @@ import io.onedev.server.web.editable.annotation.Editable;
@Editable
public interface NamedQuery extends Serializable {
+ public static final String GLOBAL_NAME_PREFIX = "g:";
+
+ public static final String PERSONAL_NAME_PREFIX = "p:";
+
String getName();
String getQuery();
@@ -23,4 +27,20 @@ public interface NamedQuery extends Serializable {
return null;
}
+ @Nullable
+ public static String getGlobalName(String name) {
+ if (name.startsWith(GLOBAL_NAME_PREFIX))
+ return name.substring(GLOBAL_NAME_PREFIX.length());
+ else
+ return null;
+ }
+
+ @Nullable
+ public static String getPersonalName(String name) {
+ if (name.startsWith(PERSONAL_NAME_PREFIX))
+ return name.substring(PERSONAL_NAME_PREFIX.length());
+ else
+ return null;
+ }
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/model/support/QuerySetting.java b/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java
similarity index 77%
rename from server-core/src/main/java/io/onedev/server/model/support/QuerySetting.java
rename to server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java
index 6eab19a7b1..b5ecf9cc73 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/QuerySetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/QueryPersonalization.java
@@ -11,16 +11,16 @@ import io.onedev.server.util.watch.QuerySubscriptionSupport;
import io.onedev.server.util.watch.QueryWatchSupport;
@MappedSuperclass
-public interface QuerySetting<T extends NamedQuery> {
+public interface QueryPersonalization<T extends NamedQuery> {
@Nullable
Project getProject();
User getUser();
- ArrayList<T> getUserQueries();
+ ArrayList<T> getQueries();
- void setUserQueries(ArrayList<T> userQueries);
+ void setQueries(ArrayList<T> userQueries);
@Nullable
QueryWatchSupport<T> getQueryWatchSupport();
@@ -28,4 +28,6 @@ public interface QuerySetting<T extends NamedQuery> {
@Nullable
QuerySubscriptionSupport<T> getQuerySubscriptionSupport();
+ void onUpdated();
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java
new file mode 100644
index 0000000000..bba1b15f37
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/AgentSetting.java
@@ -0,0 +1,49 @@
+package io.onedev.server.model.support.administration;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import io.onedev.agent.AgentOs;
+import io.onedev.server.model.support.NamedAgentQuery;
+import io.onedev.server.search.entity.agent.AgentQuery;
+import io.onedev.server.search.entity.agent.NotUsedSinceCriteria;
+import io.onedev.server.search.entity.agent.OsCriteria;
+
+public class AgentSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<NamedAgentQuery> namedQueries = new ArrayList<>();
+
+ public AgentSetting() {
+ namedQueries.add(new NamedAgentQuery("All agents", null));
+ namedQueries.add(new NamedAgentQuery("Online agents", "online"));
+ namedQueries.add(new NamedAgentQuery("Offline agents", "offline"));
+ namedQueries.add(new NamedAgentQuery("Linux agents", new AgentQuery(new OsCriteria(AgentOs.LINUX)).toString()));
+ namedQueries.add(new NamedAgentQuery("Windows agents", new AgentQuery(new OsCriteria(AgentOs.WINDOWS)).toString()));
+ namedQueries.add(new NamedAgentQuery("Mac OS X agents", new AgentQuery(new OsCriteria(AgentOs.MACOSX)).toString()));
+ namedQueries.add(new NamedAgentQuery("Paused agents", "paused"));
+ namedQueries.add(new NamedAgentQuery("Not used for 1 month", new AgentQuery(new NotUsedSinceCriteria("1 month ago")).toString()));
+ }
+
+ public List<NamedAgentQuery> getNamedQueries() {
+ return namedQueries;
+ }
+
+ public void setNamedQueries(List<NamedAgentQuery> namedQueries) {
+ this.namedQueries = namedQueries;
+ }
+
+ @Nullable
+ public NamedAgentQuery getNamedQuery(String name) {
+ for (NamedAgentQuery namedQuery: getNamedQueries()) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
index 657204f0a3..400ef0c0b9 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalBuildSetting.java
@@ -7,7 +7,9 @@ import java.util.List;
import javax.annotation.Nullable;
import io.onedev.server.model.support.build.NamedBuildQuery;
+import io.onedev.server.web.editable.annotation.Editable;
+@Editable
public class GlobalBuildSetting implements Serializable {
private static final long serialVersionUID = 1L;
@@ -16,6 +18,11 @@ public class GlobalBuildSetting implements Serializable {
private List<String> listParams = new ArrayList<>();
+ private int cpu;
+
+ private int memory;
+
+ @SuppressWarnings("restriction")
public GlobalBuildSetting() {
namedQueries.add(new NamedBuildQuery("All", null));
namedQueries.add(new NamedBuildQuery("Successful", "successful"));
@@ -26,6 +33,12 @@ public class GlobalBuildSetting implements Serializable {
namedQueries.add(new NamedBuildQuery("Waiting", "waiting"));
namedQueries.add(new NamedBuildQuery("Pending", "pending"));
namedQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is since \"last week\""));
+
+ 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);
}
public List<NamedBuildQuery> getNamedQueries() {
@@ -44,6 +57,27 @@ public class GlobalBuildSetting implements Serializable {
this.listParams = listParams;
}
+ @Editable(order=100, 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=200, 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;
+ }
+
@Nullable
public NamedBuildQuery getNamedQuery(String name) {
for (NamedBuildQuery namedQuery: getNamedQueries()) {
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 176a369f12..e475bbb600 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
@@ -1,11 +1,14 @@
package io.onedev.server.model.support.administration;
import java.io.Serializable;
+
import javax.validation.ConstraintValidatorContext;
import javax.validation.Valid;
import javax.validation.constraints.NotNull;
+
import org.apache.commons.lang3.StringUtils;
import org.hibernate.validator.constraints.NotEmpty;
+
import io.onedev.server.git.config.CurlConfig;
import io.onedev.server.git.config.GitConfig;
import io.onedev.server.git.config.SystemCurl;
diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
index 2632b48eb8..6a0b030be2 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java
@@ -86,33 +86,33 @@ public abstract class JobExecutor implements Serializable {
public abstract void execute(String jobToken, JobContext context);
public final boolean isApplicable(Build build) {
- return isEnabled() && io.onedev.server.util.jobmatch.JobMatch.parse(jobMatch).matches(build);
+ return isEnabled() && io.onedev.server.job.match.JobMatch.parse(jobMatch).matches(build);
}
public Usage onDeleteProject(String projectName) {
Usage usage = new Usage();
- if (io.onedev.server.util.jobmatch.JobMatch.parse(jobMatch).isUsingProject(projectName))
+ if (io.onedev.server.job.match.JobMatch.parse(jobMatch).isUsingProject(projectName))
usage.add("job match" );
return usage;
}
public void onRenameProject(String oldName, String newName) {
- io.onedev.server.util.jobmatch.JobMatch parsedJobMatch =
- io.onedev.server.util.jobmatch.JobMatch.parse(this.jobMatch);
+ io.onedev.server.job.match.JobMatch parsedJobMatch =
+ io.onedev.server.job.match.JobMatch.parse(this.jobMatch);
parsedJobMatch.onRenameProject(oldName, newName);
jobMatch = parsedJobMatch.toString();
}
public Usage onDeleteUser(String userName) {
Usage usage = new Usage();
- if (io.onedev.server.util.jobmatch.JobMatch.parse(jobMatch).isUsingUser(userName))
+ if (io.onedev.server.job.match.JobMatch.parse(jobMatch).isUsingUser(userName))
usage.add("job match" );
return usage;
}
public void onRenameUser(String oldName, String newName) {
- io.onedev.server.util.jobmatch.JobMatch parsedJobMatch =
- io.onedev.server.util.jobmatch.JobMatch.parse(this.jobMatch);
+ io.onedev.server.job.match.JobMatch parsedJobMatch =
+ io.onedev.server.job.match.JobMatch.parse(this.jobMatch);
parsedJobMatch.onRenameUser(oldName, newName);
jobMatch = parsedJobMatch.toString();
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java
index ca45b120cf..5b225d8add 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java
@@ -47,5 +47,5 @@ public class NamedIssueQuery implements NamedQuery {
public void setQuery(String query) {
this.query = query;
}
-
+
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index 2d3ab193b0..27888afde2 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -22,7 +22,7 @@ import io.onedev.server.event.build.BuildEvent;
import io.onedev.server.event.build.BuildUpdated;
import io.onedev.server.markdown.MarkdownManager;
import io.onedev.server.model.Build;
-import io.onedev.server.model.BuildQuerySetting;
+import io.onedev.server.model.BuildQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
@@ -84,14 +84,18 @@ public class BuildNotificationManager extends AbstractNotificationManager {
if (!(event instanceof BuildUpdated)) {
Project project = event.getProject();
Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
- for (BuildQuerySetting setting: project.getUserBuildQuerySettings()) {
- for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {
- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
- NamedQuery.find(project.getBuildSetting().getNamedQueries(true), name));
- }
- for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions()) {
- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
- NamedQuery.find(setting.getUserQueries(), name));
+ for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {
+ for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {
+ String globalName = NamedQuery.getGlobalName(name);
+ if (globalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
+ NamedQuery.find(project.getBuildSetting().getNamedQueries(true), globalName));
+ }
+ String personalName = NamedQuery.getPersonalName(name);
+ if (personalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
+ NamedQuery.find(personalization.getQueries(), personalName));
+ }
}
}
@@ -118,13 +122,17 @@ public class BuildNotificationManager extends AbstractNotificationManager {
subscribedQueryStrings.clear();
for (User user: userManager.query()) {
- for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getQuerySubscriptions()) {
- fillSubscribedQueryStrings(subscribedQueryStrings, user,
- NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), name));
- }
- for (String name: user.getBuildQuerySetting().getQuerySubscriptionSupport().getUserQuerySubscriptions()) {
- fillSubscribedQueryStrings(subscribedQueryStrings, user,
- NamedQuery.find(user.getBuildQuerySetting().getUserQueries(), name));
+ for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {
+ String globalName = NamedQuery.getGlobalName(name);
+ if (globalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, user,
+ NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), globalName));
+ }
+ String personalName = NamedQuery.getPersonalName(name);
+ if (personalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, user,
+ NamedQuery.find(user.getBuildQueryPersonalization().getQueries(), personalName));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index 63d9468efa..e072b88bbc 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -23,7 +23,7 @@ import io.onedev.server.entitymanager.UrlManager;
import io.onedev.server.event.RefUpdated;
import io.onedev.server.git.GitUtils;
import io.onedev.server.markdown.MarkdownManager;
-import io.onedev.server.model.CommitQuerySetting;
+import io.onedev.server.model.CommitQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
@@ -65,14 +65,18 @@ public class CommitNotificationManager extends AbstractNotificationManager {
if (!event.getNewCommitId().equals(ObjectId.zeroId())) {
Project project = event.getProject();
Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
- for (CommitQuerySetting setting: project.getUserCommitQuerySettings()) {
+ for (CommitQueryPersonalization setting: project.getCommitQueryPersonalizations()) {
for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {
- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
- NamedQuery.find(project.getNamedCommitQueries(), name));
- }
- for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions()) {
- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
- NamedQuery.find(setting.getUserQueries(), name));
+ String globalName = NamedQuery.getGlobalName(name);
+ if (globalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
+ NamedQuery.find(project.getNamedCommitQueries(), globalName));
+ }
+ String personalName = NamedQuery.getPersonalName(name);
+ if (personalName != null) {
+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
+ NamedQuery.find(setting.getQueries(), personalName));
+ }
}
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
index af192e501e..4b7470a5a8 100644
--- a/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/DefaultMailManager.java
@@ -522,7 +522,7 @@ public class DefaultMailManager implements MailManager {
AtomicReference<Node> lastContentNodeRef = new AtomicReference<>(null);
- new NodeTraversor(new NodeVisitor() {
+ NodeTraversor.traverse(new NodeVisitor() {
@Override
public void tail(Node node, int depth) {
@@ -537,7 +537,7 @@ public class DefaultMailManager implements MailManager {
}
- }).traverse(document);
+ }, document);
Node lastContentNode = lastContentNodeRef.get();
if (lastContentNode != null) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 7eb0739283..c567d9b9fa 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -30,7 +30,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.QueryWatchBuilder;
@@ -89,8 +89,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
}
@Override
- protected Collection<? extends QuerySetting<?>> getQuerySettings() {
- return issue.getProject().getUserIssueQuerySettings();
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return issue.getProject().getIssueQueryPersonalizations();
}
@Override
@@ -115,8 +115,8 @@ public class IssueNotificationManager extends AbstractNotificationManager {
}
@Override
- protected Collection<? extends QuerySetting<?>> getQuerySettings() {
- return userManager.query().stream().map(it->it.getIssueQuerySetting()).collect(Collectors.toList());
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return userManager.query().stream().map(it->it.getIssueQueryPersonalization()).collect(Collectors.toList());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index a8084a0fcf..d4dcca4964 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -39,7 +39,7 @@ import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestWatch;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestChangeData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
@@ -103,8 +103,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
@Override
- protected Collection<? extends QuerySetting<?>> getQuerySettings() {
- return request.getTargetProject().getUserPullRequestQuerySettings();
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return request.getTargetProject().getPullRequestQueryPersonalizations();
}
@Override
@@ -129,8 +129,8 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
}
@Override
- protected Collection<? extends QuerySetting<?>> getQuerySettings() {
- return userManager.query().stream().map(it->it.getPullRequestQuerySetting()).collect(Collectors.toList());
+ protected Collection<? extends QueryPersonalization<?>> getQueryPersonalizations() {
+ return userManager.query().stream().map(it->it.getPullRequestQueryPersonalization()).collect(Collectors.toList());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
index 237e719326..24baca042e 100644
--- a/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
+++ b/server-core/src/main/java/io/onedev/server/persistence/DefaultPersistManager.java
@@ -17,6 +17,7 @@ import java.util.List;
import java.util.Properties;
import javax.persistence.EntityManagerFactory;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.criteria.CriteriaBuilder;
import javax.persistence.criteria.CriteriaQuery;
@@ -329,7 +330,7 @@ public class DefaultPersistManager implements PersistManager {
*/
private boolean hasForeignKeyDependency(Class<?> entityType1, Class<?> entityType2) {
for (Field field: BeanUtils.findFields(entityType1)) {
- if (field.getAnnotation(ManyToOne.class) != null) {
+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {
if (field.getType() == entityType2)
return true;
if (field.getType() != entityType1 &&
diff --git a/server-core/src/main/java/io/onedev/server/rest/AgentResource.java b/server-core/src/main/java/io/onedev/server/rest/AgentResource.java
new file mode 100644
index 0000000000..8430f03bcb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/AgentResource.java
@@ -0,0 +1,53 @@
+package io.onedev.server.rest;
+
+import java.util.Map;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=10000)
+@Path("/agents")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class AgentResource {
+
+ private final AgentManager agentManager;
+
+ @Inject
+ public AgentResource(AgentManager agentManager) {
+ this.agentManager = agentManager;
+ }
+
+ @Api(order=100)
+ @Path("/{agentId}")
+ @GET
+ public Agent getBasicInfo(@PathParam("agentId") Long agentId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ return agentManager.load(agentId);
+ }
+
+ @Api(order=200)
+ @Path("/{agentId}/attributes")
+ @GET
+ public Map<String, String> getAttributes(@PathParam("agentId") Long agentId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ return agentManager.load(agentId).getAttributeMap();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java b/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java
new file mode 100644
index 0000000000..165e162771
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/AgentTokenResource.java
@@ -0,0 +1,106 @@
+package io.onedev.server.rest;
+
+import java.util.List;
+import java.util.UUID;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+import org.hibernate.criterion.Restrictions;
+
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.AgentToken;
+import io.onedev.server.persistence.dao.EntityCriteria;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.rest.jersey.InvalidParamException;
+import io.onedev.server.rest.support.RestConstants;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=10100)
+@Path("/agent-tokens")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class AgentTokenResource {
+
+ private final AgentTokenManager tokenManager;
+
+ @Inject
+ public AgentTokenResource(AgentTokenManager tokenManager) {
+ this.tokenManager = tokenManager;
+ }
+
+ @Api(order=100)
+ @Path("/{tokenId}")
+ @GET
+ public AgentToken getBasicInfo(@PathParam("tokenId") Long tokenId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ return tokenManager.load(tokenId);
+ }
+
+ @Api(order=100)
+ @Path("/{tokenId}/agent")
+ @GET
+ public Agent getAgent(@PathParam("tokenId") Long agentTokenId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ return tokenManager.load(agentTokenId).getAgent();
+ }
+
+ @Api(order=200)
+ @GET
+ public List<AgentToken> queryBasicInfo(@QueryParam("value") String value,
+ @QueryParam("offset") @Api(example="0") int offset,
+ @QueryParam("count") @Api(example="100") int count) {
+
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ if (count > RestConstants.MAX_PAGE_SIZE)
+ throw new InvalidParamException("Count should not be greater than " + RestConstants.MAX_PAGE_SIZE);
+
+ EntityCriteria<AgentToken> criteria = EntityCriteria.of(AgentToken.class);
+
+ if (value != null)
+ criteria.add(Restrictions.eq(AgentToken.PROP_VALUE, value));
+
+ return tokenManager.query(criteria, offset, count);
+ }
+
+ @Api(order=500, description="Update token of specified id in request body, or create new if id property not provided")
+ @POST
+ public Long createOrUpdate(AgentToken token) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ if (token == null)
+ token = new AgentToken();
+ if (token.isNew())
+ token.setValue(UUID.randomUUID().toString());
+ tokenManager.save(token);
+ return token.getId();
+ }
+
+ @Api(order=600)
+ @Path("/{tokenId}")
+ @DELETE
+ public Response delete(@PathParam("tokenId") Long tokenId) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+ tokenManager.delete(tokenManager.load(tokenId));
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java
new file mode 100644
index 0000000000..4c40991edd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/BuildQueryPersonalizationResource.java
@@ -0,0 +1,67 @@
+package io.onedev.server.rest;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
+import io.onedev.server.model.BuildQueryPersonalization;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=5300)
+@Path("/build-query-personalizations")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class BuildQueryPersonalizationResource {
+
+ private final BuildQueryPersonalizationManager queryPersonalizationManager;
+
+ @Inject
+ public BuildQueryPersonalizationResource(BuildQueryPersonalizationManager queryPersonalizationManager) {
+ this.queryPersonalizationManager = queryPersonalizationManager;
+ }
+
+ @Api(order=100)
+ @Path("/{queryPersonalizationId}")
+ @GET
+ public BuildQueryPersonalization get(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ BuildQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return queryPersonalization;
+ }
+
+ @Api(order=200, description="Update build query personalization of specified id in request body, or create new if id property not provided")
+ @POST
+ public Long createOrUpdate(@NotNull BuildQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.save(queryPersonalization);
+ return queryPersonalization.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{queryPersonalizationId}")
+ @DELETE
+ public Response delete(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ BuildQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.delete(queryPersonalization);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/BuildQuerySettingResource.java b/server-core/src/main/java/io/onedev/server/rest/BuildQuerySettingResource.java
deleted file mode 100644
index cf933e6b62..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/BuildQuerySettingResource.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package io.onedev.server.rest;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.BuildQuerySettingManager;
-import io.onedev.server.model.BuildQuerySetting;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-
-@Api(order=5300)
-@Path("/build-query-settings")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class BuildQuerySettingResource {
-
- private final BuildQuerySettingManager querySettingManager;
-
- @Inject
- public BuildQuerySettingResource(BuildQuerySettingManager querySettingManager) {
- this.querySettingManager = querySettingManager;
- }
-
- @Api(order=100)
- @Path("/{querySettingId}")
- @GET
- public BuildQuerySetting get(@PathParam("querySettingId") Long querySettingId) {
- BuildQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- return querySetting;
- }
-
- @Api(order=200, description="Update build query setting of specified id in request body, or create new if id property not provided")
- @POST
- public Long createOrUpdate(@NotNull BuildQuerySetting querySetting) {
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- querySettingManager.save(querySetting);
- return querySetting.getId();
- }
-
- @Api(order=300)
- @Path("/{querySettingId}")
- @DELETE
- public Response delete(@PathParam("querySettingId") Long querySettingId) {
- BuildQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- querySettingManager.delete(querySetting);
- return Response.ok().build();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java
new file mode 100644
index 0000000000..166ee597a4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/CodeCommentQueryPersonalizationResource.java
@@ -0,0 +1,69 @@
+package io.onedev.server.rest;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
+import io.onedev.server.model.CodeCommentQueryPersonalization;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=5500)
+@Path("/code-comment-query-personalizations")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class CodeCommentQueryPersonalizationResource {
+
+ private final CodeCommentQueryPersonalizationManager queryPersonalizationManager;
+
+ @Inject
+ public CodeCommentQueryPersonalizationResource(CodeCommentQueryPersonalizationManager queryPersonalizationManager) {
+ this.queryPersonalizationManager = queryPersonalizationManager;
+ }
+
+ @Api(order=100)
+ @Path("/{queryPersonalizationId}")
+ @GET
+ public CodeCommentQueryPersonalization get(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ CodeCommentQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return queryPersonalization;
+ }
+
+ @Api(order=200, description="Update code comment query personalization of specified id in request body, or create new if id property not provided")
+ @POST
+ public Long createOrUpdate(@NotNull CodeCommentQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.save(queryPersonalization);
+ return queryPersonalization.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{queryPersonalizationId}")
+ @DELETE
+ public Response delete(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ CodeCommentQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.delete(queryPersonalization);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CodeCommentQuerySettingResource.java b/server-core/src/main/java/io/onedev/server/rest/CodeCommentQuerySettingResource.java
deleted file mode 100644
index 088b0d1a68..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/CodeCommentQuerySettingResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.onedev.server.rest;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;
-import io.onedev.server.model.CodeCommentQuerySetting;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-
-@Api(order=5500)
-@Path("/code-comment-query-settings")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class CodeCommentQuerySettingResource {
-
- private final CodeCommentQuerySettingManager querySettingManager;
-
- @Inject
- public CodeCommentQuerySettingResource(CodeCommentQuerySettingManager querySettingManager) {
- this.querySettingManager = querySettingManager;
- }
-
- @Api(order=100)
- @Path("/{querySettingId}")
- @GET
- public CodeCommentQuerySetting get(@PathParam("querySettingId") Long querySettingId) {
- CodeCommentQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- return querySetting;
- }
-
- @Api(order=200, description="Update code comment query setting of specified id in request body, or create new if id property not provided")
- @POST
- public Long createOrUpdate(@NotNull CodeCommentQuerySetting querySetting) {
- if (!SecurityUtils.canAccess(querySetting.getProject())
- || !SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser())) {
- throw new UnauthorizedException();
- }
- querySettingManager.save(querySetting);
- return querySetting.getId();
- }
-
- @Api(order=300)
- @Path("/{querySettingId}")
- @DELETE
- public Response delete(@PathParam("querySettingId") Long querySettingId) {
- CodeCommentQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- querySettingManager.delete(querySetting);
- return Response.ok().build();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java
new file mode 100644
index 0000000000..47c86da7d1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/CommitQueryPersonalizationResource.java
@@ -0,0 +1,69 @@
+package io.onedev.server.rest;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
+import io.onedev.server.model.CommitQueryPersonalization;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=5400)
+@Path("/commit-query-personalizations")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class CommitQueryPersonalizationResource {
+
+ private final CommitQueryPersonalizationManager queryPersonalizationManager;
+
+ @Inject
+ public CommitQueryPersonalizationResource(CommitQueryPersonalizationManager queryPersonalizationManager) {
+ this.queryPersonalizationManager = queryPersonalizationManager;
+ }
+
+ @Api(order=100)
+ @Path("/{queryPersonalizationId}")
+ @GET
+ public CommitQueryPersonalization get(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ CommitQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return queryPersonalization;
+ }
+
+ @Api(order=200, description="Update commit query personalization of specified id in request body, or create new if id property not provided")
+ @POST
+ public Long createOrUpdate(@NotNull CommitQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.save(queryPersonalization);
+ return queryPersonalization.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{queryPersonalizationId}")
+ @DELETE
+ public Response delete(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ CommitQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.delete(queryPersonalization);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/CommitQuerySettingResource.java b/server-core/src/main/java/io/onedev/server/rest/CommitQuerySettingResource.java
deleted file mode 100644
index cb97567e13..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/CommitQuerySettingResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.onedev.server.rest;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.CommitQuerySettingManager;
-import io.onedev.server.model.CommitQuerySetting;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-
-@Api(order=5400)
-@Path("/commit-query-settings")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class CommitQuerySettingResource {
-
- private final CommitQuerySettingManager querySettingManager;
-
- @Inject
- public CommitQuerySettingResource(CommitQuerySettingManager querySettingManager) {
- this.querySettingManager = querySettingManager;
- }
-
- @Api(order=100)
- @Path("/{querySettingId}")
- @GET
- public CommitQuerySetting get(@PathParam("querySettingId") Long querySettingId) {
- CommitQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- return querySetting;
- }
-
- @Api(order=200, description="Update commit query setting of specified id in request body, or create new if id property not provided")
- @POST
- public Long createOrUpdate(@NotNull CommitQuerySetting querySetting) {
- if (!SecurityUtils.canAccess(querySetting.getProject())
- || !SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser())) {
- throw new UnauthorizedException();
- }
- querySettingManager.save(querySetting);
- return querySetting.getId();
- }
-
- @Api(order=300)
- @Path("/{querySettingId}")
- @DELETE
- public Response delete(@PathParam("querySettingId") Long querySettingId) {
- CommitQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- querySettingManager.delete(querySetting);
- return Response.ok().build();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java
new file mode 100644
index 0000000000..4af89eeaf9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/IssueQueryPersonalizationResource.java
@@ -0,0 +1,69 @@
+package io.onedev.server.rest;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
+import io.onedev.server.model.IssueQueryPersonalization;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=5100)
+@Path("/issue-query-personalizations")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class IssueQueryPersonalizationResource {
+
+ private final IssueQueryPersonalizationManager queryPersonalizationManager;
+
+ @Inject
+ public IssueQueryPersonalizationResource(IssueQueryPersonalizationManager queryPersonalizationManager) {
+ this.queryPersonalizationManager = queryPersonalizationManager;
+ }
+
+ @Api(order=100)
+ @Path("/{queryPersonalizationId}")
+ @GET
+ public IssueQueryPersonalization get(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ IssueQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return queryPersonalization;
+ }
+
+ @Api(order=200, description="Update issue query setting of specified id in request body, or create new if id property not provided")
+ @POST
+ public Long createOrUpdate(@NotNull IssueQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.save(queryPersonalization);
+ return queryPersonalization.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{queryPersonalizationId}")
+ @DELETE
+ public Response delete(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ IssueQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.delete(queryPersonalization);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/IssueQuerySettingResource.java b/server-core/src/main/java/io/onedev/server/rest/IssueQuerySettingResource.java
deleted file mode 100644
index 0722ab6082..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/IssueQuerySettingResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.onedev.server.rest;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.IssueQuerySettingManager;
-import io.onedev.server.model.IssueQuerySetting;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-
-@Api(order=5100)
-@Path("/issue-query-settings")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class IssueQuerySettingResource {
-
- private final IssueQuerySettingManager querySettingManager;
-
- @Inject
- public IssueQuerySettingResource(IssueQuerySettingManager querySettingManager) {
- this.querySettingManager = querySettingManager;
- }
-
- @Api(order=100)
- @Path("/{querySettingId}")
- @GET
- public IssueQuerySetting get(@PathParam("querySettingId") Long querySettingId) {
- IssueQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- return querySetting;
- }
-
- @Api(order=200, description="Update issue query setting of specified id in request body, or create new if id property not provided")
- @POST
- public Long createOrUpdate(@NotNull IssueQuerySetting querySetting) {
- if (!SecurityUtils.canAccess(querySetting.getProject())
- || !SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser())) {
- throw new UnauthorizedException();
- }
- querySettingManager.save(querySetting);
- return querySetting.getId();
- }
-
- @Api(order=300)
- @Path("/{querySettingId}")
- @DELETE
- public Response delete(@PathParam("querySettingId") Long querySettingId) {
- IssueQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- querySettingManager.delete(querySetting);
- return Response.ok().build();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java
new file mode 100644
index 0000000000..03c958f1a4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/rest/PullRequestQueryPersonalizationResource.java
@@ -0,0 +1,69 @@
+package io.onedev.server.rest;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+import javax.validation.constraints.NotNull;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+import org.apache.shiro.authz.UnauthorizedException;
+
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
+import io.onedev.server.model.PullRequestQueryPersonalization;
+import io.onedev.server.rest.annotation.Api;
+import io.onedev.server.security.SecurityUtils;
+
+@Api(order=5200)
+@Path("/pull-request-query-personalizations")
+@Consumes(MediaType.APPLICATION_JSON)
+@Produces(MediaType.APPLICATION_JSON)
+@Singleton
+public class PullRequestQueryPersonalizationResource {
+
+ private final PullRequestQueryPersonalizationManager queryPersonalizationManager;
+
+ @Inject
+ public PullRequestQueryPersonalizationResource(PullRequestQueryPersonalizationManager queryPersonalizationManager) {
+ this.queryPersonalizationManager = queryPersonalizationManager;
+ }
+
+ @Api(order=100)
+ @Path("/{queryPersonalizationId}")
+ @GET
+ public PullRequestQueryPersonalization get(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ PullRequestQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ return queryPersonalization;
+ }
+
+ @Api(order=200, description="Update pull request query personalization of specified id in request body, or create new if id property not provided")
+ @POST
+ public Long createOrUpdate(@NotNull PullRequestQueryPersonalization queryPersonalization) {
+ if (!SecurityUtils.canAccess(queryPersonalization.getProject())
+ || !SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser())) {
+ throw new UnauthorizedException();
+ }
+ queryPersonalizationManager.save(queryPersonalization);
+ return queryPersonalization.getId();
+ }
+
+ @Api(order=300)
+ @Path("/{queryPersonalizationId}")
+ @DELETE
+ public Response delete(@PathParam("queryPersonalizationId") Long queryPersonalizationId) {
+ PullRequestQueryPersonalization queryPersonalization = queryPersonalizationManager.load(queryPersonalizationId);
+ if (!SecurityUtils.isAdministrator() && !queryPersonalization.getUser().equals(SecurityUtils.getUser()))
+ throw new UnauthorizedException();
+ queryPersonalizationManager.delete(queryPersonalization);
+ return Response.ok().build();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/rest/PullRequestQuerySettingResource.java b/server-core/src/main/java/io/onedev/server/rest/PullRequestQuerySettingResource.java
deleted file mode 100644
index bc6df623b8..0000000000
--- a/server-core/src/main/java/io/onedev/server/rest/PullRequestQuerySettingResource.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package io.onedev.server.rest;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-import javax.validation.constraints.NotNull;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import org.apache.shiro.authz.UnauthorizedException;
-
-import io.onedev.server.entitymanager.PullRequestQuerySettingManager;
-import io.onedev.server.model.PullRequestQuerySetting;
-import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.security.SecurityUtils;
-
-@Api(order=5200)
-@Path("/pull-request-query-settings")
-@Consumes(MediaType.APPLICATION_JSON)
-@Produces(MediaType.APPLICATION_JSON)
-@Singleton
-public class PullRequestQuerySettingResource {
-
- private final PullRequestQuerySettingManager querySettingManager;
-
- @Inject
- public PullRequestQuerySettingResource(PullRequestQuerySettingManager querySettingManager) {
- this.querySettingManager = querySettingManager;
- }
-
- @Api(order=100)
- @Path("/{querySettingId}")
- @GET
- public PullRequestQuerySetting get(@PathParam("querySettingId") Long querySettingId) {
- PullRequestQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- return querySetting;
- }
-
- @Api(order=200, description="Update pull request query setting of specified id in request body, or create new if id property not provided")
- @POST
- public Long createOrUpdate(@NotNull PullRequestQuerySetting querySetting) {
- if (!SecurityUtils.canAccess(querySetting.getProject())
- || !SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser())) {
- throw new UnauthorizedException();
- }
- querySettingManager.save(querySetting);
- return querySetting.getId();
- }
-
- @Api(order=300)
- @Path("/{querySettingId}")
- @DELETE
- public Response delete(@PathParam("querySettingId") Long querySettingId) {
- PullRequestQuerySetting querySetting = querySettingManager.load(querySettingId);
- if (!SecurityUtils.isAdministrator() && !querySetting.getUser().equals(SecurityUtils.getUser()))
- throw new UnauthorizedException();
- querySettingManager.delete(querySetting);
- return Response.ok().build();
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/rest/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
index 36440b177e..5c72105b72 100644
--- a/server-core/src/main/java/io/onedev/server/rest/UserResource.java
+++ b/server-core/src/main/java/io/onedev/server/rest/UserResource.java
@@ -35,15 +35,15 @@ import com.google.common.collect.Sets;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.entitymanager.SshKeyManager;
import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.model.BuildQuerySetting;
-import io.onedev.server.model.CodeCommentQuerySetting;
-import io.onedev.server.model.CommitQuerySetting;
-import io.onedev.server.model.IssueQuerySetting;
+import io.onedev.server.model.BuildQueryPersonalization;
+import io.onedev.server.model.CodeCommentQueryPersonalization;
+import io.onedev.server.model.CommitQueryPersonalization;
+import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.IssueVote;
import io.onedev.server.model.IssueWatch;
import io.onedev.server.model.Membership;
import io.onedev.server.model.PullRequestAssignment;
-import io.onedev.server.model.PullRequestQuerySetting;
+import io.onedev.server.model.PullRequestQueryPersonalization;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestWatch;
import io.onedev.server.model.SshKey;
@@ -159,53 +159,53 @@ public class UserResource {
}
@Api(order=900)
- @Path("/{userId}/project-build-query-settings")
+ @Path("/{userId}/project-build-query-personalizations")
@GET
- public Collection<BuildQuerySetting> getProjectBuildQuerySettings(@PathParam("userId") Long userId) {
+ public Collection<BuildQueryPersonalization> getProjectBuildQueryPersonalizations(@PathParam("userId") Long userId) {
User user = userManager.load(userId);
if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- return user.getProjectBuildQuerySettings();
+ return user.getBuildQueryPersonalizations();
}
@Api(order=1000)
- @Path("/{userId}/project-code-comment-query-settings")
+ @Path("/{userId}/project-code-comment-query-personalizations")
@GET
- public Collection<CodeCommentQuerySetting> getProjectCodeCommentQuerySettings(@PathParam("userId") Long userId) {
+ public Collection<CodeCommentQueryPersonalization> getProjectCodeCommentQueryPersonalizations(@PathParam("userId") Long userId) {
User user = userManager.load(userId);
if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- return user.getProjectCodeCommentQuerySettings();
+ return user.getCodeCommentQueryPersonalizations();
}
@Api(order=1100)
- @Path("/{userId}/project-commit-query-settings")
+ @Path("/{userId}/project-commit-query-personalizations")
@GET
- public Collection<CommitQuerySetting> getProjectCommitQuerySettings(@PathParam("userId") Long userId) {
+ public Collection<CommitQueryPersonalization> getProjectCommitQueryPersonalizations(@PathParam("userId") Long userId) {
User user = userManager.load(userId);
if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- return user.getProjectCommitQuerySettings();
+ return user.getCommitQueryPersonalizations();
}
@Api(order=1200)
- @Path("/{userId}/project-issue-query-settings")
+ @Path("/{userId}/project-issue-query-personalizations")
@GET
- public Collection<IssueQuerySetting> getProjecIssueQuerySettings(@PathParam("userId") Long userId) {
+ public Collection<IssueQueryPersonalization> getProjecIssueQueryPersonalizations(@PathParam("userId") Long userId) {
User user = userManager.load(userId);
if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- return user.getProjectIssueQuerySettings();
+ return user.getIssueQueryPersonalizations();
}
@Api(order=1300)
- @Path("/{userId}/project-pull-request-query-settings")
+ @Path("/{userId}/project-pull-request-query-personalizations")
@GET
- public Collection<PullRequestQuerySetting> getProjecPullRequestQuerySettings(@PathParam("userId") Long userId) {
+ public Collection<PullRequestQueryPersonalization> getProjecPullRequestQueryPersonalizations(@PathParam("userId") Long userId) {
User user = userManager.load(userId);
if (!SecurityUtils.isAdministrator() && !user.equals(SecurityUtils.getUser()))
throw new UnauthorizedException();
- return user.getProjectPullRequestQuerySettings();
+ return user.getPullRequestQueryPersonalizations();
}
@Api(order=1400)
@@ -249,13 +249,10 @@ public class UserResource {
queriesAndWatches.buildQuerySubscriptions = user.getBuildQuerySubscriptions();
queriesAndWatches.issueQueryWatches = user.getIssueQueryWatches();
queriesAndWatches.pullRequestQueryWatches = user.getPullRequestQueryWatches();
- queriesAndWatches.userBuildQueries = user.getUserBuildQueries();
- queriesAndWatches.userBuildQuerySubscriptions = user.getUserBuildQuerySubscriptions();
- queriesAndWatches.userIssueQueries = user.getUserIssueQueries();
- queriesAndWatches.userIssueQueryWatches = user.getUserIssueQueryWatches();
- queriesAndWatches.userProjectQueries = user.getUserProjectQueries();
- queriesAndWatches.userPullRequestQueries = user.getUserPullRequestQueries();
- queriesAndWatches.userPullRequestQueryWatches = user.getUserPullRequestQueryWatches();
+ queriesAndWatches.buildQueries = user.getUserBuildQueries();
+ queriesAndWatches.issueQueries = user.getUserIssueQueries();
+ queriesAndWatches.projectQueries = user.getUserProjectQueries();
+ queriesAndWatches.pullRequestQueries = user.getUserPullRequestQueries();
return queriesAndWatches;
}
@@ -361,13 +358,11 @@ public class UserResource {
user.setBuildQuerySubscriptions(queriesAndWatches.buildQuerySubscriptions);
user.setIssueQueryWatches(queriesAndWatches.issueQueryWatches);
user.setPullRequestQueryWatches(queriesAndWatches.pullRequestQueryWatches);
- user.setUserBuildQueries(queriesAndWatches.userBuildQueries);
- user.setUserBuildQuerySubscriptions(queriesAndWatches.userBuildQuerySubscriptions);
- user.setUserIssueQueries(queriesAndWatches.userIssueQueries);
- user.setUserIssueQueryWatches(queriesAndWatches.userIssueQueryWatches);
- user.setUserProjectQueries(queriesAndWatches.userProjectQueries);
- user.setUserPullRequestQueries(queriesAndWatches.userPullRequestQueries);
- user.setUserPullRequestQueryWatches(queriesAndWatches.userPullRequestQueryWatches);
+ user.setBuildQueries(queriesAndWatches.buildQueries);
+ user.setIssueQueries(queriesAndWatches.issueQueries);
+ user.setIssueQueryWatches(queriesAndWatches.issueQueryWatches);
+ user.setProjectQueries(queriesAndWatches.projectQueries);
+ user.setPullRequestQueries(queriesAndWatches.pullRequestQueries);
userManager.save(user);
return Response.ok().build();
}
@@ -408,23 +403,17 @@ public class UserResource {
private static final long serialVersionUID = 1L;
- ArrayList<NamedProjectQuery> userProjectQueries;
+ ArrayList<NamedProjectQuery> projectQueries;
- ArrayList<NamedIssueQuery> userIssueQueries;
+ ArrayList<NamedIssueQuery> issueQueries;
- LinkedHashMap<String, Boolean> userIssueQueryWatches;
-
LinkedHashMap<String, Boolean> issueQueryWatches;
- ArrayList<NamedPullRequestQuery> userPullRequestQueries;
-
- LinkedHashMap<String, Boolean> userPullRequestQueryWatches;
+ ArrayList<NamedPullRequestQuery> pullRequestQueries;
LinkedHashMap<String, Boolean> pullRequestQueryWatches;
- ArrayList<NamedBuildQuery> userBuildQueries;
-
- LinkedHashSet<String> userBuildQuerySubscriptions;
+ ArrayList<NamedBuildQuery> buildQueries;
LinkedHashSet<String> buildQuerySubscriptions;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
index a37f9a2991..9591171127 100644
--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.java
@@ -171,7 +171,7 @@ public class BuildMetricQuery implements Serializable {
}
public static void checkField(Project project, String fieldName, int operator) {
- Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getBuildParamNames(null);
+ Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getParamNames(null);
if (!METRIC_QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
index 2bc4081487..b17c5633c4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
@@ -15,7 +15,7 @@ import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
public abstract class QueryWatchBuilder<T extends AbstractEntity> {
@@ -27,20 +27,19 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
private final Map<User, Boolean> watches = new HashMap<>();
public QueryWatchBuilder() {
- for (QuerySetting<?> querySetting: getQuerySettings()) {
- boolean watched = false;
- for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getUserQueryWatches().entrySet()) {
- if (matches(NamedQuery.find(querySetting.getUserQueries(), entry.getKey()), querySetting.getUser())) {
- watches.putIfAbsent(querySetting.getUser(), entry.getValue());
- watched = true;
- break;
+ for (QueryPersonalization<?> personalization: getQueryPersonalizations()) {
+ for (Map.Entry<String, Boolean> entry: personalization.getQueryWatchSupport().getQueryWatches().entrySet()) {
+ String globalName = NamedQuery.getGlobalName(entry.getKey());
+ if (globalName != null) {
+ if (matches(NamedQuery.find(getNamedQueries(), globalName), personalization.getUser())) {
+ watches.putIfAbsent(personalization.getUser(), entry.getValue());
+ break;
+ }
}
- }
- if (!watched) {
- for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getQueryWatches().entrySet()) {
- if (matches(NamedQuery.find(getNamedQueries(), entry.getKey()), querySetting.getUser())) {
- watches.putIfAbsent(querySetting.getUser(), entry.getValue());
- watched = true;
+ String personalName = NamedQuery.getPersonalName(entry.getKey());
+ if (personalName != null) {
+ if (matches(NamedQuery.find(personalization.getQueries(), personalName), personalization.getUser())) {
+ watches.putIfAbsent(personalization.getUser(), entry.getValue());
break;
}
}
@@ -85,7 +84,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
protected abstract T getEntity();
- protected abstract Collection<? extends QuerySetting<?>> getQuerySettings();
+ protected abstract Collection<? extends QueryPersonalization<?>> getQueryPersonalizations();
protected abstract EntityQuery<T> parse(String queryString);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4
new file mode 100644
index 0000000000..e7b7cc69b7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4
@@ -0,0 +1,121 @@
+grammar AgentQuery;
+
+query
+ : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ | WS* EOF
+ ;
+
+criteria
+ : operator=(Online|Offline|Paused|HasRunningBuilds) #OperatorCriteria
+ | operator=(HasAttribute|NotUsedSince|EverUsedSince|RanBuild) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
+ | criteria WS+ And WS+ criteria #AndCriteria
+ | criteria WS+ Or WS+ criteria #OrCriteria
+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria
+ | LParens WS* criteria WS* RParens #ParensCriteria
+ ;
+
+order
+ : orderField=Quoted WS* (WS+ direction=(Asc|Desc))?
+ ;
+
+Online
+ : 'online'
+ ;
+
+Offline
+ : 'offline'
+ ;
+
+Paused
+ : 'paused'
+ ;
+
+HasRunningBuilds
+ : 'has' WS+ 'running' WS+ 'builds'
+ ;
+
+HasRunningJobsOfProject
+ : 'has' WS+ 'running' WS+ 'jobs' WS+ 'of' WS+ 'project'
+ ;
+
+HasRunningJobsOfBranch
+ : 'has' WS+ 'running' WS+ 'jobs' WS+ 'of' WS+ 'branch'
+ ;
+
+HasAttribute
+ : 'has' WS+ 'attribute'
+ ;
+
+NotUsedSince
+ : 'not' WS+ 'used' WS+ 'since'
+ ;
+
+EverUsedSince
+ : 'ever' WS+ 'used' WS+ 'since'
+ ;
+
+SelectedByExecutor
+ : 'selected' WS+ 'by' WS+ 'executor'
+ ;
+
+RanBuild
+ : 'ran' WS+ 'build'
+ ;
+
+OrderBy
+ : 'order by'
+ ;
+
+Is
+ : 'is'
+ ;
+
+IsGreaterThan
+ : 'is' WS+ 'greater' WS+ 'than'
+ ;
+
+IsLessThan
+ : 'is' WS+ 'less' WS+ 'than'
+ ;
+
+And
+ : 'and'
+ ;
+
+Or
+ : 'or'
+ ;
+
+Not
+ : 'not'
+ ;
+
+Asc
+ : 'asc'
+ ;
+
+Desc
+ : 'desc'
+ ;
+
+LParens
+ : '('
+ ;
+
+RParens
+ : ')'
+ ;
+
+Quoted
+ : '"' ('\\'.|~[\\"])+? '"'
+ ;
+
+WS
+ : ' '
+ ;
+
+Identifier
+ : [a-zA-Z0-9:_/\\+\-;]+
+ ;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
new file mode 100644
index 0000000000..9f093f1632
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
@@ -0,0 +1,272 @@
+package io.onedev.server.search.entity.agent;
+
+import static io.onedev.server.model.Agent.NAME_CPU;
+import static io.onedev.server.model.Agent.NAME_IP_ADDRESS;
+import static io.onedev.server.model.Agent.NAME_MEMORY;
+import static io.onedev.server.model.Agent.NAME_NAME;
+import static io.onedev.server.model.Agent.NAME_OS;
+import static io.onedev.server.model.Agent.NAME_OS_ARCH;
+import static io.onedev.server.model.Agent.NAME_OS_VERSION;
+import static io.onedev.server.model.Agent.ORDER_FIELDS;
+import static io.onedev.server.model.Agent.QUERY_FIELDS;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
+import io.onedev.agent.AgentOs;
+import io.onedev.commons.codeassist.AntlrUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.AndEntityCriteria;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.EntitySort.Direction;
+import io.onedev.server.search.entity.NotEntityCriteria;
+import io.onedev.server.search.entity.OrEntityCriteria;
+import io.onedev.server.search.entity.agent.AgentQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OrderContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.QueryContext;
+
+public class AgentQuery extends EntityQuery<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final EntityCriteria<Agent> criteria;
+
+ private final List<EntitySort> sorts;
+
+ public AgentQuery(@Nullable EntityCriteria<Agent> criteria, List<EntitySort> sorts) {
+ this.criteria = criteria;
+ this.sorts = sorts;
+ }
+
+ public AgentQuery(@Nullable EntityCriteria<Agent> criteria) {
+ this(criteria, new ArrayList<>());
+ }
+
+ public AgentQuery() {
+ this(null);
+ }
+
+ public static AgentQuery parse(@Nullable String queryString, boolean forExecutor) {
+ if (queryString != null) {
+ CharStream is = CharStreams.fromString(queryString);
+ AgentQueryLexer lexer = new AgentQueryLexer(is);
+ lexer.removeErrorListeners();
+ lexer.addErrorListener(new BaseErrorListener() {
+
+ @Override
+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,
+ int charPositionInLine, String msg, RecognitionException e) {
+ throw new RuntimeException("Malformed agent query", e);
+ }
+
+ });
+ CommonTokenStream tokens = new CommonTokenStream(lexer);
+ AgentQueryParser parser = new AgentQueryParser(tokens);
+ parser.removeErrorListeners();
+ parser.setErrorHandler(new BailErrorStrategy());
+ QueryContext queryContext = parser.query();
+ CriteriaContext criteriaContext = queryContext.criteria();
+ EntityCriteria<Agent> agentCriteria;
+ if (criteriaContext != null) {
+ agentCriteria = new AgentQueryBaseVisitor<EntityCriteria<Agent>>() {
+
+ @Override
+ public EntityCriteria<Agent> visitOperatorCriteria(OperatorCriteriaContext ctx) {
+ if (forExecutor)
+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");
+
+ switch (ctx.operator.getType()) {
+ case AgentQueryLexer.Online:
+ return new OnlineCriteria();
+ case AgentQueryLexer.Offline:
+ return new OfflineCriteria();
+ case AgentQueryLexer.Paused:
+ return new PausedCriteria();
+ case AgentQueryLexer.HasRunningBuilds:
+ return new HasRunningBuildsCriteria();
+ default:
+ throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
+ }
+ }
+
+ @Override
+ public EntityCriteria<Agent> visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
+ if (forExecutor && ctx.HasAttribute() == null)
+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");
+
+ String value = getValue(ctx.Quoted().getText());
+ if (ctx.HasAttribute() != null)
+ return new HasAttributeCriteria(value);
+ else if (ctx.NotUsedSince() != null)
+ return new NotUsedSinceCriteria(value);
+ else if (ctx.EverUsedSince() != null)
+ return new EverUsedSinceCriteria(value);
+ else if (ctx.RanBuild() != null)
+ return new RanBuildCriteria(value);
+ else
+ throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());
+ }
+
+ @Override
+ public EntityCriteria<Agent> visitParensCriteria(ParensCriteriaContext ctx) {
+ return (EntityCriteria<Agent>) visit(ctx.criteria()).withParens(true);
+ }
+
+ @Override
+ public EntityCriteria<Agent> visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {
+ String fieldName = getValue(ctx.Quoted(0).getText());
+ String value = getValue(ctx.Quoted(1).getText());
+ int operator = ctx.operator.getType();
+ checkField(fieldName, operator);
+
+ switch (operator) {
+ case AgentQueryLexer.Is:
+ switch (fieldName) {
+ case NAME_NAME:
+ return new NameCriteria(value);
+ case NAME_OS:
+ return new OsCriteria(AgentOs.valueOf(value.toUpperCase()));
+ case NAME_OS_VERSION:
+ return new OsVersionCriteria(value);
+ case NAME_OS_ARCH:
+ return new OsArchCriteria(value);
+ case NAME_IP_ADDRESS:
+ return new IpAddressCriteria(value);
+ case NAME_CPU:
+ return new CpuCriteria(value, operator);
+ case NAME_MEMORY:
+ return new MemoryCriteria(value, operator);
+ default:
+ return new AttributeCriteria(fieldName, value);
+ }
+ case AgentQueryLexer.IsGreaterThan:
+ case AgentQueryLexer.IsLessThan:
+ if (fieldName.equals(NAME_CPU))
+ return new CpuCriteria(value, operator);
+ else
+ return new MemoryCriteria(value, operator);
+ default:
+ throw new IllegalStateException();
+ }
+ }
+
+ @Override
+ public EntityCriteria<Agent> visitOrCriteria(OrCriteriaContext ctx) {
+ List<EntityCriteria<Agent>> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new OrEntityCriteria<Agent>(childCriterias);
+ }
+
+ @Override
+ public EntityCriteria<Agent> visitAndCriteria(AndCriteriaContext ctx) {
+ List<EntityCriteria<Agent>> childCriterias = new ArrayList<>();
+ for (CriteriaContext childCtx: ctx.criteria())
+ childCriterias.add(visit(childCtx));
+ return new AndEntityCriteria<Agent>(childCriterias);
+ }
+
+ @Override
+ public EntityCriteria<Agent> visitNotCriteria(NotCriteriaContext ctx) {
+ return new NotEntityCriteria<Agent>(visit(ctx.criteria()));
+ }
+
+ }.visit(criteriaContext);
+ } else {
+ agentCriteria = null;
+ }
+
+ List<EntitySort> agentSorts = new ArrayList<>();
+ for (OrderContext order: queryContext.order()) {
+ String fieldName = getValue(order.Quoted().getText());
+ if (!ORDER_FIELDS.containsKey(fieldName))
+ throw new ExplicitException("Can not order by field: " + fieldName);
+
+ EntitySort agentSort = new EntitySort();
+ agentSort.setField(fieldName);
+ if (order.direction != null && order.direction.getText().equals("desc"))
+ agentSort.setDirection(Direction.DESCENDING);
+ else
+ agentSort.setDirection(Direction.ASCENDING);
+ agentSorts.add(agentSort);
+ }
+
+ return new AgentQuery(agentCriteria, agentSorts);
+ } else {
+ return new AgentQuery();
+ }
+ }
+
+ private static ExplicitException newOperatorException(String fieldName, int operator) {
+ return new ExplicitException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");
+ }
+
+ public static void checkField(String fieldName, int operator) {
+ Collection<String> attributeNames = OneDev.getInstance(AgentAttributeManager.class).getAttributeNames();
+ if (!QUERY_FIELDS.contains(fieldName) && !attributeNames.contains(fieldName))
+ throw new ExplicitException("Attribute not found: " + fieldName);
+ switch (operator) {
+ case AgentQueryLexer.IsGreaterThan:
+ case AgentQueryLexer.IsLessThan:
+ if (!fieldName.equals(NAME_CPU)
+ && !fieldName.equals(NAME_MEMORY)) {
+ throw newOperatorException(fieldName, operator);
+ }
+ break;
+ }
+ }
+
+ public static String getRuleName(int rule) {
+ return AntlrUtils.getLexerRuleName(AgentQueryLexer.ruleNames, rule);
+ }
+
+ public static int getOperator(String operatorName) {
+ return AntlrUtils.getLexerRule(AgentQueryLexer.ruleNames, operatorName);
+ }
+
+ @Override
+ public EntityCriteria<Agent> getCriteria() {
+ return criteria;
+ }
+
+ @Override
+ public List<EntitySort> getSorts() {
+ return sorts;
+ }
+
+ public static AgentQuery merge(AgentQuery query1, AgentQuery query2) {
+ List<EntityCriteria<Agent>> criterias = new ArrayList<>();
+ if (query1.getCriteria() != null)
+ criterias.add(query1.getCriteria());
+ if (query2.getCriteria() != null)
+ criterias.add(query2.getCriteria());
+ List<EntitySort> sorts = new ArrayList<>();
+ sorts.addAll(query1.getSorts());
+ sorts.addAll(query2.getSorts());
+ return new AgentQuery(EntityCriteria.andCriterias(criterias), sorts);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQueryAware.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQueryAware.java
new file mode 100644
index 0000000000..6c2702d113
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQueryAware.java
@@ -0,0 +1,7 @@
+package io.onedev.server.search.entity.agent;
+
+public interface AgentQueryAware {
+
+ String getAgentQuery();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
new file mode 100644
index 0000000000..4fb673da9a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AttributeCriteria.java
@@ -0,0 +1,48 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.BuildParam;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class AttributeCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String value;
+
+ public AttributeCriteria(String name, String value) {
+ this.name = name;
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Join<?, ?> join = root.join(Build.PROP_PARAMS, JoinType.LEFT);
+ join.on(builder.and(
+ builder.equal(join.get(BuildParam.PROP_NAME), name)),
+ builder.equal(join.get(BuildParam.PROP_VALUE), value));
+ return join.isNotNull();
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return value.equals(agent.getAttributeMap().get(name));
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(name) + " "
+ + AgentQuery.getRuleName(AgentQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java
new file mode 100644
index 0000000000..84982fe921
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/CpuCriteria.java
@@ -0,0 +1,53 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+
+public class CpuCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private int value;
+
+ private int operator;
+
+ public CpuCriteria(String value, int operator) {
+ this.value = EntityQuery.getIntValue(value);
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<Integer> attribute = root.get(Agent.PROP_CPU);
+ if (operator == AgentQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else if (operator == AgentQueryLexer.IsLessThan)
+ return builder.lessThan(attribute, value);
+ else
+ return builder.equal(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ if (operator == AgentQueryLexer.IsGreaterThan)
+ return agent.getCpu() > value;
+ else if (operator == AgentQueryLexer.IsLessThan)
+ return agent.getCpu() < value;
+ else
+ return agent.getCpu() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_CPU) + " "
+ + AgentQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
new file mode 100644
index 0000000000..df197e820f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
@@ -0,0 +1,41 @@
+package io.onedev.server.search.entity.agent;
+
+import java.util.Date;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+
+public class EverUsedSinceCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Date date;
+
+ private final String value;
+
+ public EverUsedSinceCriteria(String value) {
+ date = EntityQuery.getDateValue(value);
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ return builder.greaterThan(root.get(Agent.PROP_LAST_USED_DATE), date);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return agent.getLastUsedDate() != null || agent.getLastUsedDate().after(date);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.EverUsedSince) + " " + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
new file mode 100644
index 0000000000..49880291e2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasAttributeCriteria.java
@@ -0,0 +1,41 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class HasAttributeCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String attributeName;
+
+ public HasAttributeCriteria(String attributeName) {
+ this.attributeName = attributeName;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Join<?, ?> join = root.join(Agent.PROP_ATTRIBUTES, JoinType.LEFT);
+ join.on(builder.equal(join.get(AgentAttribute.PROP_NAME), attributeName));
+ return join.isNotNull();
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return agent.getAttributeMap().containsKey(attributeName);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.HasAttribute) + " " + quote(attributeName);
+ }
+
+}
+
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
new file mode 100644
index 0000000000..04a13984a1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/HasRunningBuildsCriteria.java
@@ -0,0 +1,37 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Build;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class HasRunningBuildsCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Join<?, ?> join = root.join(Agent.PROP_BUILDS, JoinType.LEFT);
+ join.on(builder.equal(join.get(Build.PROP_STATUS), Build.Status.RUNNING));
+ return join.isNotNull();
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return !OneDev.getInstance(BuildManager.class).query(agent, Build.Status.RUNNING).isEmpty();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.HasRunningBuilds);
+ }
+
+}
+
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
new file mode 100644
index 0000000000..159f7cb9c2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/IpAddressCriteria.java
@@ -0,0 +1,42 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.util.match.WildcardUtils;
+
+public class IpAddressCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private String value;
+
+ public IpAddressCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<String> attribute = root.get(Agent.PROP_IP_ADDRESS);
+ String normalized = value.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ String name = agent.getName();
+ return name != null && WildcardUtils.matchString(value.toLowerCase(), name.toLowerCase());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_IP_ADDRESS) + " "
+ + AgentQuery.getRuleName(AgentQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/MemoryCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/MemoryCriteria.java
new file mode 100644
index 0000000000..d653cb8f12
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/MemoryCriteria.java
@@ -0,0 +1,53 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+
+public class MemoryCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private int value;
+
+ private int operator;
+
+ public MemoryCriteria(String value, int operator) {
+ this.value = EntityQuery.getIntValue(value);
+ this.operator = operator;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<Integer> attribute = root.get(Agent.PROP_MEMORY);
+ if (operator == AgentQueryLexer.IsGreaterThan)
+ return builder.greaterThan(attribute, value);
+ else if (operator == AgentQueryLexer.IsLessThan)
+ return builder.lessThan(attribute, value);
+ else
+ return builder.equal(attribute, value);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ if (operator == AgentQueryLexer.IsGreaterThan)
+ return agent.getMemory() > value;
+ else if (operator == AgentQueryLexer.IsLessThan)
+ return agent.getMemory() < value;
+ else
+ return agent.getMemory() < value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_MEMORY) + " "
+ + AgentQuery.getRuleName(operator) + " "
+ + quote(String.valueOf(value));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
new file mode 100644
index 0000000000..da67a40360
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NameCriteria.java
@@ -0,0 +1,42 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.util.match.WildcardUtils;
+
+public class NameCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private String value;
+
+ public NameCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<String> attribute = root.get(Agent.PROP_NAME);
+ String normalized = value.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ String name = agent.getName();
+ return name != null && WildcardUtils.matchString(value.toLowerCase(), name.toLowerCase());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_NAME) + " "
+ + AgentQuery.getRuleName(AgentQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
new file mode 100644
index 0000000000..ab25fc3d5c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
@@ -0,0 +1,41 @@
+package io.onedev.server.search.entity.agent;
+
+import java.util.Date;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+
+public class NotUsedSinceCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Date date;
+
+ private final String value;
+
+ public NotUsedSinceCriteria(String value) {
+ date = EntityQuery.getDateValue(value);
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ return builder.lessThan(root.get(Agent.PROP_LAST_USED_DATE), date);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return agent.getLastUsedDate() == null || agent.getLastUsedDate().before(date);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.NotUsedSince) + " " + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
new file mode 100644
index 0000000000..cbe85b0996
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
@@ -0,0 +1,29 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class OfflineCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ return builder.not(new OnlineCriteria().getPredicate(root, builder));
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return !new OnlineCriteria().matches(agent);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.Offline);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
new file mode 100644
index 0000000000..ae2194591f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
@@ -0,0 +1,40 @@
+package io.onedev.server.search.entity.agent;
+
+import java.util.Collection;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class OnlineCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<?> attribute = root.get(Agent.PROP_ID);
+ Collection<Long> agentIds = OneDev.getInstance(AgentManager.class).getOnlineAgentIds();
+ if (!agentIds.isEmpty())
+ return attribute.in(agentIds);
+ else
+ return builder.disjunction();
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return agent.isOnline();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.Online);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
new file mode 100644
index 0000000000..6239ec3a79
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
@@ -0,0 +1,42 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.util.match.WildcardUtils;
+
+public class OsArchCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private String value;
+
+ public OsArchCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<String> attribute = root.get(Agent.PROP_OS_ARCH);
+ String normalized = value.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ String name = agent.getName();
+ return name != null && WildcardUtils.matchString(value.toLowerCase(), name.toLowerCase());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_OS_ARCH) + " "
+ + AgentQuery.getRuleName(AgentQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
new file mode 100644
index 0000000000..9448af79b0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
@@ -0,0 +1,38 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.agent.AgentOs;
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class OsCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private AgentOs value;
+
+ public OsCriteria(AgentOs value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ return builder.equal(root.get(Agent.PROP_OS), value);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return agent.getOs() == value;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_OS) + " "
+ + AgentQuery.getRuleName(AgentQueryLexer.Is) + " "
+ + quote(value.name());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
new file mode 100644
index 0000000000..215bdf989d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsVersionCriteria.java
@@ -0,0 +1,42 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.util.match.WildcardUtils;
+
+public class OsVersionCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private String value;
+
+ public OsVersionCriteria(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Path<String> attribute = root.get(Agent.PROP_OS_VERSION);
+ String normalized = value.toLowerCase().replace("*", "%");
+ return builder.like(builder.lower(attribute), normalized);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ String name = agent.getName();
+ return name != null && WildcardUtils.matchString(value.toLowerCase(), name.toLowerCase());
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return quote(Agent.NAME_OS_VERSION) + " "
+ + AgentQuery.getRuleName(AgentQueryLexer.Is) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
new file mode 100644
index 0000000000..7a65864a58
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/PausedCriteria.java
@@ -0,0 +1,29 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class PausedCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ return builder.equal(root.get(Agent.PROP_PAUSED), true);
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return agent.isPaused();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.Paused);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
new file mode 100644
index 0000000000..993a41c600
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/RanBuildCriteria.java
@@ -0,0 +1,45 @@
+package io.onedev.server.search.entity.agent;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Build;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntityQuery;
+
+public class RanBuildCriteria extends EntityCriteria<Agent> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Build build;
+
+ private final String value;
+
+ public RanBuildCriteria(String value) {
+ build = EntityQuery.getBuild(null, value);
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Agent> root, CriteriaBuilder builder) {
+ Join<?, ?> join = root.join(Agent.PROP_BUILDS, JoinType.LEFT);
+ join.on(builder.equal(join, build));
+ return join.isNotNull();
+ }
+
+ @Override
+ public boolean matches(Agent agent) {
+ return build.getAgent().equals(agent);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return AgentQuery.getRuleName(AgentQueryLexer.RanBuild) + " "
+ + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index c7c9078b0f..cbe40c1c7a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -9,7 +9,7 @@ query
criteria
: operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria
| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria
- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
| criteria WS+ Or WS+ criteria #OrCriteria
@@ -72,6 +72,10 @@ DependsOn
DependenciesOf
: 'dependencies' WS+ 'of'
;
+
+RanOn
+ : 'ran' WS+ 'on'
+ ;
FixedIssue
: 'fixed' WS+ 'issue'
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index 68ffdabd4a..124fbe43da 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -150,6 +150,8 @@ public class BuildQuery extends EntityQuery<Build> {
return new DependsOnCriteria(project, value);
else if (ctx.DependenciesOf() != null)
return new DependenciesOfCriteria(project, value);
+ else if (ctx.RanOn() != null)
+ return new RanOnCriteria(value);
else
throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());
}
@@ -274,7 +276,7 @@ public class BuildQuery extends EntityQuery<Build> {
}
public static void checkField(Project project, String fieldName, int operator) {
- Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getBuildParamNames(null);
+ Collection<String> paramNames = OneDev.getInstance(BuildParamManager.class).getParamNames(null);
if (!QUERY_FIELDS.contains(fieldName) && !paramNames.contains(fieldName))
throw new ExplicitException("Field not found: " + fieldName);
switch (operator) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
new file mode 100644
index 0000000000..dc3544e493
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
@@ -0,0 +1,45 @@
+package io.onedev.server.search.entity.build;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Build;
+import io.onedev.server.search.entity.EntityCriteria;
+
+public class RanOnCriteria extends EntityCriteria<Build> {
+
+ private static final long serialVersionUID = 1L;
+
+ private final String value;
+
+ public RanOnCriteria(String value) {
+ if (OneDev.getInstance(AgentManager.class).findByName(value) == null)
+ throw new ExplicitException("No agent with name '" + value + "'");
+ this.value = value;
+ }
+
+ @Override
+ public Predicate getPredicate(Root<Build> root, CriteriaBuilder builder) {
+ Join<?, ?> join = root.join(Build.PROP_AGENT, JoinType.INNER);
+ join.on(builder.equal(join.get(Agent.PROP_NAME), value));
+ return join.isNotNull();
+ }
+
+ @Override
+ public boolean matches(Build build) {
+ return build.getAgent() != null && build.getAgent().getName().equals(value);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return BuildQuery.getRuleName(BuildQueryLexer.RanOn) + " " + quote(value);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java
rename to server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.java
index ea668973d3..dbef437ec9 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/DefaultLogManager.java
@@ -1,4 +1,4 @@
-package io.onedev.server.buildspec.job.log;
+package io.onedev.server.tasklog;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -36,7 +36,10 @@ import com.google.common.base.Splitter;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.log.JobLogEntry;
+import io.onedev.server.buildspec.job.log.JobLogEntryEx;
import io.onedev.server.buildspec.job.log.instruction.LogInstruction;
import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.InstructionContext;
import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.ParamContext;
@@ -46,7 +49,6 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.support.inputspec.SecretInput;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.websocket.WebSocketManager;
@Singleton
@@ -86,13 +88,15 @@ public class DefaultLogManager implements LogManager {
}
@Override
- public SimpleLogger getLogger(Build build, Collection<String> jobSecretsToMask) {
+ public TaskLogger getLogger(Build build, Collection<String> jobSecretsToMask) {
Long projectId = build.getProject().getId();
Long buildId = build.getId();
Long buildNumber = build.getNumber();
Collection<String> secretValuesToMask = build.getSecretValuesToMask();
secretValuesToMask.addAll(jobSecretsToMask);
- return new SimpleLogger() {
+ return new TaskLogger() {
+
+ private final Map<String, StyleBuilder> styleBuilders = new ConcurrentHashMap<>();
private void doLog(String message, StyleBuilder styleBuilder) {
for (String maskSecret: secretValuesToMask)
@@ -139,8 +143,18 @@ public class DefaultLogManager implements LogManager {
}
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
try {
+ StyleBuilder styleBuilder;
+ if (taskId != null) {
+ styleBuilder = styleBuilders.get(taskId);
+ if (styleBuilder == null) {
+ styleBuilder = new StyleBuilder();
+ styleBuilders.put(taskId, styleBuilder);
+ }
+ } else {
+ styleBuilder = new StyleBuilder();
+ }
if (message.startsWith(LogInstruction.PREFIX)) {
doLog(message, styleBuilder);
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java b/server-core/src/main/java/io/onedev/server/tasklog/LogManager.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java
rename to server-core/src/main/java/io/onedev/server/tasklog/LogManager.java
index 6d29444120..8f5b0265e2 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/LogManager.java
@@ -1,16 +1,17 @@
-package io.onedev.server.buildspec.job.log;
+package io.onedev.server.tasklog;
import java.io.InputStream;
import java.util.Collection;
import java.util.List;
import java.util.regex.Pattern;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.buildspec.job.log.JobLogEntryEx;
import io.onedev.server.model.Build;
-import io.onedev.server.util.SimpleLogger;
public interface LogManager {
- SimpleLogger getLogger(Build build, Collection<String> jobSecrets);
+ TaskLogger getLogger(Build build, Collection<String> jobSecrets);
/**
* Read specified number of log entries from specified build, starting from specified index
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogSnippet.java b/server-core/src/main/java/io/onedev/server/tasklog/LogSnippet.java
similarity index 70%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/log/LogSnippet.java
rename to server-core/src/main/java/io/onedev/server/tasklog/LogSnippet.java
index 535558880f..f7b3f01110 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogSnippet.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/LogSnippet.java
@@ -1,8 +1,10 @@
-package io.onedev.server.buildspec.job.log;
+package io.onedev.server.tasklog;
import java.util.LinkedList;
import java.util.List;
+import io.onedev.server.buildspec.job.log.JobLogEntryEx;
+
public class LogSnippet {
public List<JobLogEntryEx> entries = new LinkedList<>();
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/Style.java b/server-core/src/main/java/io/onedev/server/tasklog/Style.java
similarity index 97%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/log/Style.java
rename to server-core/src/main/java/io/onedev/server/tasklog/Style.java
index 7e204de940..a8edcac6e5 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/Style.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/Style.java
@@ -1,4 +1,4 @@
-package io.onedev.server.buildspec.job.log;
+package io.onedev.server.tasklog;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/log/StyleBuilder.java b/server-core/src/main/java/io/onedev/server/tasklog/StyleBuilder.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/buildspec/job/log/StyleBuilder.java
rename to server-core/src/main/java/io/onedev/server/tasklog/StyleBuilder.java
index 0afe4ae80f..9da10f152e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/job/log/StyleBuilder.java
+++ b/server-core/src/main/java/io/onedev/server/tasklog/StyleBuilder.java
@@ -1,4 +1,4 @@
-package io.onedev.server.buildspec.job.log;
+package io.onedev.server.tasklog;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
index 4740b3c8fc..bc597a4003 100644
--- a/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/HtmlUtils.java
@@ -10,7 +10,7 @@ import org.jsoup.nodes.Element;
import org.jsoup.nodes.Node;
import org.jsoup.nodes.TextNode;
import org.jsoup.safety.Cleaner;
-import org.jsoup.safety.Whitelist;
+import org.jsoup.safety.Safelist;
import org.unbescape.html.HtmlEscape;
import com.google.common.collect.Lists;
@@ -35,10 +35,10 @@ public class HtmlUtils {
private static final String[] SAFE_ANCHOR_SCHEMES = new String[] { "http", "https", "mailto", };
- private static final Whitelist whiteList;
+ private static final Safelist whiteList;
static {
- whiteList = new Whitelist() {
+ whiteList = new Safelist() {
@Override
protected boolean isSafeAttribute(String tagName, Element el, Attribute attr) {
@@ -88,7 +88,7 @@ public class HtmlUtils {
StringBuffer buffer = new StringBuffer();
matcher.appendReplacement(buffer, "");
if (buffer.length() != 0)
- node.before(new TextNode(buffer.toString(), node.baseUri()));
+ node.before(new TextNode(buffer.toString()));
node.before(replacement);
}
@@ -96,7 +96,7 @@ public class HtmlUtils {
StringBuffer buffer = new StringBuffer();
matcher.appendTail(buffer);
if (buffer.length() != 0)
- node.before(new TextNode(buffer.toString(), node.baseUri()));
+ node.before(new TextNode(buffer.toString()));
node.remove();
}
diff --git a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
index 52e478e6ad..83874f6e46 100644
--- a/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
+++ b/server-core/src/main/java/io/onedev/server/util/JerseyUtils.java
@@ -12,6 +12,7 @@ import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TaskLogger;
public class JerseyUtils {
@@ -31,7 +32,7 @@ public class JerseyUtils {
}
}
- public static JsonNode get(Client client, String apiEndpoint, SimpleLogger logger) {
+ public static JsonNode get(Client client, String apiEndpoint, TaskLogger logger) {
WebTarget target = client.target(apiEndpoint);
Invocation.Builder builder = target.request();
try (Response response = builder.get()) {
diff --git a/server-core/src/main/java/io/onedev/server/util/ObjectReference.java b/server-core/src/main/java/io/onedev/server/util/ObjectReference.java
index 07888bbc3d..b1a0b86423 100644
--- a/server-core/src/main/java/io/onedev/server/util/ObjectReference.java
+++ b/server-core/src/main/java/io/onedev/server/util/ObjectReference.java
@@ -30,7 +30,7 @@ public abstract class ObjectReference<T> implements Closeable {
public synchronized T get() {
if (object == null)
- throw new RuntimeException("Objerct not initialized yet");
+ throw new RuntimeException("Object not initialized yet");
else
return object;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java b/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java
deleted file mode 100644
index 5de1b969d8..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/SimpleLogger.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package io.onedev.server.util;
-
-import java.util.regex.Pattern;
-
-import com.google.common.base.Splitter;
-import com.google.common.base.Throwables;
-
-import io.onedev.k8shelper.KubernetesHelper;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
-
-public abstract class SimpleLogger {
-
- private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
-
- public void log(String message, Throwable t) {
- StringBuilder builder = new StringBuilder(message);
- for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(t))) {
- if (builder.length() == 0)
- builder.append(line);
- else
- builder.append("\n ").append(line);
- }
- log(builder.toString());
- }
-
- public abstract void log(String message, StyleBuilder styleBuilder);
-
- public void log(String message) {
- log(message, new StyleBuilder());
- }
-
- public void error(String message, Throwable t) {
- log(KubernetesHelper.wrapWithAnsiError(message), t);
- }
-
- public void error(String message) {
- log(KubernetesHelper.wrapWithAnsiError(message));
- }
-
- public void warning(String message, Throwable t) {
- log(KubernetesHelper.wrapWithAnsiWarning(message), t);
- }
-
- public void warning(String message) {
- log(KubernetesHelper.wrapWithAnsiWarning(message));
- }
-
- public void emphasize(String message, Throwable t) {
- log(KubernetesHelper.wrapWithAnsiEmphasize(message), t);
- }
-
- public void emphasize(String message) {
- log(KubernetesHelper.wrapWithAnsiEmphasize(message));
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/CapacityRunner.java b/server-core/src/main/java/io/onedev/server/util/concurrent/CapacityRunner.java
deleted file mode 100644
index 25dbc6ca86..0000000000
--- a/server-core/src/main/java/io/onedev/server/util/concurrent/CapacityRunner.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package io.onedev.server.util.concurrent;
-
-import java.util.concurrent.Callable;
-
-import io.onedev.commons.utils.ExceptionUtils;
-
-public class CapacityRunner {
-
- private final int capacity;
-
- private int active;
-
- public CapacityRunner(int capacity) {
- this.capacity = capacity;
- }
-
- public <T> T call(Callable<T> callable) {
- synchronized (this) {
- while (active >= capacity) {
- try {
- wait();
- } catch (InterruptedException e) {
- }
- }
- active++;
- }
-
- try {
- return callable.call();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- } finally {
- synchronized (this) {
- active--;
- notify();
- }
- }
- }
-
- public void run(Runnable runnable) {
- call(new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- runnable.run();
- return null;
- }
-
- });
- }
-
-}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java
rename to server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.java
index 8b38572c3e..4c221df244 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneDeserializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeyDeserializer.java
@@ -12,9 +12,9 @@ import io.onedev.server.model.AbstractEntity;
import io.onedev.server.persistence.dao.Dao;
@SuppressWarnings("serial")
-public final class ManyToOneDeserializer extends StdDeserializer<AbstractEntity> {
+public final class ForeignKeyDeserializer extends StdDeserializer<AbstractEntity> {
- public ManyToOneDeserializer(Class<?> entityClass) {
+ public ForeignKeyDeserializer(Class<?> entityClass) {
super(entityClass);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeySerializer.java
similarity index 84%
rename from server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java
rename to server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeySerializer.java
index 2df927c448..c6f36089a6 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ManyToOneSerializer.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/ForeignKeySerializer.java
@@ -10,18 +10,17 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer;
import io.onedev.server.model.AbstractEntity;
-public final class ManyToOneSerializer extends StdSerializer<AbstractEntity> {
+public final class ForeignKeySerializer extends StdSerializer<AbstractEntity> {
private static final long serialVersionUID = 1L;
- public ManyToOneSerializer(Class<AbstractEntity> entityClass) {
+ public ForeignKeySerializer(Class<AbstractEntity> entityClass) {
super(entityClass);
}
@Override
public void serializeWithType(AbstractEntity value, JsonGenerator gen, SerializerProvider serializers,
TypeSerializer typeSer) throws IOException {
- // TODO Auto-generated method stub
super.serializeWithType(value, gen, serializers, typeSer);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
index 7ddbb38757..9e42aa20dd 100644
--- a/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
+++ b/server-core/src/main/java/io/onedev/server/util/jackson/hibernate/HibernateAnnotationIntrospector.java
@@ -2,8 +2,10 @@ package io.onedev.server.util.jackson.hibernate;
import java.lang.reflect.Field;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Transient;
import com.fasterxml.jackson.core.Version;
@@ -24,12 +26,13 @@ public class HibernateAnnotationIntrospector extends AnnotationIntrospector {
@Override
public boolean hasIgnoreMarker(AnnotatedMember m) {
- return m.hasAnnotation(Transient.class) || m.hasAnnotation(OneToMany.class);
+ return m.hasAnnotation(Transient.class) || m.hasAnnotation(OneToMany.class)
+ || m.hasAnnotation(OneToOne.class) && !m.hasAnnotation(JoinColumn.class);
}
@Override
public PropertyName findNameForSerialization(Annotated annotation) {
- if (annotation.hasAnnotation(ManyToOne.class))
+ if (annotation.hasAnnotation(ManyToOne.class) || annotation.hasAnnotation(JoinColumn.class))
return new PropertyName(((Field)annotation.getAnnotated()).getName() + "Id");
else
return super.findNameForSerialization(annotation);
@@ -37,7 +40,7 @@ public class HibernateAnnotationIntrospector extends AnnotationIntrospector {
@Override
public PropertyName findNameForDeserialization(Annotated annotation) {
- if (annotation.hasAnnotation(ManyToOne.class))
+ if (annotation.hasAnnotation(ManyToOne.class) || annotation.hasAnnotation(JoinColumn.class))
return new PropertyName(((Field)annotation.getAnnotated()).getName() + "Id");
else
return super.findNameForDeserialization(annotation);
@@ -46,8 +49,8 @@ public class HibernateAnnotationIntrospector extends AnnotationIntrospector {
@SuppressWarnings("unchecked")
@Override
public Object findSerializer(Annotated annotation) {
- if (annotation.hasAnnotation(ManyToOne.class)) {
- return new ManyToOneSerializer((Class<AbstractEntity>) annotation.getRawType());
+ if (annotation.hasAnnotation(ManyToOne.class) || annotation.hasAnnotation(JoinColumn.class)) {
+ return new ForeignKeySerializer((Class<AbstractEntity>) annotation.getRawType());
} else {
return super.findSerializer(annotation);
}
@@ -55,8 +58,8 @@ public class HibernateAnnotationIntrospector extends AnnotationIntrospector {
@Override
public Object findDeserializer(Annotated am) {
- if (am.hasAnnotation(ManyToOne.class)) {
- return new ManyToOneDeserializer(am.getRawType());
+ if (am.hasAnnotation(ManyToOne.class) || am.hasAnnotation(JoinColumn.class)) {
+ return new ForeignKeyDeserializer(am.getRawType());
} else {
return super.findDeserializer(am);
}
diff --git a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java
index 52c5f60c56..40ae101cbd 100644
--- a/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java
+++ b/server-core/src/main/java/io/onedev/server/util/jetty/DefaultJettyLauncher.java
@@ -85,6 +85,7 @@ public class DefaultJettyLauncher implements JettyLauncher, Provider<ServletCont
ErrorPageErrorHandler errorHandler = new ErrorPageErrorHandler();
errorHandler.addErrorPage(HttpServletResponse.SC_NOT_FOUND, "/errors/404");
+ errorHandler.addErrorPage(HttpServletResponse.SC_METHOD_NOT_ALLOWED, "/errors/405");
servletContextHandler.setErrorHandler(errorHandler);
GzipHandler gzipHandler = new GzipHandler();
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/AgentQueryValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/AgentQueryValidator.java
new file mode 100644
index 0000000000..6db668cfd2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/AgentQueryValidator.java
@@ -0,0 +1,45 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.web.editable.annotation.AgentQuery;
+
+public class AgentQueryValidator implements ConstraintValidator<AgentQuery, String> {
+
+ private String message;
+
+ private boolean forExecutor;
+
+ @Override
+ public void initialize(AgentQuery constaintAnnotation) {
+ message = constaintAnnotation.message();
+ forExecutor = constaintAnnotation.forExecutor();
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null) {
+ return true;
+ } else {
+ try {
+ io.onedev.server.search.entity.agent.AgentQuery.parse(value, forExecutor);
+ return true;
+ } catch (Exception e) {
+ constraintContext.disableDefaultConstraintViolation();
+ String message = this.message;
+ if (message.length() == 0) {
+ if (StringUtils.isNotBlank(e.getMessage()))
+ message = e.getMessage();
+ else
+ message = "Malformed agent query";
+ }
+
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ }
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/AttributeNameValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/AttributeNameValidator.java
new file mode 100644
index 0000000000..e62c64ff91
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/AttributeNameValidator.java
@@ -0,0 +1,35 @@
+package io.onedev.server.util.validation;
+
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.util.validation.annotation.AttributeName;
+
+public class AttributeNameValidator implements ConstraintValidator<AttributeName, String> {
+
+ private String message;
+
+ @Override
+ public void initialize(AttributeName constaintAnnotation) {
+ message = constaintAnnotation.message();
+ }
+
+ @Override
+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {
+ if (value == null)
+ return true;
+
+ String message = this.message;
+ if (Agent.ALL_FIELDS.contains(value)) {
+ constraintContext.disableDefaultConstraintViolation();
+ if (message.length() == 0)
+ message = "'" + value + "' is reserved";
+ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();
+ return false;
+ } else {
+ return true;
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
index 68eb83cceb..7ccfa37fcf 100644
--- a/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
+++ b/server-core/src/main/java/io/onedev/server/util/validation/JobMatchValidator.java
@@ -21,7 +21,7 @@ public class JobMatchValidator implements ConstraintValidator<JobMatch, String>
return true;
} else {
try {
- io.onedev.server.util.jobmatch.JobMatch.parse(value);
+ io.onedev.server.job.match.JobMatch.parse(value);
return true;
} catch (Exception e) {
constraintContext.disableDefaultConstraintViolation();
diff --git a/server-core/src/main/java/io/onedev/server/util/validation/annotation/AttributeName.java b/server-core/src/main/java/io/onedev/server/util/validation/annotation/AttributeName.java
new file mode 100644
index 0000000000..af0c46c1f9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/util/validation/annotation/AttributeName.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.AttributeNameValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=AttributeNameValidator.class)
+public @interface AttributeName {
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+}
diff --git a/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java b/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java
index c74a1f69db..bf89fc5eff 100644
--- a/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java
+++ b/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java
@@ -6,8 +6,6 @@ import io.onedev.server.model.support.NamedQuery;
public abstract class QuerySubscriptionSupport<T extends NamedQuery> {
- public abstract LinkedHashSet<String> getUserQuerySubscriptions();
-
public abstract LinkedHashSet<String> getQuerySubscriptions();
}
diff --git a/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java b/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java
index 50bc6f131e..2b5ecd7d85 100644
--- a/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java
+++ b/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java
@@ -7,12 +7,10 @@ import io.onedev.server.model.support.NamedQuery;
public abstract class QueryWatchSupport<T extends NamedQuery> {
- public abstract LinkedHashMap<String, Boolean> getUserQueryWatches();
-
public abstract LinkedHashMap<String, Boolean> getQueryWatches();
- private WatchStatus getWatchStatus(Map<String, Boolean> watches, String name) {
- Boolean watching = watches.get(name);
+ private WatchStatus getWatchStatus(Map<String, Boolean> watches, String queryName) {
+ Boolean watching = watches.get(queryName);
if (Boolean.TRUE.equals(watching))
return WatchStatus.WATCH;
else if (Boolean.FALSE.equals(watching))
@@ -21,27 +19,19 @@ public abstract class QueryWatchSupport<T extends NamedQuery> {
return WatchStatus.DEFAULT;
}
- private void setWatchStatus(Map<String, Boolean> watches, String name, WatchStatus watchStatus) {
+ private void setWatchStatus(Map<String, Boolean> watches, String queryName, WatchStatus watchStatus) {
if (watchStatus != WatchStatus.DEFAULT)
- watches.put(name, watchStatus == WatchStatus.WATCH);
+ watches.put(queryName, watchStatus == WatchStatus.WATCH);
else
- watches.remove(name);
- }
-
- public WatchStatus getWatchStatus(T namedQuery) {
- return getWatchStatus(getQueryWatches(), namedQuery.getName());
+ watches.remove(queryName);
}
- public WatchStatus getUserWatchStatus(T namedQuery) {
- return getWatchStatus(getUserQueryWatches(), namedQuery.getName());
- }
-
- public void setWatchStatus(T namedQuery, WatchStatus watchStatus) {
- setWatchStatus(getQueryWatches(), namedQuery.getName(), watchStatus);
+ public WatchStatus getWatchStatus(String queryName) {
+ return getWatchStatus(getQueryWatches(), queryName);
}
- public void setUserWatchStatus(T namedQuery, WatchStatus watchStatus) {
- setWatchStatus(getUserQueryWatches(), namedQuery.getName(), watchStatus);
+ public void setWatchStatus(String queryName, WatchStatus watchStatus) {
+ setWatchStatus(getQueryWatches(), queryName, watchStatus);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java
index 5a3d5c2716..9f484d9233 100644
--- a/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java
+++ b/server-core/src/main/java/io/onedev/server/util/xstream/ReflectionConverter.java
@@ -2,6 +2,7 @@ package io.onedev.server.util.xstream;
import java.lang.reflect.Field;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import com.thoughtworks.xstream.converters.MarshallingContext;
@@ -26,7 +27,7 @@ public class ReflectionConverter extends com.thoughtworks.xstream.converters.ref
@Override
protected void marshallField(MarshallingContext context, Object newObj, Field field) {
- if (field.getAnnotation(ManyToOne.class) != null)
+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null)
super.marshallField(context, ((AbstractEntity) newObj).getId(), field);
else
super.marshallField(context, newObj, field);
@@ -35,7 +36,7 @@ public class ReflectionConverter extends com.thoughtworks.xstream.converters.ref
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected Object unmarshallField(UnmarshallingContext context, Object result, Class type, Field field) {
- if (field.getAnnotation(ManyToOne.class) != null) {
+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {
Long entityId = (Long) context.convertAnother(context.currentObject(), Long.class);
return AppLoader.getInstance(Dao.class).load((Class<? extends AbstractEntity>) field.getType(), entityId);
} else {
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 e42c086d57..ec4c99dbfa 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
@@ -12,6 +12,12 @@ import io.onedev.server.web.mapper.BaseResourceMapper;
import io.onedev.server.web.mapper.DynamicPathPageMapper;
import io.onedev.server.web.mapper.DynamicPathResourceMapper;
import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentBuildsPage;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentLogPage;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentOverviewPage;
+import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
+import io.onedev.server.web.page.admin.buildsetting.serverresource.ServerResourcesSettingPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
import io.onedev.server.web.page.admin.generalsecuritysetting.GeneralSecuritySettingPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
@@ -25,7 +31,6 @@ import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
-import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;
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;
@@ -110,12 +115,16 @@ import io.onedev.server.web.page.project.stats.ProjectContribsPage;
import io.onedev.server.web.page.project.stats.SourceLinesPage;
import io.onedev.server.web.page.project.tags.ProjectTagsPage;
import io.onedev.server.web.page.pullrequests.PullRequestListPage;
+import io.onedev.server.web.page.simple.error.MethodNotAllowedErrorPage;
import io.onedev.server.web.page.simple.error.PageNotFoundErrorPage;
import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.page.simple.security.LogoutPage;
import io.onedev.server.web.page.simple.security.PasswordResetPage;
import io.onedev.server.web.page.simple.security.SignUpPage;
import io.onedev.server.web.page.simple.serverinit.ServerInitPage;
+import io.onedev.server.web.resource.AgentLibResourceReference;
+import io.onedev.server.web.resource.AgentLogResourceReference;
+import io.onedev.server.web.resource.AgentResourceReference;
import io.onedev.server.web.resource.ArchiveResourceReference;
import io.onedev.server.web.resource.ArtifactResourceReference;
import io.onedev.server.web.resource.AttachmentResourceReference;
@@ -164,6 +173,10 @@ public class OneUrlMapper extends CompoundRequestMapper {
private void addResources() {
add(new BaseResourceMapper("downloads/server-log", new ServerLogResourceReference()));
+ add(new BaseResourceMapper("downloads/agent-log/${agent}", new AgentLogResourceReference()));
+ add(new BaseResourceMapper("downloads/agent.zip", new AgentResourceReference()));
+ add(new BaseResourceMapper("downloads/agent.tar.gz", new AgentResourceReference()));
+ add(new BaseResourceMapper("downloads/agent-lib", new AgentLibResourceReference()));
add(new BaseResourceMapper("downloads/projects/${project}/builds/${build}/log",
new BuildLogResourceReference()));
add(new BaseResourceMapper("projects/${project}/archive/${revision}",
@@ -183,6 +196,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
private void addErrorPages() {
add(new DynamicPathPageMapper("/errors/404", PageNotFoundErrorPage.class));
+ add(new DynamicPathPageMapper("/errors/405", MethodNotAllowedErrorPage.class));
}
private void addSecurityPages() {
@@ -229,6 +243,10 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/settings/sso-connectors", SsoConnectorListPage.class));
add(new DynamicPathPageMapper("administration/settings/ssh", SshSettingPage.class));
+ add(new DynamicPathPageMapper("administration/settings/agents", AgentListPage.class));
+ add(new DynamicPathPageMapper("administration/settings/agents/${agent}/overview", AgentOverviewPage.class));
+ add(new DynamicPathPageMapper("administration/settings/agents/${agent}/builds", AgentBuildsPage.class));
+ add(new DynamicPathPageMapper("administration/settings/agents/${agent}/log", AgentLogPage.class));
add(new DynamicPathPageMapper("administration/settings/job-executors", JobExecutorsPage.class));
add(new DynamicPathPageMapper("administration/settings/groovy-scripts", GroovyScriptListPage.class));
@@ -237,6 +255,7 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new DynamicPathPageMapper("administration/settings/state-transitions", StateTransitionListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));
add(new DynamicPathPageMapper("administration/settings/issue-templates", IssueTemplateListPage.class));
+ add(new DynamicPathPageMapper("administration/settings/build", ServerResourcesSettingPage.class));
add(new DynamicPathPageMapper("administration/settings/${setting}", ContributedAdministrationSettingPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/ellipsis-circle.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/ellipsis-circle.svg
new file mode 100644
index 0000000000..55014da09b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/ellipsis-circle.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1629464015414" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7592" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 888c207.66 0 376-168.34 376-376S719.66 136 512 136 136 304.34 136 512s168.34 376 376 376z m0 72C264.576 960 64 759.424 64 512S264.576 64 512 64s448 200.576 448 448-200.576 448-448 448zM304 576c-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64 35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64z m208 0c-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64 35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64z m208 0c-35.346 0-64-28.654-64-64 0-35.346 28.654-64 64-64 35.346 0 64 28.654 64 64 0 35.346-28.654 64-64 64z" p-id="7593"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/linux.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/linux.svg
new file mode 100644
index 0000000000..823e7d4192
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/linux.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1629430789950" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3501" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M833.828 772.167c-14.708-27.427-28.724-65.173-32.06-95.097-7.064-63.345 7.001-95.581-26.311-157.655-20.001-37.27-47.167-69.818-69.762-105.374-57.008-89.708-35.862-181.666-78.106-273.828-14.677-32.021-39.272-58.288-73.372-69.27-40.023-12.889-88.039-6.905-123.821 15.09-97.955 60.213-26.601 240.65-82.234 332.558-34.997 57.817-72.677 108.993-92.906 175.374-15.962 52.376-11.905 116.451-74.135 139.232-16.782 6.143-41.737 5.268-50.966 23.624-5.79 11.518-1.802 24.689 0.951 36.449 2.356 10.066 3.024 19.861 1.87 30.14-1.651 14.71-7.417 28.869-8.274 43.641-0.878 15.142 8.565 24.551 21.704 30.534 47.398 21.585 113.582 34.279 164.669 43.764 66.028 12.258 59.608-7.377 115.821-23.029 39.692-11.052 88.466-13.955 129.206-6.827 43.073 7.536 72.966 44.046 112.09 48.73 33.22 0 210.129-91.293 212.144-131.077 1.811-35.802-33.736-33.163-46.508-56.979zM561.696 188.612c34.429 24.892-1.788 99.81-14.799 87.114 41.625-32.641-34.982-83.122-29.425-11.704-53.249-11.693-3.247-109.731 44.224-75.41z m-4.039 117.923c1.857 28.37-64.491 48.349-85.296 56.455-79.455-0.65-53.966-82.141 7.617-88.858 11.889-1.296 76.451 13.646 77.679 32.403zM407.938 198.841c42.337-29.134 70.265 43.258 33.357 66.249 16.796-88.043-79.787-11.981-12.48 11.418-26.974 29.286-46.681-59.91-20.877-77.667z m-57.874 731.028c-38.514-10.84-181.601-28.379-200.949-63.937-0.276-0.507-0.351-2.272-0.282-4.883-0.019-0.032-0.042-0.063-0.06-0.095-0.833-1.415-0.113-8.165 1.246-16.547 1.879-19.977 5.394-46.894 6.514-49.347 12.905-28.267 12.771-23.836 21.86-26.291 5.612-3.079 13.887-7.607 27.549-19.429 37.781-32.691 49.648-51.05 71.076-37.382 8.427 2.949 16.297 11.207 25.986 25.067a570.9 570.9 0 0 1 8.53 10.204c16.954 20.727 55.205 71.093 68.786 114.074 13.447 30 13.992 58.501-30.256 68.566z m290.721-232.992c-16.92 43.195-1.196 82.899-35.488 120.646-58.579 64.48-168.292 61.287-220.377 1.598 61.991-24.918-79.397-135.334-84.198-181.037-10.461-99.563 81.484-201.457 102.457-296.773 77.359 82.013 125.198-33.75 189.934 21.718 50.436 43.215 102.409 212.603 87.712 277.829-8.345 37.034-32.364 36.425-40.04 56.019z m103.371 199.109c-159.991 95.734-70.13-147.276-65.785-178.44 11.336 103.265 74.062 18.695 110.579 7.453-17.789 5.477 57.616 96.436 56.788 86.041 3.123 39.223-63.176 61.965-101.582 84.946z" p-id="3502"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/macosx.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/macosx.svg
new file mode 100644
index 0000000000..205d58fcba
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/macosx.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1629430739756" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2824" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M849.124134 704.896288c-1.040702 3.157923-17.300015 59.872622-57.250912 118.190843-34.577516 50.305733-70.331835 101.018741-126.801964 101.909018-55.532781 0.976234-73.303516-33.134655-136.707568-33.134655-63.323211 0-83.23061 32.244378-135.712915 34.110889-54.254671 2.220574-96.003518-54.951543-130.712017-105.011682-70.934562-102.549607-125.552507-290.600541-52.30118-416.625816 36.040844-63.055105 100.821243-103.135962 171.364903-104.230899 53.160757-1.004887 103.739712 36.012192 136.028093 36.012192 33.171494 0 94.357018-44.791136 158.90615-38.089503 27.02654 1.151219 102.622262 11.298324 151.328567 81.891102-3.832282 2.607384-90.452081 53.724599-89.487104 157.76107C739.079832 663.275355 847.952448 704.467523 849.124134 704.896288M633.69669 230.749408c29.107945-35.506678 48.235584-84.314291 43.202964-132.785236-41.560558 1.630127-92.196819 27.600615-122.291231 62.896492-26.609031 30.794353-50.062186 80.362282-43.521213 128.270409C557.264926 291.935955 604.745311 264.949324 633.69669 230.749408" p-id="2825"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/windows.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/windows.svg
new file mode 100644
index 0000000000..c8a474a6c1
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/windows.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1629430730729" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1948" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M128 512V288l256-56.32v276.48L128 512m725.333333-384v373.333333l-426.666666 6.4V222.293333L853.333333 128M128 554.666667l256 3.84v290.56l-256-49.066667V554.666667m725.333333 10.666666V938.666667l-426.666666-81.493334V558.933333l426.666666 6.4z" fill="" p-id="1949"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
new file mode 100644
index 0000000000..75c01a679b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
@@ -0,0 +1,159 @@
+package io.onedev.server.web.behavior;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+
+import io.onedev.agent.AgentOs;
+import io.onedev.commons.codeassist.FenceAware;
+import io.onedev.commons.codeassist.InputSuggestion;
+import io.onedev.commons.codeassist.grammar.LexerRuleRefElementSpec;
+import io.onedev.commons.codeassist.parser.Element;
+import io.onedev.commons.codeassist.parser.ParseExpect;
+import io.onedev.commons.codeassist.parser.TerminalExpect;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.agent.AgentQuery;
+import io.onedev.server.search.entity.agent.AgentQueryLexer;
+import io.onedev.server.search.entity.agent.AgentQueryParser;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
+import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
+import io.onedev.server.web.util.SuggestionUtils;
+
+@SuppressWarnings("serial")
+public class AgentQueryBehavior extends ANTLRAssistBehavior {
+
+ private final boolean forExecutor;
+
+ public AgentQueryBehavior(boolean forExecutor) {
+ super(AgentQueryParser.class, "query", false);
+ this.forExecutor = forExecutor;
+ }
+
+ @Override
+ protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if (spec.getRuleName().equals("Quoted")) {
+ return new FenceAware(codeAssist.getGrammar(), '"', '"') {
+
+ @Override
+ protected List<InputSuggestion> match(String matchWith) {
+ AgentAttributeManager attributeManager = OneDev.getInstance(AgentAttributeManager.class);
+ if ("criteriaField".equals(spec.getLabel())) {
+ List<String> fields = new ArrayList<>(Agent.QUERY_FIELDS);
+ List<String> attributeNames = attributeManager.getAttributeNames();
+ fields.addAll(attributeNames);
+ return SuggestionUtils.suggest(fields, matchWith);
+ } else if ("orderField".equals(spec.getLabel())) {
+ List<String> candidates = new ArrayList<>(Agent.ORDER_FIELDS.keySet());
+ return SuggestionUtils.suggest(candidates, matchWith);
+ } else if ("criteriaValue".equals(spec.getLabel())) {
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);
+ Preconditions.checkState(operatorElements.size() == 1);
+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());
+ int operator = AgentQuery.getOperator(operatorName);
+ if (fieldElements.isEmpty()) {
+ if (operator == AgentQueryLexer.EverUsedSince || operator == AgentQueryLexer.NotUsedSince) {
+ return SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
+ } else if (operator == AgentQueryLexer.HasAttribute) {
+ return SuggestionUtils.suggest(attributeManager.getAttributeNames(), matchWith);
+ } else if (operator == AgentQueryLexer.RanBuild) {
+ return SuggestionUtils.suggestBuilds(null, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ }
+ } else {
+ String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());
+ try {
+ AgentQuery.checkField(fieldName, operator);
+ if (fieldName.equals(Agent.NAME_OS)) {
+ List<String> osNames = new ArrayList<>();
+ for (AgentOs each: AgentOs.values())
+ osNames.add(each.name());
+ return SuggestionUtils.suggest(osNames, matchWith);
+ } else if (fieldName.equals(Agent.NAME_NAME)) {
+ return SuggestionUtils.suggestAgents(matchWith);
+ } else if (fieldName.equals(Agent.NAME_OS_ARCH)) {
+ return SuggestionUtils.suggest(OneDev.getInstance(AgentManager.class).getOsArchs(), matchWith);
+ } else {
+ return null;
+ }
+ } catch (ExplicitException ex) {
+ }
+ }
+ }
+ return new ArrayList<>();
+ }
+
+ @Override
+ protected String getFencingDescription() {
+ return "quote as literal value";
+ }
+
+ }.suggest(terminalExpect);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
+ if (forExecutor) {
+ if (suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.OrderBy))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.Online))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.Offline))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.EverUsedSince))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.HasRunningBuilds))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.SelectedByExecutor))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.NotUsedSince))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.Paused))
+ || suggestedLiteral.equals(AgentQuery.getRuleName(AgentQueryLexer.RanBuild))) {
+ return null;
+ }
+ }
+
+ parseExpect = parseExpect.findExpectByLabel("operator");
+ if (parseExpect != null) {
+ List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = AgentQuery.getValue(fieldElements.iterator().next().getMatchedText());
+ try {
+ AgentQuery.checkField(fieldName, AgentQuery.getOperator(suggestedLiteral));
+ } catch (ExplicitException e) {
+ return null;
+ }
+ }
+ }
+ return super.describe(parseExpect, suggestedLiteral);
+ }
+
+ @Override
+ protected List<String> getHints(TerminalExpect terminalExpect) {
+ List<String> hints = new ArrayList<>();
+ if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
+ if ("criteriaValue".equals(spec.getLabel()) && AgentQuery.isInsideQuote(terminalExpect.getUnmatchedText())) {
+ List<Element> fieldElements = terminalExpect.getState().findMatchedElementsByLabel("criteriaField", true);
+ if (!fieldElements.isEmpty()) {
+ String fieldName = AgentQuery.getValue(fieldElements.get(0).getMatchedText());
+ if (fieldName.equals(Agent.NAME_NAME)
+ || fieldName.equals(Agent.NAME_OS_ARCH)
+ || fieldName.equals(Agent.NAME_OS_VERSION)
+ || fieldName.equals(Agent.NAME_IP_ADDRESS)) {
+ hints.add("Use '*' for wildcard match");
+ }
+ }
+ }
+ }
+ return hints;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
index 11f3f838b7..624744c90c 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
@@ -67,7 +67,7 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {
if ("criteriaField".equals(spec.getLabel())) {
List<String> fields = new ArrayList<>(Build.METRIC_QUERY_FIELDS);
BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);
- List<String> paramNames = new ArrayList<>(buildParamManager.getBuildParamNames(project));
+ List<String> paramNames = new ArrayList<>(buildParamManager.getParamNames(project));
Collections.sort(paramNames);
fields.addAll(paramNames);
return SuggestionUtils.suggest(fields, matchWith);
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index c998343389..439c200c39 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -78,7 +78,7 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
if (getProject() != null)
fields.remove(Build.NAME_PROJECT);
BuildParamManager buildParamManager = OneDev.getInstance(BuildParamManager.class);
- List<String> paramNames = new ArrayList<>(buildParamManager.getBuildParamNames(project));
+ List<String> paramNames = new ArrayList<>(buildParamManager.getParamNames(project));
Collections.sort(paramNames);
fields.addAll(paramNames);
return SuggestionUtils.suggest(fields, matchWith);
@@ -100,6 +100,8 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
else if (operator == BuildQueryLexer.FixedIssue)
return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
+ else if (operator == BuildQueryLexer.RanOn)
+ return SuggestionUtils.suggestAgents(matchWith);
else
return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
} else {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
index 526d051545..039798f865 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
@@ -17,10 +17,10 @@ import io.onedev.commons.codeassist.parser.Element;
import io.onedev.commons.codeassist.parser.ParseExpect;
import io.onedev.commons.codeassist.parser.TerminalExpect;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.job.match.JobMatch;
import io.onedev.server.model.Build;
-import io.onedev.server.util.jobmatch.JobMatch;
-import io.onedev.server.util.jobmatch.JobMatchLexer;
-import io.onedev.server.util.jobmatch.JobMatchParser;
+import io.onedev.server.job.match.JobMatchLexer;
+import io.onedev.server.job.match.JobMatchParser;
import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;
import io.onedev.server.web.util.SuggestionUtils;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/AgentStatusBadge.java b/server-core/src/main/java/io/onedev/server/web/component/AgentStatusBadge.java
new file mode 100644
index 0000000000..bfc8c35818
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/AgentStatusBadge.java
@@ -0,0 +1,69 @@
+package io.onedev.server.web.component;
+
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.model.Agent;
+
+@SuppressWarnings("serial")
+public class AgentStatusBadge extends Label {
+
+ private final IModel<Agent> agentModel;
+
+ public AgentStatusBadge(String id, IModel<Agent> agentModel) {
+ super(id);
+ this.agentModel = agentModel;
+ setDefaultModel(new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ String status;
+ if (getAgent().isOnline())
+ status = "Online";
+ else
+ status = "Offline";
+
+ if (getAgent().isPaused())
+ status += "/Paused";
+ return status;
+ }
+
+ });
+ }
+
+ private Agent getAgent() {
+ return agentModel.getObject();
+ }
+
+ @Override
+ protected void onDetach() {
+ agentModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ if (getAgent().isPaused()) {
+ if (getAgent().isOnline())
+ return "badge badge-warning";
+ else
+ return "badge badge-danger";
+ } else {
+ if (getAgent().isOnline())
+ return "badge badge-success";
+ else
+ return "badge badge-danger";
+ }
+ }
+
+ }));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index c4fe6fa762..60590d26bd 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -267,48 +267,33 @@ public abstract class BuildListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete All Queried Builds";
+ return "Delete Selected Builds";
}
@Override
public WebMarkupContainer newLink(String id) {
return new AjaxLink<Void>(id) {
- @SuppressWarnings("unchecked")
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected builds?"));
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- Collection<Build> builds = new ArrayList<>();
- for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {
- builds.add(it.next());
- }
- OneDev.getInstance(BuildManager.class).delete(builds);
- target.add(body);
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Type <code>yes</code> below to delete all queried builds";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
-
+ Collection<Build> builds = new ArrayList<>();
+ for (IModel<Build> each: selectionColumn.getSelections())
+ builds.add(each.getObject());
+ OneDev.getInstance(BuildManager.class).delete(builds);
+ target.add(body);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(buildsTable.getItemCount() != 0);
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
}
@Override
@@ -317,7 +302,7 @@ public abstract class BuildListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No builds to delete");
+ tag.put("title", "Please select builds to delete");
}
}
@@ -330,33 +315,48 @@ public abstract class BuildListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete Selected Builds";
+ return "Delete All Queried Builds";
}
@Override
public WebMarkupContainer newLink(String id) {
return new AjaxLink<Void>(id) {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected builds?"));
- }
-
+ @SuppressWarnings("unchecked")
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- Collection<Build> builds = new ArrayList<>();
- for (IModel<Build> each: selectionColumn.getSelections())
- builds.add(each.getObject());
- OneDev.getInstance(BuildManager.class).delete(builds);
- target.add(body);
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Build> builds = new ArrayList<>();
+ for (Iterator<Build> it = (Iterator<Build>) dataProvider.iterator(0, buildsTable.getItemCount()); it.hasNext();) {
+ builds.add(it.next());
+ }
+ OneDev.getInstance(BuildManager.class).delete(builds);
+ target.add(body);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to delete all queried builds";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ setEnabled(buildsTable.getItemCount() != 0);
}
@Override
@@ -365,7 +365,7 @@ public abstract class BuildListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select builds to delete");
+ tag.put("title", "No builds to delete");
}
}
@@ -415,7 +415,7 @@ public abstract class BuildListPanel extends Panel {
@Override
protected Map<String, String> load() {
Map<String, String> choices = new LinkedHashMap<>();
- for (String fieldName: OneDev.getInstance(BuildParamManager.class).getBuildParamNames(null))
+ for (String fieldName: OneDev.getInstance(BuildParamManager.class).getParamNames(null))
choices.put(fieldName, fieldName);
return choices;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
index 3e5619a27b..780c2a56fc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java
@@ -16,9 +16,9 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.log.JobLogEntryEx;
-import io.onedev.server.buildspec.job.log.LogManager;
-import io.onedev.server.buildspec.job.log.LogSnippet;
import io.onedev.server.model.Build;
+import io.onedev.server.tasklog.LogManager;
+import io.onedev.server.tasklog.LogSnippet;
import io.onedev.server.web.behavior.WebSocketObserver;
@SuppressWarnings("serial")
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
index 336cb6330f..203e1e4d6e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.html
@@ -30,6 +30,14 @@
<a wicket:id="editJob" title="Edit job"><wicket:svg href="edit" class="icon icon-sm ml-1 mb-1"/></a>
</div>
</div>
+ <wicket:enclosure child="agent">
+ <div>
+ <div class="name">Agent</div>
+ <div class="value">
+ <a wicket:id="agent"></a>
+ </div>
+ </div>
+ </wicket:enclosure>
<div>
<div class="name">Submitted By</div>
<div class="value">
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 137cd40bd4..8deef9ea50 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
@@ -18,7 +18,9 @@ import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
@@ -44,6 +46,7 @@ import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.pullrequest.RequestStatusBadge;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
+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;
@@ -71,6 +74,32 @@ public abstract class BuildSidePanel extends Panel {
addOrReplace(new UserIdentPanel("canceller", getBuild().getCanceller(), Mode.NAME));
else
addOrReplace(new WebMarkupContainer("canceller").setVisible(false));
+
+ if (getBuild().getAgent() != null) {
+ if (SecurityUtils.isAdministrator()) {
+ addOrReplace(new BookmarkablePageLink<Void>("agent", AgentOverviewPage.class,
+ AgentOverviewPage.paramsOf(getBuild().getAgent())) {
+
+ @Override
+ public IModel<?> getBody() {
+ return Model.of(getBuild().getAgent().getName());
+ }
+
+ });
+ } else {
+ addOrReplace(new Label("agent", getBuild().getAgent().getName()) {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ });
+ }
+ } else {
+ addOrReplace(new WebMarkupContainer("agent").setVisible(false));
+ }
super.onBeforeRender();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java
index 39a6023b7c..6369eb5c2d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/imports/ImportPanel.java
@@ -15,11 +15,10 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.imports.Importer;
import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.ajaxlistener.ShowGlobalAjaxIndicatorListener;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
@@ -89,10 +88,10 @@ public abstract class ImportPanel<Where extends Serializable, What extends Seria
super.onSubmit(target, form);
if (what == null) {
- what = getImporter().getWhat(where, new SimpleLogger() {
+ what = getImporter().getWhat(where, new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
logger.info(message);
}
@@ -100,10 +99,10 @@ public abstract class ImportPanel<Where extends Serializable, What extends Seria
form.replace(BeanContext.edit("editor", what));
form.get("back").setVisible(true);
} else {
- how = getImporter().getHow(where, what, new SimpleLogger() {
+ how = getImporter().getHow(where, what, new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
logger.info(message);
}
@@ -136,7 +135,7 @@ public abstract class ImportPanel<Where extends Serializable, What extends Seria
}
@Override
- protected String runTask(SimpleLogger logger) {
+ protected String runTask(TaskLogger logger) {
return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {
@Override
@@ -163,7 +162,7 @@ public abstract class ImportPanel<Where extends Serializable, What extends Seria
form.add(new TaskButton("dryRun") {
@Override
- protected String runTask(SimpleLogger logger) {
+ protected String runTask(TaskLogger logger) {
return OneDev.getInstance(TransactionManager.class).call(new Callable<String>() {
@Override
@@ -195,7 +194,7 @@ public abstract class ImportPanel<Where extends Serializable, What extends Seria
@Nullable
protected abstract String doImport(Where where, What what, How how,
- boolean dryRun, SimpleLogger logger);
+ boolean dryRun, TaskLogger logger);
protected abstract void onImportSuccessful(AjaxRequestTarget target);
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index eba7be8afc..5cbed60d55 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -741,9 +741,9 @@ public abstract class IssueListPanel extends Panel {
@Override
public String getLabel() {
- return "Move All Queried Issues To...";
+ return "Move Selected Issues To...";
}
-
+
@Override
public WebMarkupContainer newLink(String id) {
return new DropdownLink(id) {
@@ -759,7 +759,6 @@ public abstract class IssueListPanel extends Panel {
}) {
- @SuppressWarnings("unchecked")
@Override
protected void onSelect(AjaxRequestTarget target, Project project) {
dropdown1.close();
@@ -775,21 +774,20 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
Collection<Issue> issues = new ArrayList<>();
- for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {
- issues.add(it.next());
- }
+ for (IModel<Issue> each: selectionColumn.getSelections())
+ issues.add(each.getObject());
OneDev.getInstance(IssueManager.class).move(project, issues);
target.add(body);
}
@Override
protected String getConfirmMessage() {
- return "Type <code>yes</code> below to move all queried issues to project '" + getTargetProject().getName() + "'";
+ return "Do you really want to move selected issues to project '" + getTargetProject().getName() + "'?";
}
@Override
protected String getConfirmInput() {
- return "yes";
+ return null;
}
};
@@ -801,16 +799,16 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(issuesTable.getItemCount() != 0);
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
}
-
+
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No issues to move");
+ tag.put("title", "Please select issues to move");
}
}
@@ -823,9 +821,9 @@ public abstract class IssueListPanel extends Panel {
@Override
public String getLabel() {
- return "Move Selected Issues To...";
+ return "Move All Queried Issues To...";
}
-
+
@Override
public WebMarkupContainer newLink(String id) {
return new DropdownLink(id) {
@@ -841,6 +839,7 @@ public abstract class IssueListPanel extends Panel {
}) {
+ @SuppressWarnings("unchecked")
@Override
protected void onSelect(AjaxRequestTarget target, Project project) {
dropdown1.close();
@@ -856,20 +855,21 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfirm(AjaxRequestTarget target) {
Collection<Issue> issues = new ArrayList<>();
- for (IModel<Issue> each: selectionColumn.getSelections())
- issues.add(each.getObject());
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {
+ issues.add(it.next());
+ }
OneDev.getInstance(IssueManager.class).move(project, issues);
target.add(body);
}
@Override
protected String getConfirmMessage() {
- return "Do you really want to move selected issues to project '" + getTargetProject().getName() + "'?";
+ return "Type <code>yes</code> below to move all queried issues to project '" + getTargetProject().getName() + "'";
}
@Override
protected String getConfirmInput() {
- return null;
+ return "yes";
}
};
@@ -881,16 +881,16 @@ public abstract class IssueListPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ setEnabled(issuesTable.getItemCount() != 0);
}
-
+
@Override
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select issues to move");
+ tag.put("title", "No issues to move");
}
}
@@ -920,47 +920,33 @@ public abstract class IssueListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete All Queried Issues";
+ return "Delete Selected Issues";
}
@Override
public WebMarkupContainer newLink(String id) {
return new AjaxLink<Void>(id) {
- @SuppressWarnings("unchecked")
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected issues?"));
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- Collection<Issue> issues = new ArrayList<>();
- for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {
- issues.add(it.next());
- }
- OneDev.getInstance(IssueManager.class).delete(issues);
- target.add(body);
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Type <code>yes</code> below to delete all queried issues";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
+ Collection<Issue> issues = new ArrayList<>();
+ for (IModel<Issue> each: selectionColumn.getSelections())
+ issues.add(each.getObject());
+ OneDev.getInstance(IssueManager.class).delete(issues);
+ target.add(body);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(issuesTable.getItemCount() != 0);
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
}
@Override
@@ -969,7 +955,7 @@ public abstract class IssueListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No issues to delete");
+ tag.put("title", "Please select issues to delete");
}
}
@@ -982,33 +968,47 @@ public abstract class IssueListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete Selected Issues";
+ return "Delete All Queried Issues";
}
@Override
public WebMarkupContainer newLink(String id) {
return new AjaxLink<Void>(id) {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected issues?"));
- }
-
+ @SuppressWarnings("unchecked")
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- Collection<Issue> issues = new ArrayList<>();
- for (IModel<Issue> each: selectionColumn.getSelections())
- issues.add(each.getObject());
- OneDev.getInstance(IssueManager.class).delete(issues);
- target.add(body);
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Issue> issues = new ArrayList<>();
+ for (Iterator<Issue> it = (Iterator<Issue>) dataProvider.iterator(0, issuesTable.getItemCount()); it.hasNext();) {
+ issues.add(it.next());
+ }
+ OneDev.getInstance(IssueManager.class).delete(issues);
+ target.add(body);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to delete all queried issues";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ setEnabled(issuesTable.getItemCount() != 0);
}
@Override
@@ -1017,7 +1017,7 @@ public abstract class IssueListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select issues to delete");
+ tag.put("title", "No issues to delete");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index 1e42a682af..abdda3549b 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -250,48 +250,33 @@ public abstract class PullRequestListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete All Queried Pull Requests";
+ return "Delete Selected Pull Requests";
}
@Override
public WebMarkupContainer newLink(String id) {
return new AjaxLink<Void>(id) {
- @SuppressWarnings("unchecked")
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected pull requests?"));
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
-
- new ConfirmModalPanel(target) {
-
- @Override
- protected void onConfirm(AjaxRequestTarget target) {
- Collection<PullRequest> requests = new ArrayList<>();
- for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();) {
- requests.add(it.next());
- }
- OneDev.getInstance(PullRequestManager.class).delete(requests);
- target.add(body);
- }
-
- @Override
- protected String getConfirmMessage() {
- return "Type <code>yes</code> below to delete all queried pull requests";
- }
-
- @Override
- protected String getConfirmInput() {
- return "yes";
- }
-
- };
-
+ Collection<PullRequest> requests = new ArrayList<>();
+ for (IModel<PullRequest> each: selectionColumn.getSelections())
+ requests.add(each.getObject());
+ OneDev.getInstance(PullRequestManager.class).delete(requests);
+ target.add(body);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(requestsTable.getItemCount() != 0);
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
}
@Override
@@ -300,7 +285,7 @@ public abstract class PullRequestListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "No pull requests to delete");
+ tag.put("title", "Please select pull requests to delete");
}
}
@@ -313,33 +298,48 @@ public abstract class PullRequestListPanel extends Panel {
@Override
public String getLabel() {
- return "Delete Selected Pull Requests";
+ return "Delete All Queried Pull Requests";
}
@Override
public WebMarkupContainer newLink(String id) {
return new AjaxLink<Void>(id) {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete selected pull requests?"));
- }
-
+ @SuppressWarnings("unchecked")
@Override
public void onClick(AjaxRequestTarget target) {
dropdown.close();
- Collection<PullRequest> requests = new ArrayList<>();
- for (IModel<PullRequest> each: selectionColumn.getSelections())
- requests.add(each.getObject());
- OneDev.getInstance(PullRequestManager.class).delete(requests);
- target.add(body);
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<PullRequest> requests = new ArrayList<>();
+ for (Iterator<PullRequest> it = (Iterator<PullRequest>) dataProvider.iterator(0, requestsTable.getItemCount()); it.hasNext();) {
+ requests.add(it.next());
+ }
+ OneDev.getInstance(PullRequestManager.class).delete(requests);
+ target.add(body);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to delete all queried pull requests";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+
}
@Override
protected void onConfigure() {
super.onConfigure();
- setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ setEnabled(requestsTable.getItemCount() != 0);
}
@Override
@@ -348,7 +348,7 @@ public abstract class PullRequestListPanel extends Panel {
configure();
if (!isEnabled()) {
tag.put("disabled", "disabled");
- tag.put("title", "Please select pull requests to delete");
+ tag.put("title", "No pull requests to delete");
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/PersonalQuerySupport.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/PersonalQuerySupport.java
new file mode 100644
index 0000000000..97bc0548f6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/PersonalQuerySupport.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.component.savedquery;
+
+import java.io.Serializable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public interface PersonalQuerySupport extends Serializable {
+
+ void onSave(AjaxRequestTarget target, String queryName);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html
index 34559cae01..0b24969016 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.html
@@ -8,8 +8,8 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine">
- <button wicket:id="saveForAll" class="dirty-aware btn btn-primary">Save for All</button>
+ <input wicket:id="saveForMine" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine">
+ <button wicket:id="save" class="dirty-aware btn btn-primary">Save</button>
<a wicket:id="cancel" class="btn btn-secondary">Cancel</a>
</div>
</form>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java
index 8b00856980..65b3bb70cc 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java
@@ -1,8 +1,11 @@
package io.onedev.server.web.component.savedquery;
+import javax.annotation.Nullable;
+
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -15,8 +18,11 @@ import io.onedev.server.web.page.project.ProjectPage;
@SuppressWarnings("serial")
public abstract class SaveQueryPanel extends Panel {
- public SaveQueryPanel(String id) {
+ private final PersonalQuerySupport myQuerySupport;
+
+ public SaveQueryPanel(String id, @Nullable PersonalQuerySupport myQuerySupport) {
super(id);
+ this.myQuerySupport = myQuerySupport;
}
@Override
@@ -35,21 +41,27 @@ public abstract class SaveQueryPanel extends Panel {
SaveQueryBean bean = new SaveQueryBean();
BeanEditor editor = BeanContext.edit("editor", bean);
form.add(editor);
+
+ if (myQuerySupport != null) {
+ form.add(new AjaxButton("saveForMine") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ myQuerySupport.onSave(target, bean.getName());
+ }
+
+ });
+ } else {
+ form.add(new WebMarkupContainer("saveForMine").setVisible(false));
+ }
+
form.add(new AjaxButton("save") {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- onSaveForMine(target, bean.getName());
- }
-
- });
- form.add(new AjaxButton("saveForAll") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- onSaveForAll(target, bean.getName());
+ onSave(target, bean.getName());
}
@Override
@@ -83,9 +95,8 @@ public abstract class SaveQueryPanel extends Panel {
add(form);
}
- protected abstract void onSaveForMine(AjaxRequestTarget target, String name);
-
- protected abstract void onSaveForAll(AjaxRequestTarget target, String name);
+ protected abstract void onSave(AjaxRequestTarget target, String name);
protected abstract void onCancel(AjaxRequestTarget target);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
index f8de9c48d3..bb4ec609a5 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
@@ -12,16 +12,14 @@
</div>
</div>
<div class="card-body">
- <wicket:enclosure child="userQueries">
- <div wicket:id="userQueries" class="mb-4">
+ <div wicket:id="personalQueries" class="mb-4">
<span class="btn-group">
<a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm btn-icon flex-shrink-0 h-auto"></a>
<a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-icon btn-sm flex-shrink-0 h-auto"></a>
<a wicket:id="link" class="btn btn-sm btn-outline-secondary text-left"><span wicket:id="label"></span></a>
</span>
</div>
- </wicket:enclosure>
- <div wicket:id="queries" class="mb-4">
+ <div wicket:id="globalQueries" class="mb-4">
<span class="btn-group">
<a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm btn-icon flex-shrink-0 h-auto"></a>
<a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-icon btn-sm flex-shrink-0 h-auto"></a>
@@ -31,6 +29,15 @@
</div>
</div>
<wicket:fragment wicket:id="editSavedQueriesFrag">
+ <div class="edit-saved-queries">
+ <div class="modal-header">
+ <h5 class="modal-title">Edit Saved Queries</h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div wicket:id="content" class="modal-body"></div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="editPersonalAwareSavedQueriesFrag">
<div class="edit-saved-queries">
<div class="modal-header">
<h5 class="modal-title">Edit Saved Queries</h5>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
index c78506a0c0..da81ad0d95 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
@@ -34,7 +34,7 @@ import org.apache.wicket.request.http.WebResponse;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
@@ -64,42 +64,18 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
return COOKIE_PREFIX + getPage().getClass().getSimpleName();
}
- private ArrayList<T> getUserQueries() {
- QuerySetting<T> querySetting = getQuerySetting();
- if (querySetting != null)
- return querySetting.getUserQueries();
- else
- return new ArrayList<>();
- }
-
- private WatchStatus getWatchStatus(T namedQuery) {
- QuerySetting<T> querySetting = getQuerySetting();
- if (querySetting != null)
- return querySetting.getQueryWatchSupport().getWatchStatus(namedQuery);
- else
- return WatchStatus.DEFAULT;
- }
-
- private WatchStatus getUserWatchStatus(T namedQuery) {
- QuerySetting<T> querySetting = getQuerySetting();
- if (querySetting != null)
- return querySetting.getQueryWatchSupport().getUserWatchStatus(namedQuery);
+ private WatchStatus getWatchStatus(String queryName) {
+ QueryPersonalization<T> personalization = getQueryPersonalization();
+ if (personalization != null)
+ return personalization.getQueryWatchSupport().getWatchStatus(queryName);
else
return WatchStatus.DEFAULT;
}
- private boolean getSubscriptionStatus(T namedQuery) {
- QuerySetting<T> querySetting = getQuerySetting();
- if (querySetting != null)
- return querySetting.getQuerySubscriptionSupport().getQuerySubscriptions().contains(namedQuery.getName());
- else
- return false;
- }
-
- private boolean getUserSubscriptionStatus(T namedQuery) {
- QuerySetting<T> querySetting = getQuerySetting();
- if (querySetting != null)
- return querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().contains(namedQuery.getName());
+ private boolean getSubscriptionStatus(String queryName) {
+ QueryPersonalization<T> personalization = getQueryPersonalization();
+ if (personalization != null)
+ return personalization.getQuerySubscriptionSupport().getQuerySubscriptions().contains(queryName);
else
return false;
}
@@ -137,6 +113,10 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
handler.add(this);
}
+ private boolean canEditGlobalQueries() {
+ return SecurityUtils.isAdministrator() || Project.get() != null && SecurityUtils.canManage(Project.get());
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -163,7 +143,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getUser() != null);
+ setVisible(SecurityUtils.getUser() != null && (getQueryPersonalization() != null || canEditGlobalQueries()));
}
@Override
@@ -171,17 +151,18 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
return "modal-lg";
}
- private Component newUserQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> userQueries) {
- return new NamedQueriesEditor(componentId, userQueries, null) {
+ private Component newPersonalQueriesEditor(String componentId, ModalPanel modal) {
+ ArrayList<T> personalQueries = getQueryPersonalization().getQueries();
+ return new NamedQueriesEditor(componentId, personalQueries, null) {
@Override
protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {
target.add(SavedQueriesPanel.this);
modal.close();
- QuerySetting<T> querySetting = getQuerySetting();
- querySetting.setUserQueries(queries);
- onSaveQuerySetting(querySetting);
+ QueryPersonalization<T> personalization = getQueryPersonalization();
+ personalization.setQueries(queries);
+ personalization.onUpdated();
}
@Override
@@ -192,15 +173,34 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
};
}
- private Component newQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> queries,
- @Nullable UseDefaultListener useDefaultListener) {
+ private Component newGlobalQueriesEditor(String componentId, ModalPanel modal) {
+ ArrayList<T> queries = getGlobalQueries();
+ UseDefaultListener useDefaultListener;
+ if (queries == null) {
+ queries = new ArrayList<>(getDefaultQueries());
+ useDefaultListener = null;
+ } else if (getDefaultQueries() != null) {
+ useDefaultListener = new UseDefaultListener() {
+
+ @Override
+ public void onUseDefault(AjaxRequestTarget target) {
+ target.add(SavedQueriesPanel.this);
+ modal.close();
+ onSaveGlobalQueries(null);
+ }
+
+ };
+ } else {
+ useDefaultListener = null;
+ }
+
return new NamedQueriesEditor(componentId, queries, useDefaultListener) {
@Override
protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {
target.add(SavedQueriesPanel.this);
modal.close();
- onSaveQueries(queries);
+ onSaveGlobalQueries(queries);
}
@Override
@@ -213,30 +213,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected Component newContent(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "editSavedQueriesFrag", SavedQueriesPanel.this);
- List<Tab> tabs = new ArrayList<>();
-
- ArrayList<T> userQueries = getUserQueries();
- tabs.add(new AjaxActionTab(Model.of("Mine")) {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
+ Fragment fragment;
+ if (getQueryPersonalization() != null) {
+ fragment = new Fragment(id, "editPersonalAwareSavedQueriesFrag", SavedQueriesPanel.this);
+ List<Tab> tabs = new ArrayList<>();
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component editor = newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries);
- fragment.replace(editor);
- target.add(editor);
- }
-
- });
- fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));
-
- if (SecurityUtils.isAdministrator() || Project.get() != null && SecurityUtils.canManage(Project.get())) {
- tabs.add(new AjaxActionTab(Model.of("All Users")) {
+ tabs.add(new AjaxActionTab(Model.of("Mine")) {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
@@ -246,35 +228,39 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- ArrayList<T> queries = getQueries();
- UseDefaultListener useDefaultListener;
- if (queries == null) {
- queries = new ArrayList<>(getDefaultQueries());
- useDefaultListener = null;
- } else if (getDefaultQueries() != null) {
- useDefaultListener = new UseDefaultListener() {
-
- @Override
- public void onUseDefault(AjaxRequestTarget target) {
- target.add(SavedQueriesPanel.this);
- modal.close();
- onSaveQueries(null);
- }
-
- };
- } else {
- useDefaultListener = null;
- }
- Component editor = newQueriesEditor(TAB_PANEL_ID, modal, queries, useDefaultListener);
+ Component editor = newPersonalQueriesEditor(TAB_PANEL_ID, modal);
fragment.replace(editor);
target.add(editor);
}
});
+ fragment.add(newPersonalQueriesEditor(TAB_PANEL_ID, modal));
+
+ if (canEditGlobalQueries()) {
+ tabs.add(new AjaxActionTab(Model.of("All Users")) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component editor = newGlobalQueriesEditor(TAB_PANEL_ID, modal);
+ fragment.replace(editor);
+ target.add(editor);
+ }
+
+ });
+ }
+
+ fragment.add(new Tabbable("tab", tabs));
+ } else {
+ fragment = new Fragment(id, "editSavedQueriesFrag", SavedQueriesPanel.this);
+ fragment.add(newGlobalQueriesEditor("content", modal));
}
- fragment.add(new Tabbable("tab", tabs));
-
fragment.add(new AjaxLink<Void>("close") {
@Override
@@ -294,11 +280,11 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
});
- add(new ListView<T>("userQueries", new LoadableDetachableModel<List<T>>() {
+ add(new ListView<T>("personalQueries", new LoadableDetachableModel<List<T>>() {
@Override
protected List<T> load() {
- return getUserQueries();
+ return getQueryPersonalization().getQueries();
}
}) {
@@ -310,25 +296,27 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
link.add(new Label("label", namedQuery.getName()));
item.add(link);
+ String personalName = NamedQuery.PERSONAL_NAME_PREFIX + namedQuery.getName();
+
item.add(new WatchStatusLink("watchStatus") {
@Override
protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {
target.add(this);
- QuerySetting<T> querySetting = getQuerySetting();
- querySetting.getQueryWatchSupport().setUserWatchStatus(namedQuery, watchStatus);
- onSaveQuerySetting(querySetting);
+ QueryPersonalization<T> personalization = getQueryPersonalization();
+ personalization.getQueryWatchSupport().setWatchStatus(personalName, watchStatus);
+ personalization.onUpdated();
}
@Override
protected WatchStatus getWatchStatus() {
- return getUserWatchStatus(namedQuery);
+ return SavedQueriesPanel.this.getWatchStatus(personalName);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySetting().getQueryWatchSupport() != null);
+ setVisible(getQueryPersonalization().getQueryWatchSupport() != null);
}
});
@@ -338,23 +326,23 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus) {
target.add(this);
- QuerySetting<T> querySetting = getQuerySetting();
+ QueryPersonalization<T> personalization = getQueryPersonalization();
if (subscriptionStatus)
- querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().add(namedQuery.getName());
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().add(personalName);
else
- querySetting.getQuerySubscriptionSupport().getUserQuerySubscriptions().remove(namedQuery.getName());
- onSaveQuerySetting(querySetting);
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().remove(personalName);
+ personalization.onUpdated();
}
@Override
protected boolean isSubscribed() {
- return getUserSubscriptionStatus(namedQuery);
+ return getSubscriptionStatus(personalName);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(getQuerySetting().getQuerySubscriptionSupport() != null);
+ setVisible(getQueryPersonalization().getQuerySubscriptionSupport() != null);
}
});
@@ -364,17 +352,17 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getModelObject().isEmpty());
+ setVisible(SecurityUtils.getUser() != null && getQueryPersonalization() != null);
}
});
- add(new ListView<T>("queries", new LoadableDetachableModel<List<T>>() {
+ add(new ListView<T>("globalQueries", new LoadableDetachableModel<List<T>>() {
@Override
protected List<T> load() {
List<T> namedQueries = new ArrayList<>();
- for (T namedQuery: getQueries()!=null?getQueries():getDefaultQueries())
+ for (T namedQuery: getGlobalQueries()!=null?getGlobalQueries():getDefaultQueries())
namedQueries.add(namedQuery);
return namedQueries;
}
@@ -388,26 +376,30 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
link.add(new Label("label", namedQuery.getName()));
item.add(link);
+ String globalName = NamedQuery.GLOBAL_NAME_PREFIX + namedQuery.getName();
+
item.add(new WatchStatusLink("watchStatus") {
@Override
protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {
target.add(this);
- QuerySetting<T> querySetting = getQuerySetting();
- querySetting.getQueryWatchSupport().setWatchStatus(namedQuery, watchStatus);
- onSaveQuerySetting(querySetting);
+ QueryPersonalization<T> personalization = getQueryPersonalization();
+ personalization.getQueryWatchSupport().setWatchStatus(globalName, watchStatus);
+ personalization.onUpdated();
}
@Override
protected WatchStatus getWatchStatus() {
- return SavedQueriesPanel.this.getWatchStatus(namedQuery);
+ return SavedQueriesPanel.this.getWatchStatus(globalName);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getUser() != null && getQuerySetting().getQueryWatchSupport() != null);
+ setVisible(SecurityUtils.getUser() != null
+ && getQueryPersonalization() != null
+ && getQueryPersonalization().getQueryWatchSupport() != null);
}
});
@@ -418,23 +410,25 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected void onSubscriptionStatusChange(AjaxRequestTarget target, boolean subscriptionStatus) {
target.add(this);
- QuerySetting<T> querySetting = getQuerySetting();
+ QueryPersonalization<T> personalization = getQueryPersonalization();
if (subscriptionStatus)
- querySetting.getQuerySubscriptionSupport().getQuerySubscriptions().add(namedQuery.getName());
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().add(globalName);
else
- querySetting.getQuerySubscriptionSupport().getQuerySubscriptions().remove(namedQuery.getName());
- onSaveQuerySetting(querySetting);
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().remove(globalName);
+ personalization.onUpdated();
}
@Override
protected boolean isSubscribed() {
- return getSubscriptionStatus(namedQuery);
+ return getSubscriptionStatus(globalName);
}
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getUser() != null && getQuerySetting().getQuerySubscriptionSupport() != null);
+ setVisible(SecurityUtils.getUser() != null
+ && getQueryPersonalization() != null
+ && getQueryPersonalization().getQuerySubscriptionSupport() != null);
}
});
@@ -522,6 +516,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
form.add(new AjaxLink<Void>("cancel") {
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+
@Override
public void onClick(AjaxRequestTarget target) {
onCancel(target);
@@ -543,14 +543,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected abstract Link<Void> newQueryLink(String componentId, T namedQuery);
@Nullable
- protected abstract QuerySetting<T> getQuerySetting();
+ protected abstract QueryPersonalization<T> getQueryPersonalization();
@Nullable
- protected abstract ArrayList<T> getQueries();
+ protected abstract ArrayList<T> getGlobalQueries();
- protected abstract void onSaveQueries(ArrayList<T> queries);
-
- protected abstract void onSaveQuerySetting(QuerySetting<T> querySetting);
+ protected abstract void onSaveGlobalQueries(ArrayList<T> queries);
@Nullable
protected ArrayList<T> getDefaultQueries() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
index 7dcbad8bba..5837b8020c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/taskbutton/TaskButton.java
@@ -31,14 +31,14 @@ import org.unbescape.html.HtmlEscape;
import io.onedev.commons.launcher.loader.Listen;
import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.log.JobLogEntry;
import io.onedev.server.buildspec.job.log.JobLogEntryEx;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.server.tasklog.StyleBuilder;
import io.onedev.server.util.schedule.SchedulableTask;
import io.onedev.server.util.schedule.TaskScheduler;
import io.onedev.server.web.component.modal.ModalPanel;
@@ -143,12 +143,12 @@ public abstract class TaskButton extends AjaxButton {
@Override
public TaskResult call() throws Exception {
- SimpleLogger logger = new SimpleLogger() {
+ TaskLogger logger = new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
synchronized (messages) {
- messages.add(JobLogEntryEx.parse(message, styleBuilder));
+ messages.add(JobLogEntryEx.parse(message, new StyleBuilder()));
}
}
@@ -256,7 +256,7 @@ public abstract class TaskButton extends AjaxButton {
* @param logger
* @return html display to user showing task execution result
*/
- protected abstract String runTask(SimpleLogger logger);
+ protected abstract String runTask(TaskLogger logger);
@Singleton
public static class TaskFutureManager implements SchedulableTask {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.html
new file mode 100644
index 0000000000..176b0537aa
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.html
@@ -0,0 +1,12 @@
+<wicket:panel>
+ <div class="d-flex">
+ <div class="flex-grow-1 mr-3">
+ <div class="clearable-wrapper">
+ <input wicket:id="input" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="flex-shrink-0">
+ <a wicket:id="showSelectedAgents" class="btn btn-icon btn-primary" title="Show matching agents" target="_blank"><wicket:svg href="computer" class="icon"/></a>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java
new file mode 100644
index 0000000000..4455ee656f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditPanel.java
@@ -0,0 +1,89 @@
+package io.onedev.server.web.editable.agentquery;
+
+import java.lang.reflect.Method;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.form.FormComponent;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.ConversionException;
+
+import io.onedev.server.web.behavior.AgentQueryBehavior;
+import io.onedev.server.web.behavior.OnTypingDoneBehavior;
+import io.onedev.server.web.editable.EditableUtils;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;
+
+@SuppressWarnings("serial")
+public class AgentQueryEditPanel extends PropertyEditor<String> {
+
+ private final boolean forExecutor;
+
+ private FormComponent<String> input;
+
+ public AgentQueryEditPanel(String id, PropertyDescriptor descriptor,
+ IModel<String> propertyModel, boolean forExecutor) {
+ super(id, descriptor, propertyModel);
+ this.forExecutor = forExecutor;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Method getter = getDescriptor().getPropertyGetter();
+ add(input = new TextField<String>("input", Model.of(getModelObject())));
+ input.setType(getDescriptor().getPropertyClass());
+ input.setLabel(Model.of(getDescriptor().getDisplayName()));
+
+ input.add(new AgentQueryBehavior(forExecutor));
+
+ input.add(AttributeAppender.append("spellcheck", "false"));
+ input.add(AttributeAppender.append("autocomplete", "off"));
+ if (!getDescriptor().isPropertyRequired())
+ input.add(AttributeAppender.append("class", "no-autofocus"));
+
+ input.add(new OnTypingDoneBehavior() {
+
+ @Override
+ protected void onTypingDone(AjaxRequestTarget target) {
+ onPropertyUpdating(target);
+ Link<?> link = newShowSelectedAgentsLink();
+ replace(link);
+ target.add(link);
+ }
+
+ });
+
+ if (getter.getAnnotation(OmitName.class) != null) {
+ input.add(AttributeModifier.replace("placeholder", EditableUtils.getDisplayName(getter)));
+ } else {
+ NameOfEmptyValue nameOfEmptyValue = getter.getAnnotation(NameOfEmptyValue.class);
+ if (nameOfEmptyValue != null)
+ input.add(AttributeModifier.replace("placeholder", nameOfEmptyValue.value()));
+ }
+
+ add(newShowSelectedAgentsLink());
+ }
+
+ private Link<?> newShowSelectedAgentsLink() {
+ Link<?> link = new BookmarkablePageLink<Void>("showSelectedAgents", AgentListPage.class,
+ AgentListPage.paramsOf(input.getConvertedInput(), 0));
+ link.setOutputMarkupId(true);
+ return link;
+ }
+
+ @Override
+ protected String convertInputToValue() throws ConversionException {
+ return input.getConvertedInput();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditSupport.java
new file mode 100644
index 0000000000..3ea64457f9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryEditSupport.java
@@ -0,0 +1,57 @@
+package io.onedev.server.web.editable.agentquery;
+
+import java.lang.reflect.Method;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.web.editable.EditSupport;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyDescriptor;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyViewer;
+import io.onedev.server.web.editable.annotation.AgentQuery;
+
+@SuppressWarnings("serial")
+public class AgentQueryEditSupport implements EditSupport {
+
+ @Override
+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {
+ Method propertyGetter = descriptor.getPropertyGetter();
+ AgentQuery agentQuery = propertyGetter.getAnnotation(AgentQuery.class);
+ if (agentQuery != null) {
+ if (propertyGetter.getReturnType() != String.class) {
+ throw new RuntimeException("Annotation 'AgentQuery' should be applied to property "
+ + "with type 'String'");
+ }
+ return new PropertyContext<String>(descriptor) {
+
+ @Override
+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {
+ return new PropertyViewer(componentId, descriptor) {
+
+ @Override
+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {
+ return new AgentQueryViewPanel(id, model.getObject());
+ }
+
+ };
+ }
+
+ @Override
+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {
+ return new AgentQueryEditPanel(componentId, descriptor, model, agentQuery.forExecutor());
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+ @Override
+ public int getPriority() {
+ return DEFAULT_PRIORITY;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryViewPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryViewPanel.html
new file mode 100644
index 0000000000..ac593f1d9f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryViewPanel.html
@@ -0,0 +1,4 @@
+<wicket:panel>
+ <span wicket:id="queryString" class="mr-2"></span>
+ <a wicket:id="showSelectedAgents" title="Show matching agents" target="_blank"><wicket:svg href="computer" class="icon"/></a>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryViewPanel.java
new file mode 100644
index 0000000000..fe4449c49a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/agentquery/AgentQueryViewPanel.java
@@ -0,0 +1,32 @@
+package io.onedev.server.web.editable.agentquery;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;
+
+@SuppressWarnings("serial")
+public class AgentQueryViewPanel extends Panel {
+
+ private final String queryString;
+
+ public AgentQueryViewPanel(String id, String queryString) {
+ super(id);
+ this.queryString = queryString;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (queryString != null)
+ add(new Label("queryString", queryString));
+ else
+ add(new Label("queryString", "<i>Any agent</i>").setEscapeModelStrings(false));
+
+ add(new BookmarkablePageLink<Void>("showSelectedAgents",
+ AgentListPage.class, AgentListPage.paramsOf(queryString, 0)));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/annotation/AgentQuery.java b/server-core/src/main/java/io/onedev/server/web/editable/annotation/AgentQuery.java
new file mode 100644
index 0000000000..9ec170096c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/annotation/AgentQuery.java
@@ -0,0 +1,26 @@
+package io.onedev.server.web.editable.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.AgentQueryValidator;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy=AgentQueryValidator.class)
+public @interface AgentQuery {
+
+ boolean forExecutor() default true;
+
+ String message() default "";
+
+ Class<?>[] groups() default {};
+
+ Class<? extends Payload>[] payload() default {};
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
index 12ccf971a9..3c1fc212cc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
@@ -19,10 +19,10 @@ import org.apache.wicket.util.visit.IVisitor;
import com.google.common.base.Joiner;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.administration.authenticator.Authenticated;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
@@ -136,7 +136,7 @@ public class AuthenticatorPage extends AdministrationPage {
}
@Override
- protected String runTask(SimpleLogger logger) {
+ protected String runTask(TaskLogger logger) {
Authenticated authenticated = bean.getAuthenticator().authenticate(
new UsernamePasswordToken(token.getUserName(), token.getPassword()));
StringBuilder retrievedInfoBuilder = new StringBuilder();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.html
new file mode 100644
index 0000000000..10ae2852bf
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="builds"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
new file mode 100644
index 0000000000..52bce544e5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentBuildsPage.java
@@ -0,0 +1,109 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.search.entity.build.RanOnCriteria;
+import io.onedev.server.web.component.build.list.BuildListPanel;
+import io.onedev.server.web.util.PagingHistorySupport;
+
+@SuppressWarnings("serial")
+public class AgentBuildsPage extends AgentDetailPage {
+
+ private static final String PARAM_QUERY = "query";
+
+ private static final String PARAM_PAGE = "page";
+
+ private String query;
+
+ private BuildListPanel buildList;
+
+ public AgentBuildsPage(PageParameters params) {
+ super(params);
+ query = params.get(PARAM_QUERY).toString();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(buildList = new BuildListPanel("builds", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return query;
+ }
+
+ @Override
+ public void setObject(String object) {
+ query = object;
+ PageParameters params = getPageParameters();
+ params.set(PARAM_QUERY, query);
+ params.remove(PARAM_PAGE);
+ CharSequence url = RequestCycle.get().urlFor(AgentBuildsPage.class, params);
+ pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
+ }
+
+ }, 0) {
+
+ @Override
+ protected BuildQuery getBaseQuery() {
+ return new BuildQuery(new RanOnCriteria(getAgent().getName()), new ArrayList<>());
+ }
+
+ @Override
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return new PagingHistorySupport() {
+
+ @Override
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(getAgent(), query);
+ params.add(PARAM_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
+ }
+
+ };
+ }
+
+ @Override
+ protected Project getProject() {
+ return null;
+ }
+
+ });
+ }
+
+ @Override
+ protected void onPopState(AjaxRequestTarget target, Serializable data) {
+ query = (String) data;
+ getPageParameters().set(PARAM_QUERY, query);
+ target.add(buildList);
+ }
+
+ public static PageParameters paramsOf(Agent agent, @Nullable String query) {
+ PageParameters params = paramsOf(agent);
+ if (query != null)
+ params.add(PARAM_QUERY, query);
+ return params;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentCssResourceReference.java
new file mode 100644
index 0000000000..5bb40ba9f5
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class AgentCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public AgentCssResourceReference() {
+ super(AgentCssResourceReference.class, "agent.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.html
new file mode 100644
index 0000000000..c24da259ef
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.html
@@ -0,0 +1,8 @@
+<wicket:extend>
+ <div class="card">
+ <div class="card-body">
+ <ul wicket:id="agentTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>
+ <wicket:child></wicket:child>
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java
new file mode 100644
index 0000000000..d329e0e64c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDetailPage.java
@@ -0,0 +1,112 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.tabbable.PageTab;
+import io.onedev.server.web.component.tabbable.PageTabHead;
+import io.onedev.server.web.component.tabbable.Tab;
+import io.onedev.server.web.component.tabbable.Tabbable;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public abstract class AgentDetailPage extends AdministrationPage {
+
+ private static final String PARAM_AGENT = "agent";
+
+ protected final IModel<Agent> agentModel;
+
+ public AgentDetailPage(PageParameters params) {
+ super(params);
+
+ String agentName = params.get(PARAM_AGENT).toString();
+
+ Agent agent = OneDev.getInstance(AgentManager.class).findByName(agentName);
+
+ if (agent == null)
+ throw new ExplicitException("Unable to find agent " + agentName);
+
+ Long agentId = agent.getId();
+
+ agentModel = new LoadableDetachableModel<Agent>() {
+
+ @Override
+ protected Agent load() {
+ return OneDev.getInstance(AgentManager.class).load(agentId);
+ }
+
+ };
+
+ // we do not need to reload the project this time as we already have that object on hand
+ agentModel.setObject(agent);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<Tab> tabs = new ArrayList<>();
+
+ tabs.add(new AgentTab("Overview", AgentOverviewPage.class));
+ tabs.add(new AgentTab("Builds", AgentBuildsPage.class));
+ tabs.add(new AgentTab("Log", AgentLogPage.class));
+
+ add(new Tabbable("agentTabs", tabs).setOutputMarkupId(true));
+ }
+
+ protected Agent getAgent() {
+ return agentModel.getObject();
+ }
+
+ @Override
+ protected void onDetach() {
+ agentModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, getAgent().getName());
+ }
+
+ public static PageParameters paramsOf(Agent agent) {
+ PageParameters params = new PageParameters();
+ params.add(PARAM_AGENT, agent.getName());
+ return params;
+ }
+
+ private class AgentTab extends PageTab {
+
+ public AgentTab(String title, Class<? extends Page> pageClass) {
+ super(Model.of(title), pageClass);
+ }
+
+ @Override
+ public Component render(String componentId) {
+ return new PageTabHead(componentId, this) {
+
+ @Override
+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getAgent()));
+ }
+
+ };
+ }
+
+ }
+
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..8fa90b914c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.html
@@ -0,0 +1,13 @@
+<wicket:panel>
+ <div class="p-5">
+ <h6 class="text-center mb-4">Download & Install Agent</h6>
+ <ol>
+ <li>Make sure <code>Server URL</code> in <a wicket:id="systemSetting" class="link-primary" target="_blank">system setting</a> is specified correctly</li>
+ <li>Make sure <a href="https://openjdk.java.net" target="_blank">JDK 1.8 or higher</a> is installed</li>
+ <li>Download agent package for <a wicket:id="zip" class="link-primary">Windows</a> or <a wicket:id="targz" class="link-primary">Linux/Mac</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.sh console</code> (Linux/Mac) or <code>bin\agent.bat console</code> (Windows)</li>
+ <li>Check <a wicket:id="installationGuide" class="link-primary" target="_blank">agent installation guide</a> for more details, such as running as docker container, running as service etc.</li>
+ </ol>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.java
new file mode 100644
index 0000000000..2c07b03ec0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentDownloadPanel.java
@@ -0,0 +1,27 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
+
+@SuppressWarnings("serial")
+class AgentDownloadPanel extends Panel {
+
+ public AgentDownloadPanel(String id) {
+ super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ExternalLink("zip", "/downloads/agent.zip"));
+ add(new ExternalLink("targz", "/downloads/agent.tar.gz"));
+ add(new BookmarkablePageLink<Void>("systemSetting", SystemSettingPage.class));
+ add(new ExternalLink("installationGuide", OneDev.getInstance().getDocRoot() + "/agent-installation-guide.md"));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.java
new file mode 100644
index 0000000000..4f31b2ba5c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentEditBean.java
@@ -0,0 +1,47 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.validation.ConstraintValidatorContext;
+
+import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+@ClassValidating
+public class AgentEditBean implements Serializable, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<AgentAttribute> attributes = new ArrayList<>();
+
+ @Editable
+ public List<AgentAttribute> getAttributes() {
+ return attributes;
+ }
+
+ public void setAttributes(List<AgentAttribute> attributes) {
+ this.attributes = attributes;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ Set<String> attributeNames = new HashSet<>();
+ for (AgentAttribute attribute: attributes) {
+ if (!attributeNames.add(attribute.getName())) {
+ context.disableDefaultConstraintViolation();
+ context.buildConstraintViolationWithTemplate("Duplicate attribute (" + attribute.getName() + ")")
+ .addPropertyNode("attributes").addConstraintViolation();
+ return false;
+ }
+ }
+ return true;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
new file mode 100644
index 0000000000..9268ed3ca6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.html
@@ -0,0 +1,8 @@
+<wicket:extend>
+ <div class="alert alert-info mb-5"><wicket:svg href="bulb" class="icon"></wicket:svg> Agents can be installed on other machines to run remote build jobs
+ without Kubernetes cluster</div>
+ <div class="side-main side-main-wrap">
+ <div wicket:id="savedQueries" class="side"></div>
+ <div wicket:id="agents" class="main"></div>
+ </div>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
new file mode 100644
index 0000000000..ccd42d15b6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
@@ -0,0 +1,225 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+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.NamedAgentQuery;
+import io.onedev.server.model.support.QueryPersonalization;
+import io.onedev.server.model.support.administration.AgentSetting;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.NamedQueriesBean;
+import io.onedev.server.web.component.savedquery.SaveQueryPanel;
+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
+import io.onedev.server.web.page.admin.AdministrationPage;
+import io.onedev.server.web.util.NamedAgentQueriesBean;
+import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.util.QuerySaveSupport;
+
+@SuppressWarnings("serial")
+public class AgentListPage extends AdministrationPage {
+
+ private static final String PARAM_PAGE = "page";
+
+ private static final String PARAM_QUERY = "query";
+
+ private String query;
+
+ private SavedQueriesPanel<NamedAgentQuery> savedQueries;
+
+ private Component agentList;
+
+ public AgentListPage(PageParameters params) {
+ super(params);
+ query = params.get(PARAM_QUERY).toOptionalString();
+ }
+
+ private static AgentSetting getAgentSetting() {
+ return OneDev.getInstance(SettingManager.class).getAgentSetting();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(savedQueries = new SavedQueriesPanel<NamedAgentQuery>("savedQueries") {
+
+ @Override
+ protected NamedQueriesBean<NamedAgentQuery> newNamedQueriesBean() {
+ return new NamedAgentQueriesBean();
+ }
+
+ @Override
+ protected Link<Void> newQueryLink(String componentId, NamedAgentQuery namedQuery) {
+ return new BookmarkablePageLink<Void>(componentId, AgentListPage.class,
+ AgentListPage.paramsOf(namedQuery.getQuery(), 0));
+ }
+
+ @Override
+ protected QueryPersonalization<NamedAgentQuery> getQueryPersonalization() {
+ return null;
+ }
+
+ @Override
+ protected ArrayList<NamedAgentQuery> getGlobalQueries() {
+ return (ArrayList<NamedAgentQuery>) getAgentSetting().getNamedQueries();
+ }
+
+ @Override
+ protected void onSaveGlobalQueries(ArrayList<NamedAgentQuery> namedQueries) {
+ getAgentSetting().setNamedQueries(namedQueries);
+ OneDev.getInstance(SettingManager.class).saveAgentSetting(getAgentSetting());
+ }
+
+ });
+
+ add(agentList = new AgentListPanel("agents", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ return query;
+ }
+
+ @Override
+ public void setObject(String object) {
+ query = object;
+ PageParameters params = getPageParameters();
+ params.set(PARAM_QUERY, query);
+ params.remove(PARAM_PAGE);
+ CharSequence url = RequestCycle.get().urlFor(AgentListPage.class, params);
+ pushState(RequestCycle.get().find(AjaxRequestTarget.class), url.toString(), query);
+ }
+
+ }) {
+
+ @Override
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return new PagingHistorySupport() {
+
+ @Override
+ public PageParameters newPageParameters(int currentPage) {
+ PageParameters params = paramsOf(query, 0);
+ params.add(PARAM_PAGE, currentPage+1);
+ return params;
+ }
+
+ @Override
+ public int getCurrentPage() {
+ return getPageParameters().get(PARAM_PAGE).toInt(1)-1;
+ }
+
+ };
+ }
+
+ @Override
+ protected QuerySaveSupport getQuerySaveSupport() {
+ return new QuerySaveSupport() {
+
+ @Override
+ public void onSaveQuery(AjaxRequestTarget target, String query) {
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ return new SaveQueryPanel(id, null) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, String name) {
+ AgentSetting agentSetting = getAgentSetting();
+ NamedAgentQuery namedQuery = agentSetting.getNamedQuery(name);
+ if (namedQuery == null) {
+ namedQuery = new NamedAgentQuery(name, query);
+ agentSetting.getNamedQueries().add(namedQuery);
+ } else {
+ namedQuery.setQuery(query);
+ }
+ OneDev.getInstance(SettingManager.class).saveAgentSetting(agentSetting);
+ target.add(savedQueries);
+ close();
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ @Override
+ public boolean isSavedQueriesVisible() {
+ savedQueries.configure();
+ return savedQueries.isVisible();
+ }
+
+ };
+ }
+
+ });
+
+ }
+
+ @Override
+ protected void onPopState(AjaxRequestTarget target, Serializable data) {
+ query = (String) data;
+ getPageParameters().set(PARAM_QUERY, query);
+ target.add(agentList);
+ }
+
+ public static PageParameters paramsOf(@Nullable String query, int page) {
+ PageParameters params = new PageParameters();
+ if (query != null)
+ params.add(PARAM_QUERY, query);
+ if (page != 0)
+ params.add(PARAM_PAGE, page);
+ return params;
+ }
+
+ public static PageParameters paramsOf(int page) {
+ String query = null;
+
+ if (!getAgentSetting().getNamedQueries().isEmpty())
+ query = getAgentSetting().getNamedQueries().iterator().next().getQuery();
+
+ return paramsOf(query, page);
+ }
+
+ @Override
+ protected boolean isPermitted() {
+ return SecurityUtils.isAdministrator();
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new AgentCssResourceReference()));
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Agents");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
new file mode 100644
index 0000000000..cf85ece80c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
@@ -0,0 +1,41 @@
+<wicket:panel>
+ <div class="agent-list card">
+ <div class="card-body">
+ <div class="d-flex mb-4">
+ <form wicket:id="query" class="clearable-wrapper flex-grow-1">
+ <div class="input-group">
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order agents here">
+ <span class="input-group-append">
+ <button wicket:id="submit" type="submit" class="btn btn-outline-secondary btn-icon" title="Query"><wicket:svg href="magnify" class="icon"></wicket:svg></button>
+ </span>
+ </div>
+ </form>
+ <a wicket:id="downloadAgent" class="btn btn-primary btn-icon flex-shrink-0 ml-3" title="Download agent"><wicket:svg href="download" class="icon"/></a>
+ </div>
+ <div class="operations mb-4">
+ <a wicket:id="showSavedQueries" class="show-saved-queries text-gray mr-4">
+ <wicket:svg href="eye" class="icon"></wicket:svg> Show Saved Queries
+ </a>
+ <a wicket:id="saveQuery" class="save-query text-gray mr-4">
+ <wicket:svg href="save" class="icon"></wicket:svg> Save Query
+ </a>
+ <a wicket:id="orderBy" class="order-by text-gray mr-4">
+ <wicket:svg href="sort" class="icon"></wicket:svg> Order By
+ </a>
+ <a wicket:id="operations" class="text-gray mr-4 -b-2 d-inline-block text-nowrap">
+ <wicket:svg href="ellipsis-circle" class="icon rotate-180"></wicket:svg> Operations
+ </a>
+ <a wicket:id="tokens" class="text-gray mr-4 -b-2 d-inline-block text-nowrap">
+ <wicket:svg href="token" class="icon"></wicket:svg> Tokens
+ </a>
+ </div>
+ <div wicket:id="body">
+ <div wicket:id="feedback"></div>
+ <table wicket:id="agents" class="table"></table>
+ </div>
+ </div>
+ </div>
+ <wicket:fragment wicket:id="agentLinkFrag">
+ <a wicket:id="link" class="d-flex align-items-center"><svg wicket:id="icon" class="icon icon-lg mr-1"></svg> <span wicket:id="label"></span></a>
+ </wicket:fragment>
+</wicket:panel>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
new file mode 100644
index 0000000000..6a12871fb6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -0,0 +1,871 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityCriteria;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.OrEntityCriteria;
+import io.onedev.server.search.entity.agent.AgentQuery;
+import io.onedev.server.search.entity.agent.NameCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.AgentQueryBehavior;
+import io.onedev.server.web.component.AgentStatusBadge;
+import io.onedev.server.web.component.datatable.OneDataTable;
+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
+import io.onedev.server.web.component.orderedit.OrderEditPanel;
+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+import io.onedev.server.web.util.PagingHistorySupport;
+import io.onedev.server.web.util.QuerySaveSupport;
+
+@SuppressWarnings("serial")
+class AgentListPanel extends Panel {
+
+ private final IModel<String> queryStringModel;
+
+ private final IModel<AgentQuery> queryModel = new LoadableDetachableModel<AgentQuery>() {
+
+ @Override
+ protected AgentQuery load() {
+ String queryString = queryStringModel.getObject();
+ try {
+ return AgentQuery.parse(queryString, false);
+ } catch (ExplicitException e) {
+ error(e.getMessage());
+ return null;
+ } catch (Exception e) {
+ warn("Not a valid formal query, performing fuzzy query");
+ List<EntityCriteria<Agent>> criterias = new ArrayList<>();
+ criterias.add(new NameCriteria("*" + queryString + "*"));
+ return new AgentQuery(new OrEntityCriteria<Agent>(criterias));
+ }
+ }
+
+ };
+
+ private DataTable<Agent, Void> agentsTable;
+
+ private SelectionColumn<Agent, Void> selectionColumn;
+
+ private SortableDataProvider<Agent, Void> dataProvider;
+
+ private WebMarkupContainer body;
+
+ private Component saveQueryLink;
+
+ private TextField<String> queryInput;
+
+ private boolean querySubmitted = true;
+
+ public AgentListPanel(String id, IModel<String> queryModel) {
+ super(id);
+ this.queryStringModel = queryModel;
+ }
+
+ private AgentManager getAgentManager() {
+ return OneDev.getInstance(AgentManager.class);
+ }
+
+ @Override
+ protected void onDetach() {
+ queryStringModel.detach();
+ queryModel.detach();
+ super.onDetach();
+ }
+
+ @Nullable
+ protected PagingHistorySupport getPagingHistorySupport() {
+ return null;
+ }
+
+ @Nullable
+ protected QuerySaveSupport getQuerySaveSupport() {
+ return null;
+ }
+
+ private void doQuery(AjaxRequestTarget target) {
+ agentsTable.setCurrentPage(0);
+ target.add(body);
+ querySubmitted = true;
+ if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)
+ target.add(saveQueryLink);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("showSavedQueries") {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+ if (event.getPayload() instanceof SavedQueriesClosed)
+ ((SavedQueriesClosed) event.getPayload()).getHandler().add(this);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getQuerySaveSupport() != null && !getQuerySaveSupport().isSavedQueriesVisible());
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ send(getPage(), Broadcast.BREADTH, new SavedQueriesOpened(target));
+ target.add(this);
+ }
+
+ }.setOutputMarkupPlaceholderTag(true));
+
+ add(saveQueryLink = new AjaxLink<Void>("saveQuery") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(querySubmitted && queryModel.getObject() != null);
+ setVisible(getQuerySaveSupport() != null);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled())
+ tag.append("class", "disabled", " ");
+ if (!querySubmitted)
+ tag.put("title", "Query not submitted");
+ else if (queryModel.getObject() == null)
+ tag.put("title", "Can not save malformed query");
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());
+ }
+
+ }.setOutputMarkupPlaceholderTag(true));
+
+ add(new DropdownLink("orderBy") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ List<String> orderFields = new ArrayList<>(Agent.ORDER_FIELDS.keySet());
+ return new OrderEditPanel(id, orderFields, new IModel<List<EntitySort>> () {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public List<EntitySort> getObject() {
+ AgentQuery query = queryModel.getObject();
+ AgentListPanel.this.getFeedbackMessages().clear();
+ if (query != null)
+ return query.getSorts();
+ else
+ return new ArrayList<>();
+ }
+
+ @Override
+ public void setObject(List<EntitySort> object) {
+ AgentQuery query = queryModel.getObject();
+ AgentListPanel.this.getFeedbackMessages().clear();
+ if (query == null)
+ query = new AgentQuery();
+ query.getSorts().clear();
+ query.getSorts().addAll(object);
+ queryModel.setObject(query);
+ queryStringModel.setObject(query.toString());
+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+
+ });
+ }
+
+ });
+
+ add(new DropdownLink("tokens") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new TokenListPanel(id);
+ }
+
+ });
+
+ add(new MenuLink("operations") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Pause Selected Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Agent> agents = new ArrayList<>();
+ for (IModel<Agent> each: selectionColumn.getSelections())
+ agents.add(each.getObject());
+ OneDev.getInstance(AgentManager.class).pause(agents);
+ target.add(body);
+ Session.get().success("Paused selected agents");
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select agents to pause");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Resume Selected Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Agent> agents = new ArrayList<>();
+ for (IModel<Agent> each: selectionColumn.getSelections())
+ agents.add(each.getObject());
+ OneDev.getInstance(AgentManager.class).resume(agents);
+ target.add(body);
+ Session.get().success("Resumed selected agents");
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select agents to resume");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Restart Selected Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to restart selected agents?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Agent> agents = new ArrayList<>();
+ for (IModel<Agent> each: selectionColumn.getSelections())
+ agents.add(each.getObject());
+ OneDev.getInstance(AgentManager.class).restart(agents);
+ target.add(body);
+ Session.get().success("Restart command issued to selected agents");
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select agents to restart");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Remove Selected Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to remove selected agents?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Collection<Agent> agents = new ArrayList<>();
+ for (IModel<Agent> each: selectionColumn.getSelections())
+ agents.add(each.getObject());
+ OneDev.getInstance(AgentManager.class).delete(agents);
+ target.add(body);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(selectionColumn != null && !selectionColumn.getSelections().isEmpty());
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "Please select agents to remove");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Pause All Queried Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Agent> agents = new ArrayList<>();
+ for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
+ agents.add(it.next());
+ }
+ OneDev.getInstance(AgentManager.class).pause(agents);
+ target.add(body);
+ Session.get().success("Paused all queried agents");
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to pause all queried agents";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(agentsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No agents to pause");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Resume All Queried Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Agent> agents = new ArrayList<>();
+ for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
+ agents.add(it.next());
+ }
+ OneDev.getInstance(AgentManager.class).resume(agents);
+ target.add(body);
+ Session.get().success("Resumed all queried agents");
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to resume all queried agents";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(agentsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No agents to resume");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Restart All Queried Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Agent> agents = new ArrayList<>();
+ for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
+ agents.add(it.next());
+ }
+ OneDev.getInstance(AgentManager.class).restart(agents);
+ target.add(body);
+ Session.get().success("Restart command issued to all queried agents");
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to restart all queried agents";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(agentsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No agents to restart");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Remove All Queried Agents";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ new ConfirmModalPanel(target) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ Collection<Agent> agents = new ArrayList<>();
+ for (Iterator<Agent> it = (Iterator<Agent>) dataProvider.iterator(0, agentsTable.getItemCount()); it.hasNext();) {
+ agents.add(it.next());
+ }
+ OneDev.getInstance(AgentManager.class).delete(agents);
+ target.add(body);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return "Type <code>yes</code> below to remove all queried agents";
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return "yes";
+ }
+
+ };
+
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setEnabled(agentsTable.getItemCount() != 0);
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ configure();
+ if (!isEnabled()) {
+ tag.put("disabled", "disabled");
+ tag.put("title", "No agents to remove");
+ }
+ }
+
+ };
+ }
+
+ });
+
+ return menuItems;
+ }
+
+ });
+
+ queryInput = new TextField<String>("input", queryStringModel);
+ queryInput.setOutputMarkupId(true);
+ queryInput.add(new AgentQueryBehavior(false) {
+
+ @Override
+ protected void onInput(AjaxRequestTarget target, String inputContent) {
+ AgentListPanel.this.getFeedbackMessages().clear();
+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())
+ .equals(StringUtils.trimToEmpty(inputContent));
+ target.add(saveQueryLink);
+ }
+
+ });
+
+ queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ doQuery(target);
+ }
+
+ });
+
+ Form<?> queryForm = new Form<Void>("query");
+ queryForm.add(queryInput);
+ queryForm.add(new AjaxButton("submit") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ doQuery(target);
+ }
+
+ });
+ add(queryForm);
+
+ add(new DropdownLink("downloadAgent") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ if (new File(Bootstrap.installDir, "agent").exists()) {
+ return new AgentDownloadPanel(id);
+ } else {
+ Label label = new Label(id, "Agent package not available");
+ label.add(AttributeAppender.append("class", "p-5"));
+ return label;
+ }
+ }
+
+ });
+
+ dataProvider = new LoadableDetachableDataProvider<Agent, Void>() {
+
+ @Override
+ public Iterator<? extends Agent> iterator(long first, long count) {
+ try {
+ return getAgentManager().query(queryModel.getObject(), (int)first, (int)count).iterator();
+ } catch (ExplicitException e) {
+ error(e.getMessage());
+ return new ArrayList<Agent>().iterator();
+ }
+ }
+
+ @Override
+ public long calcSize() {
+ AgentQuery query = queryModel.getObject();
+ if (query != null) {
+ try {
+ return getAgentManager().count(query.getCriteria());
+ } catch (ExplicitException e) {
+ error(e.getMessage());
+ }
+ }
+ return 0;
+ }
+
+ @Override
+ public IModel<Agent> model(Agent object) {
+ Long agentId = object.getId();
+ return new LoadableDetachableModel<Agent>() {
+
+ @Override
+ protected Agent load() {
+ return getAgentManager().load(agentId);
+ }
+
+ };
+ }
+
+ };
+
+ body = new WebMarkupContainer("body");
+ add(body.setOutputMarkupId(true));
+
+ body.add(new FencedFeedbackPanel("feedback", this));
+
+ List<IColumn<Agent, Void>> columns = new ArrayList<>();
+
+ columns.add(selectionColumn = new SelectionColumn<Agent, Void>());
+
+ columns.add(new AbstractColumn<Agent, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Agent>> cellItem, String componentId, IModel<Agent> rowModel) {
+ Fragment fragment = new Fragment(componentId, "agentLinkFrag", AgentListPanel.this);
+ Agent agent = rowModel.getObject();
+ Link<Void> link = new BookmarkablePageLink<Void>("link",
+ AgentOverviewPage.class, AgentOverviewPage.paramsOf(agent));
+ link.add(new SpriteImage("icon", agent.getOs().name().toLowerCase()));
+ link.add(new Label("label", agent.getName()));
+ fragment.add(link);
+ cellItem.add(fragment);
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Agent, Void>(Model.of("IP Address")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Agent>> cellItem, String componentId, IModel<Agent> rowModel) {
+ Agent agent = rowModel.getObject();
+ cellItem.add(new Label(componentId, agent.getIpAddress()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Agent, Void>(Model.of("CPU")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Agent>> cellItem, String componentId, IModel<Agent> rowModel) {
+ Agent agent = rowModel.getObject();
+ cellItem.add(new Label(componentId, agent.getCpu()));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Agent, Void>(Model.of("Memory")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Agent>> cellItem, String componentId, IModel<Agent> rowModel) {
+ Agent agent = rowModel.getObject();
+ cellItem.add(new Label(componentId, agent.getMemory()));
+ }
+
+ @Override
+ public String getCssClass() {
+ return "d-none d-lg-table-cell";
+ }
+
+ });
+
+ columns.add(new AbstractColumn<Agent, Void>(Model.of("Status")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Agent>> cellItem, String componentId, IModel<Agent> rowModel) {
+ cellItem.add(new AgentStatusBadge(componentId, rowModel));
+ }
+
+ });
+
+ body.add(agentsTable = new OneDataTable<Agent, Void>("agents", columns, dataProvider,
+ WebConstants.PAGE_SIZE, getPagingHistorySupport()));
+
+ setOutputMarkupId(true);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.html
new file mode 100644
index 0000000000..cbcddbba8b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.html
@@ -0,0 +1,15 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+ <wicket:fragment wicket:id="onlineFrag">
+ <div class="card server-log">
+ <div class="card-body">
+ <a wicket:id="download" class="btn btn-light btn-hover-primary btn-block mb-4" title="Download log"><wicket:svg href="download" class="icon mr-2"/> Download</a>
+ <div wicket:id="warning" class="alert alert-notice alert-light-warning mb-4"></div>
+ <pre wicket:id="logContent"></pre>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="offlineFrag">
+ <div class="alert alert-notice alert-light-warning">Log not available for offline agent</div>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java
new file mode 100644
index 0000000000..90ffdb6a09
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentLogPage.java
@@ -0,0 +1,54 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.util.List;
+
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.ResourceLink;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import com.google.common.base.Joiner;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.web.resource.AgentLogResource;
+import io.onedev.server.web.resource.AgentLogResourceReference;
+
+@SuppressWarnings("serial")
+public class AgentLogPage extends AgentDetailPage {
+
+ private static final int MAX_DISPLAY_LINES = 5000;
+
+ public AgentLogPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ if (getAgent().isOnline()) {
+ Fragment fragment = new Fragment("content", "onlineFrag", this);
+
+ fragment.add(new ResourceLink<Void>("download",
+ new AgentLogResourceReference(), AgentLogResource.paramsOf(getAgent())));
+
+ List<String> lines = OneDev.getInstance(AgentManager.class).getAgentLog(getAgent());
+ String content;
+ if (lines.size() > MAX_DISPLAY_LINES) {
+ fragment.add(new Label("warning", "Too many log entries, displaying recent " + MAX_DISPLAY_LINES));
+ content = Joiner.on("\n").join(lines.subList(lines.size()-MAX_DISPLAY_LINES, lines.size()));
+ } else {
+ fragment.add(new WebMarkupContainer("warning").setVisible(false));
+ content = Joiner.on("\n").join(lines);
+ }
+ fragment.add(new Label("logContent", content));
+
+ add(fragment);
+ } else {
+ add(new Fragment("content", "offlineFrag", this));
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html
new file mode 100644
index 0000000000..2b031cac70
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.html
@@ -0,0 +1,73 @@
+<wicket:extend>
+ <div class="mb-4">
+ <a wicket:id="pauseOrResume" class="btn btn-light-primary mr-2"><span wicket:id="label"></span></a>
+ <a wicket:id="restart" class="btn btn-light-primary mr-2">Restart</a>
+ <a wicket:id="remove" class="btn btn-light-danger mr-2">Remove</a>
+ </div>
+ <table class="table mb-5">
+ <thead>
+ <th>Name</th>
+ <th>IP Address</th>
+ <th class="d-none d-lg-table-cell">OS Version</th>
+ <th class="d-none d-lg-table-cell">OS Arch</th>
+ <th class="d-none d-lg-table-cell">CPU</th>
+ <th class="d-none d-lg-table-cell">Memory</th>
+ <th>Status</th>
+ </thead>
+ <tbody>
+ <tr>
+ <td>
+ <div class="d-flex align-items-center">
+ <svg wicket:id="icon" class="icon icon-lg mr-2"></svg>
+ <span wicket:id="name"></span>
+ </div>
+ </td>
+ <td>
+ <span wicket:id="ipAddress"></span>
+ </td>
+ <td class="d-none d-lg-table-cell">
+ <span wicket:id="osVersion"></span>
+ </td>
+ <td class="d-none d-lg-table-cell">
+ <span wicket:id="osArch"></span>
+ </td>
+ <td class="d-none d-lg-table-cell">
+ <span wicket:id="cpu"></span>
+ </td>
+ <td class="d-none d-lg-table-cell">
+ <span wicket:id="memory"></span>
+ </td>
+ <td>
+ <span wicket:id="status"></span>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ <div wicket:id="attributes"></div>
+ <wicket:fragment wicket:id="onlineAttributesFrag">
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="attributes"></div>
+ <input type="submit" value="Update" class="btn btn-primary dirty-aware">
+ </form>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="offlineHasAttributesFrag">
+ <div class="mb-3 font-weight-bold">Attributes (can only be edited when agent is online)</div>
+ <div class="border rounded">
+ <table class="table mb-0">
+ <thead>
+ <th>Name</th>
+ <th>Value</th>
+ </thead>
+ <tbody>
+ <tr wicket:id="attributes">
+ <td><span wicket:id="name"></span></td>
+ <td><span wicket:id="value"></span></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="offlineNoAttributesFrag">
+ <div class="alert alert-notice alert-light-warning">No attributes defined (can only be edited when agent is online)</div>
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java
new file mode 100644
index 0000000000..61abadcd64
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentOverviewPage.java
@@ -0,0 +1,150 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentAttributeManager;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.AgentAttribute;
+import io.onedev.server.web.component.AgentStatusBadge;
+import io.onedev.server.web.component.svg.SpriteImage;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.util.ConfirmClickModifier;
+
+@SuppressWarnings("serial")
+public class AgentOverviewPage extends AgentDetailPage {
+
+ public AgentOverviewPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new Link<Void>("restart") {
+
+ @Override
+ public void onClick() {
+ OneDev.getInstance(AgentManager.class).restart(getAgent());
+ setResponsePage(AgentOverviewPage.class, AgentOverviewPage.paramsOf(getAgent()));
+ Session.get().success("Restart command issued");
+ }
+
+ }.add(new ConfirmClickModifier("Do you really want to restart this agent?")));
+
+ add(new Link<Void>("remove") {
+
+ @Override
+ public void onClick() {
+ OneDev.getInstance(AgentManager.class).delete(getAgent());
+ setResponsePage(AgentListPage.class);
+ Session.get().success("Agent removed");
+ }
+
+ }.add(new ConfirmClickModifier("Do you really want to remove this agent?")));
+
+ add(new Link<Void>("pauseOrResume") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ return getAgent().isPaused()?"Resume":"Pause";
+ }
+
+ }));
+ }
+
+ @Override
+ public void onClick() {
+ getAgent().setPaused(!getAgent().isPaused());
+ OneDev.getInstance(AgentManager.class).save(getAgent());
+ setResponsePage(AgentOverviewPage.class, AgentOverviewPage.paramsOf(getAgent()));
+ }
+
+ });
+
+ add(new SpriteImage("icon", getAgent().getOs().name().toLowerCase()));
+ add(new Label("name", getAgent().getName()));
+ add(new Label("ipAddress", getAgent().getIpAddress()));
+ add(new Label("osVersion", getAgent().getOsVersion()));
+ add(new Label("osArch", getAgent().getOsArch()));
+ add(new Label("cpu", getAgent().getCpu()));
+ add(new Label("memory", getAgent().getMemory()));
+ add(new AgentStatusBadge("status", agentModel));
+
+ if (getAgent().isOnline()) {
+ Fragment fragment = new Fragment("attributes", "onlineAttributesFrag", this);
+ AgentEditBean bean = new AgentEditBean();
+ bean.getAttributes().addAll(getAgent().getAttributes());
+ bean.getAttributes().sort(Comparator.comparing(AgentAttribute::getName));
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ Map<String, String> attributeMap = new HashMap<>();
+ for (AgentAttribute attribute: bean.getAttributes())
+ attributeMap.put(attribute.getName(), attribute.getValue());
+ OneDev.getInstance(AgentAttributeManager.class).syncAttributes(getAgent(), attributeMap);
+ OneDev.getInstance(AgentManager.class).attributesUpdated(getAgent());
+ Session.get().success("Attributes saved");
+ }
+
+ };
+ form.add(BeanContext.edit("attributes", bean));
+ fragment.add(form);
+ add(fragment);
+ } else if (!getAgent().getAttributes().isEmpty()) {
+ Fragment fragment = new Fragment("attributes", "offlineHasAttributesFrag", this);
+ fragment.add(new ListView<AgentAttribute>("attributes", new LoadableDetachableModel<List<AgentAttribute>>() {
+
+ @Override
+ protected List<AgentAttribute> load() {
+ List<AgentAttribute> attributes = new ArrayList<>(getAgent().getAttributes());
+ attributes.sort(Comparator.comparing(AgentAttribute::getName));
+ return attributes;
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<AgentAttribute> item) {
+ item.add(new Label("name", item.getModelObject().getName()));
+ item.add(new Label("value", item.getModelObject().getValue()));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!getModelObject().isEmpty());
+ }
+
+ });
+ add(fragment);
+ } else {
+ add(new Fragment("attributes", "offlineNoAttributesFrag", this));
+ }
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.html
new file mode 100644
index 0000000000..c07469654c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.html
@@ -0,0 +1,19 @@
+<wicket:panel>
+ <div class="p-5 token-list">
+ <h6 class="text-center mb-4">Unused Agent Tokens</h6>
+ <div class="alert alert-light alert-notice mb-5">
+ Agent tokens are used to authorize agents. It should be configured via property <tt>agentToken</tt> in
+ file <tt>&lt;agent dir&gt;/conf/agent.properties</tt>. A token can only be used by one agent. A new
+ token will be generated automatically when agent is downloaded
+ </div>
+ <form wicket:id="form" class="mb-5 d-flex">
+ <input wicket:id="note" class="form-control flex-grow-1 mr-3" placeholder="Note of new token">
+ <a wicket:id="add" class="btn btn-icon btn-primary flex-shrink-0"><wicket:svg href="plus" class="icon"/></a>
+ </form>
+ <table wicket:id="tokens" class="table"></table>
+ </div>
+ <wicket:fragment wicket:id="actionsFrag">
+ <a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1"><wicket:svg href="copy" class="icon"/></a>
+ <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"/></a>
+ </wicket:fragment>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
new file mode 100644
index 0000000000..aee2c7e8db
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/TokenListPanel.java
@@ -0,0 +1,177 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
+
+import edu.emory.mathcs.backport.java.util.Collections;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.model.AgentToken;
+import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+
+@SuppressWarnings("serial")
+public class TokenListPanel extends GenericPanel<List<AgentToken>> {
+
+ private String note;
+
+ public TokenListPanel(String id) {
+ super(id);
+
+ setModel(new LoadableDetachableModel<List<AgentToken>>() {
+
+ @Override
+ protected List<AgentToken> load() {
+ List<AgentToken> tokens = getTokenManager().queryUnused();
+ Collections.sort(tokens);
+ return tokens;
+ }
+
+ });
+ }
+
+ private AgentTokenManager getTokenManager() {
+ return OneDev.getInstance(AgentTokenManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form");
+ form.add(new TextField<String>("note", new PropertyModel<String>(this, "note")));
+ form.add(new AjaxButton("add") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ AgentToken token = new AgentToken();
+ token.setValue(UUID.randomUUID().toString());
+ token.setNote(note);
+ getTokenManager().save(token);
+ target.add(TokenListPanel.this);
+
+ note = null;
+ }
+
+ });
+ add(form);
+
+ List<IColumn<AgentToken, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<AgentToken, Void>(Model.of("Value")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<AgentToken>> cellItem, String componentId,
+ IModel<AgentToken> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getValue()));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<AgentToken, Void>(Model.of("Note")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<AgentToken>> cellItem, String componentId,
+ IModel<AgentToken> rowModel) {
+ AgentToken token = rowModel.getObject();
+ if (token.getNote() != null)
+ cellItem.add(new Label(componentId, token.getNote()));
+ else
+ cellItem.add(new Label(componentId, "<i>No note</i>").setEscapeModelStrings(false));
+ }
+
+ });
+
+ columns.add(new AbstractColumn<AgentToken, Void>(Model.of("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<AgentToken>> cellItem, String componentId,
+ IModel<AgentToken> rowModel) {
+ Fragment fragment = new Fragment(componentId, "actionsFrag", TokenListPanel.this);
+
+ AgentToken token = rowModel.getObject();
+
+ fragment.add(new CopyToClipboardLink("copy", Model.of(token.getValue())));
+
+ Long tokenId = token.getId();
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this token?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getTokenManager().delete(getTokenManager().load(tokenId));
+ target.add(TokenListPanel.this);
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ });
+
+ SortableDataProvider<AgentToken, Void> dataProvider = new LoadableDetachableDataProvider<AgentToken, Void>() {
+
+ @Override
+ public Iterator<? extends AgentToken> iterator(long first, long count) {
+ return getModelObject().iterator();
+ }
+
+ @Override
+ public long calcSize() {
+ return getModelObject().size();
+ }
+
+ @Override
+ public IModel<AgentToken> model(AgentToken token) {
+ Long tokenId = token.getId();
+ return new LoadableDetachableModel<AgentToken>() {
+
+ @Override
+ protected AgentToken load() {
+ return getTokenManager().load(tokenId);
+ }
+
+ };
+ }
+
+ };
+
+ DataTable<AgentToken, Void> table;
+ add(table = new DataTable<AgentToken, Void>("tokens", columns, dataProvider, Integer.MAX_VALUE));
+ table.addBottomToolbar(new NoRecordsToolbar(table));
+ table.add(new NoRecordsBehavior());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/agent.css b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/agent.css
new file mode 100644
index 0000000000..06096d8785
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/agent.css
@@ -0,0 +1,3 @@
+.floating .token-list {
+ width: 600px;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.java
similarity index 85%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.java
index d8d4db7610..a952173f3f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorBean.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.jobexecutor;
+package io.onedev.server.web.page.admin.buildsetting.jobexecutor;
import java.io.Serializable;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
similarity index 83%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
index 50b69ca8b6..cfbe801536 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.jobexecutor;
+package io.onedev.server.web.page.admin.buildsetting.jobexecutor;
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;
@@ -20,8 +20,8 @@ import org.apache.wicket.util.visit.IVisitor;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.Path;
import io.onedev.server.util.PathNode;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
@@ -53,6 +53,25 @@ abstract class JobExecutorEditPanel extends Panel {
}
return null;
}
+
+ @SuppressWarnings("unchecked")
+ @Nullable
+ private Class<? extends Serializable> getTestDataClass(Class<?> clazz) {
+ Class<? extends Serializable> testDataClass = null;
+ for (Type type: clazz.getGenericInterfaces()) {
+ if (type instanceof ParameterizedType) {
+ ParameterizedType parameterizedType = (ParameterizedType) type;
+ if (parameterizedType.getRawType() == Testable.class) {
+ testDataClass = (Class<? extends Serializable>) parameterizedType.getActualTypeArguments()[0];
+ break;
+ }
+ }
+ }
+ if (clazz != Object.class && testDataClass == null)
+ return getTestDataClass(clazz.getSuperclass());
+ else
+ return testDataClass;
+ }
@Override
protected void onInitialize() {
@@ -114,7 +133,6 @@ abstract class JobExecutorEditPanel extends Panel {
private Serializable testData;
- @SuppressWarnings("unchecked")
@Override
protected void onConfigure() {
super.onConfigure();
@@ -129,14 +147,7 @@ abstract class JobExecutorEditPanel extends Panel {
if (executorEditor != null
&& executorEditor.isVisibleInHierarchy()
&& Testable.class.isAssignableFrom(executorEditor.getDescriptor().getBeanClass())) {
- Class<? extends Serializable> testDataClass = null;
- for (Type type: executorEditor.getDescriptor().getBeanClass().getGenericInterfaces()) {
- ParameterizedType parameterizedType = (ParameterizedType) type;
- if (parameterizedType.getRawType() == Testable.class) {
- testDataClass = (Class<? extends Serializable>) parameterizedType.getActualTypeArguments()[0];
- break;
- }
- }
+ Class<? extends Serializable> testDataClass = getTestDataClass(executorEditor.getDescriptor().getBeanClass());
if (testDataClass != null) {
if (testData == null || testData.getClass() != testDataClass) {
try {
@@ -181,7 +192,7 @@ abstract class JobExecutorEditPanel extends Panel {
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
- protected String runTask(SimpleLogger logger) {
+ protected String runTask(TaskLogger logger) {
((Testable)bean.getExecutor()).test(testData, logger);
return "Job executor tested successfully";
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorPanel.java
similarity index 94%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorPanel.java
index 8355a927fa..b2dfc27bd9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.jobexecutor;
+package io.onedev.server.web.page.admin.buildsetting.jobexecutor;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.html
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
similarity index 95%
rename from server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
index db230d3e99..12d69d27da 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/jobexecutor/JobExecutorsPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.admin.jobexecutor;
+package io.onedev.server.web.page.admin.buildsetting.jobexecutor;
import java.util.List;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/serverresource/ServerResourcesSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/serverresource/ServerResourcesSettingPage.html
new file mode 100644
index 0000000000..ebe02fc702
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/serverresource/ServerResourcesSettingPage.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/buildsetting/serverresource/ServerResourcesSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/serverresource/ServerResourcesSettingPage.java
new file mode 100644
index 0000000000..d5c20f4f45
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/serverresource/ServerResourcesSettingPage.java
@@ -0,0 +1,49 @@
+package io.onedev.server.web.page.admin.buildsetting.serverresource;
+
+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.GlobalBuildSetting;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class ServerResourcesSettingPage extends AdministrationPage {
+
+ public ServerResourcesSettingPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ GlobalBuildSetting buildSetting = OneDev.getInstance(SettingManager.class).getBuildSetting();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ OneDev.getInstance(SettingManager.class).saveBuildSetting(buildSetting);
+ getSession().success("Server resource setting has been saved");
+
+ setResponsePage(ServerResourcesSettingPage.class);
+ }
+
+ };
+ form.add(BeanContext.edit("editor", buildSetting));
+
+ add(form);
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Server Resource");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
index 8d5fedccb6..69366fce98 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/databasebackup/DatabaseBackupPage.java
@@ -11,8 +11,8 @@ import org.apache.wicket.markup.html.link.ResourceLink;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
+import io.onedev.commons.launcher.bootstrap.BootstrapUtils;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.persistence.PersistManager;
@@ -61,7 +61,7 @@ public class DatabaseBackupPage extends AdministrationPage {
try {
PersistManager persistManager = OneDev.getInstance(PersistManager.class);
persistManager.exportData(tempDir);
- ZipUtils.zip(tempDir, attributes.getResponse().getOutputStream());
+ BootstrapUtils.zip(tempDir, attributes.getResponse().getOutputStream());
} finally {
FileUtils.deleteDir(tempDir);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
index 656e05fd77..a9c7e7bca3 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.java
@@ -18,6 +18,7 @@ import org.apache.wicket.util.visit.IVisitor;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.User;
@@ -28,7 +29,6 @@ import io.onedev.server.notification.MailManager;
import io.onedev.server.notification.MessageListener;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.EmailAddress;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
@@ -98,7 +98,7 @@ public class MailSettingPage extends AdministrationPage {
}
@Override
- protected String runTask(SimpleLogger logger) {
+ protected String runTask(TaskLogger logger) {
User user = SecurityUtils.getUser();
MailManager mailManager = OneDev.getInstance(MailManager.class);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
index 06fbe9cd00..3922b55b30 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/serverlog/ServerLogPage.html
@@ -1,8 +1,8 @@
<wicket:extend>
- <div wicket:id="warning" class="alert alert-notice alert-light-warning shadow mb-4"></div>
<div class="card server-log">
<div class="card-body">
<a wicket:id="download" class="btn btn-light btn-hover-primary btn-block mb-4" title="Download log"><wicket:svg href="download" class="icon mr-2"/> Download</a>
+ <div wicket:id="warning" class="alert alert-notice alert-light-warning mb-4"></div>
<pre wicket:id="logContent"></pre>
</div>
</div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
index b4392a06a8..ed64e2e025 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
@@ -20,12 +20,13 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -80,25 +81,17 @@ public class BuildListPage extends LayoutPage {
}
@Override
- protected QuerySetting<NamedBuildQuery> getQuerySetting() {
- if (getLoginUser() != null)
- return getLoginUser().getBuildQuerySetting();
- else
- return null;
+ protected QueryPersonalization<NamedBuildQuery> getQueryPersonalization() {
+ return getLoginUser().getBuildQueryPersonalization();
}
@Override
- protected ArrayList<NamedBuildQuery> getQueries() {
+ protected ArrayList<NamedBuildQuery> getGlobalQueries() {
return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedBuildQuery> querySetting) {
- OneDev.getInstance(UserManager.class).save(getLoginUser());
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedBuildQuery> namedQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedBuildQuery> namedQueries) {
getBuildSetting().setNamedQueries(namedQueries);
OneDev.getInstance(SettingManager.class).saveBuildSetting(getBuildSetting());
}
@@ -155,15 +148,15 @@ public class BuildListPage extends LayoutPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- QuerySetting<NamedBuildQuery> querySetting = getLoginUser().getBuildQuerySetting();
- NamedBuildQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ QueryPersonalization<NamedBuildQuery> queryPersonalization = getLoginUser().getBuildQueryPersonalization();
+ NamedBuildQuery namedQuery = NamedQuery.find(queryPersonalization.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedBuildQuery(name, query);
- querySetting.getUserQueries().add(namedQuery);
+ queryPersonalization.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -171,9 +164,11 @@ public class BuildListPage extends LayoutPage {
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
GlobalBuildSetting buildSetting = getBuildSetting();
NamedBuildQuery namedQuery = buildSetting.getNamedQuery(name);
if (namedQuery == null) {
@@ -236,8 +231,8 @@ public class BuildListPage extends LayoutPage {
public static PageParameters paramsOf(int page, int expectedCount) {
String query = null;
User user = SecurityUtils.getUser();
- if (user != null && !user.getBuildQuerySetting().getUserQueries().isEmpty())
- query = user.getBuildQuerySetting().getUserQueries().iterator().next().getQuery();
+ if (user != null && !user.getBuildQueryPersonalization().getQueries().isEmpty())
+ query = user.getBuildQueryPersonalization().getQueries().iterator().next().getQuery();
else if (!getBuildSetting().getNamedQueries().isEmpty())
query = getBuildSetting().getNamedQueries().iterator().next().getQuery();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
index 93b2b26f6b..1c6c31016d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ApiHelpUtils.java
@@ -16,8 +16,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
import javax.persistence.Transient;
import org.objenesis.ObjenesisStd;
@@ -115,7 +117,7 @@ public class ApiHelpUtils {
for (Field field: getJsonFields(instantiationClass)) {
Object fieldValue = new ExampleProvider(valueClass, field.getAnnotation(Api.class)).getExample();
if (fieldValue == null) {
- if (field.getAnnotation(ManyToOne.class) != null) {
+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null) {
fieldValue = field.getType().newInstance();
Field idField = AbstractEntity.class.getDeclaredField("id");
Object id = new ExampleProvider(idField.getType(), idField.getAnnotation(Api.class)).getExample();
@@ -177,6 +179,7 @@ public class ApiHelpUtils {
if (field.getAnnotation(JsonIgnore.class) != null
|| field.getAnnotation(OneToMany.class) != null
|| field.getAnnotation(Transient.class) != null
+ || field.getAnnotation(OneToOne.class) != null && field.getAnnotation(JoinColumn.class) == null
|| Modifier.isTransient(field.getModifiers()))
continue;
if (field.getAnnotation(JsonProperty.class) != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
index ae9dd16e56..e10c07da53 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/help/ExampleValuePanel.java
@@ -17,6 +17,7 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.Pattern;
import javax.annotation.Nullable;
+import javax.persistence.JoinColumn;
import javax.persistence.ManyToOne;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
@@ -130,7 +131,9 @@ public class ExampleValuePanel extends Panel {
StringBuilder builder = new StringBuilder();
if (isScalarValue()) {
builder.append(toJson(getValue()));
- } else if (getField() != null && getField().getAnnotation(ManyToOne.class) != null) {
+ } else if (getField() != null
+ && (getField().getAnnotation(ManyToOne.class) != null
+ || getField().getAnnotation(JoinColumn.class) != null)) {
builder.append(toJson(((AbstractEntity)getValue()).getId()));
} else if (getValue() instanceof Collection) {
List<String> elements = new ArrayList<>();
@@ -200,16 +203,19 @@ public class ExampleValuePanel extends Panel {
@Override
protected void onBeforeRender() {
- if (isScalarValue())
+ if (isScalarValue()) {
addOrReplace(newScalarFragment(getValue()));
- else if (getField() != null && getField().getAnnotation(ManyToOne.class) != null)
+ } else if (getField() != null
+ && (getField().getAnnotation(ManyToOne.class) != null
+ || getField().getAnnotation(JoinColumn.class) != null)) {
addOrReplace(newScalarFragment(((AbstractEntity)getValue()).getId()));
- else if (getValue() instanceof Collection)
+ } else if (getValue() instanceof Collection) {
addOrReplace(newArrayFragment());
- else if (getValue() instanceof Map)
+ } else if (getValue() instanceof Map) {
addOrReplace(newMapFragment());
- else
+ } else {
addOrReplace(newObjectFragment());
+ }
if (newValueHint("psuedoId") != null) {
addOrReplace(new DropdownLink("hint") {
@@ -247,7 +253,9 @@ public class ExampleValuePanel extends Panel {
fragment.add(typeHintFrag);
hasHint = true;
} else if (getField() != null) {
- if (getField().getAnnotation(ManyToOne.class) != null || getField().getAnnotation(EntityId.class) != null) {
+ if (getField().getAnnotation(ManyToOne.class) != null
+ || getField().getAnnotation(JoinColumn.class) != null
+ || getField().getAnnotation(EntityId.class) != null) {
Class<?> entityClass;
if (getValue() instanceof AbstractEntity)
entityClass = getValue().getClass();
@@ -553,7 +561,7 @@ public class ExampleValuePanel extends Panel {
}
};
- if (field.getAnnotation(ManyToOne.class) != null)
+ if (field.getAnnotation(ManyToOne.class) != null || field.getAnnotation(JoinColumn.class) != null)
item.add(new ExampleValuePanel("name", Model.of(field.getName() + "Id"), valueInfoModel, requestBodyClass));
else
item.add(new ExampleValuePanel("name", Model.of(field.getName()), valueInfoModel, requestBodyClass));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
index 4b46087d53..ae7c3250ba 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
@@ -20,13 +20,14 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -84,26 +85,18 @@ public class IssueListPage extends LayoutPage {
}
@Override
- protected QuerySetting<NamedIssueQuery> getQuerySetting() {
- if (getLoginUser() != null)
- return getLoginUser().getIssueQuerySetting();
- else
- return null;
+ protected QueryPersonalization<NamedIssueQuery> getQueryPersonalization() {
+ return getLoginUser().getIssueQueryPersonalization();
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {
- OneDev.getInstance(UserManager.class).save(getLoginUser());
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedIssueQuery> queries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedIssueQuery> queries) {
getIssueSetting().setNamedQueries(queries);
OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());
}
@Override
- protected ArrayList<NamedIssueQuery> getQueries() {
+ protected ArrayList<NamedIssueQuery> getGlobalQueries() {
return (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();
}
@@ -161,15 +154,15 @@ public class IssueListPage extends LayoutPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- QuerySetting<NamedIssueQuery> querySetting = getLoginUser().getIssueQuerySetting();
- NamedIssueQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ QueryPersonalization<NamedIssueQuery> queryPersonalization = getLoginUser().getIssueQueryPersonalization();
+ NamedIssueQuery namedQuery = NamedQuery.find(queryPersonalization.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedIssueQuery(name, query);
- querySetting.getUserQueries().add(namedQuery);
+ queryPersonalization.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -177,9 +170,11 @@ public class IssueListPage extends LayoutPage {
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
GlobalIssueSetting issueSetting = getIssueSetting();
NamedIssueQuery namedQuery = issueSetting.getNamedQuery(name);
if (namedQuery == null) {
@@ -240,8 +235,8 @@ public class IssueListPage extends LayoutPage {
public static PageParameters paramsOf(int page) {
String query = null;
User user = SecurityUtils.getUser();
- if (user != null && !user.getIssueQuerySetting().getUserQueries().isEmpty())
- query = user.getIssueQuerySetting().getUserQueries().iterator().next().getQuery();
+ if (user != null && !user.getIssueQueryPersonalization().getQueries().isEmpty())
+ query = user.getIssueQueryPersonalization().getQueries().iterator().next().getQuery();
else if (!getIssueSetting().getNamedQueries().isEmpty())
query = getIssueSetting().getNamedQueries().iterator().next().getQuery();
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 85f93bbff3..37bb37b4e1 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
@@ -45,6 +45,10 @@ import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.UserAvatar;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;
+import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;
+import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;
+import io.onedev.server.web.page.admin.buildsetting.serverresource.ServerResourcesSettingPage;
import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
import io.onedev.server.web.page.admin.generalsecuritysetting.GeneralSecuritySettingPage;
import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;
@@ -56,7 +60,6 @@ import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
import io.onedev.server.web.page.admin.issuesetting.transitionspec.StateTransitionListPage;
-import io.onedev.server.web.page.admin.jobexecutor.JobExecutorsPage;
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;
@@ -148,9 +151,20 @@ public abstract class LayoutPage extends BasePage {
DefaultBoardListPage.class, new PageParameters()));
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Description Templates",
IssueTemplateListPage.class, new PageParameters()));
-
+
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Setting", issueSettingMenuItems));
+ List<SidebarMenuItem> buildSettingMenuItems = new ArrayList<>();
+
+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
+ JobExecutorsPage.class, new PageParameters()));
+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Server Resources", ServerResourcesSettingPage.class,
+ new PageParameters()));
+ buildSettingMenuItems.add(new SidebarMenuItem.Page(null, "Agents",
+ AgentListPage.class, AgentListPage.paramsOf(0), Lists.newArrayList(AgentDetailPage.class)));
+
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Build Setting", buildSettingMenuItems));
+
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Mail Setting",
MailSettingPage.class, new PageParameters()));
@@ -166,8 +180,6 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Notification Templates",
notificationTemplateSettingMenuItems));
- administrationMenuItems.add(new SidebarMenuItem.Page(null, "Job Executors",
- JobExecutorsPage.class, new PageParameters()));
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
GroovyScriptListPage.class, new PageParameters()));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index 9b6f171725..76d1a69c9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -20,11 +20,12 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedProjectQuery;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.administration.GlobalProjectSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.project.list.ProjectListPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -79,25 +80,17 @@ public class ProjectListPage extends LayoutPage {
}
@Override
- protected QuerySetting<NamedProjectQuery> getQuerySetting() {
- if (getLoginUser() != null)
- return getLoginUser().getProjectQuerySetting();
- else
- return null;
+ protected QueryPersonalization<NamedProjectQuery> getQueryPersonalization() {
+ return getLoginUser().getProjectQueryPersonalization();
}
@Override
- protected ArrayList<NamedProjectQuery> getQueries() {
+ protected ArrayList<NamedProjectQuery> getGlobalQueries() {
return (ArrayList<NamedProjectQuery>) getProjectSetting().getNamedQueries();
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedProjectQuery> querySetting) {
- OneDev.getInstance(UserManager.class).save(getLoginUser());
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedProjectQuery> namedQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedProjectQuery> namedQueries) {
getProjectSetting().setNamedQueries(namedQueries);
OneDev.getInstance(SettingManager.class).saveProjectSetting(getProjectSetting());
}
@@ -156,15 +149,15 @@ public class ProjectListPage extends LayoutPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- QuerySetting<NamedProjectQuery> querySetting = getLoginUser().getProjectQuerySetting();
- NamedProjectQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ QueryPersonalization<NamedProjectQuery> queryPersonalization = getLoginUser().getProjectQueryPersonalization();
+ NamedProjectQuery namedQuery = NamedQuery.find(queryPersonalization.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedProjectQuery(name, query);
- querySetting.getUserQueries().add(namedQuery);
+ queryPersonalization.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -172,9 +165,11 @@ public class ProjectListPage extends LayoutPage {
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
GlobalProjectSetting projectSetting = getProjectSetting();
NamedProjectQuery namedQuery = projectSetting.getNamedQuery(name);
if (namedQuery == null) {
@@ -233,8 +228,8 @@ public class ProjectListPage extends LayoutPage {
String query = null;
User user = SecurityUtils.getUser();
- if (user != null && !user.getProjectQuerySetting().getUserQueries().isEmpty()) {
- query = user.getProjectQuerySetting().getUserQueries().iterator().next().getQuery();
+ if (user != null && !user.getProjectQueryPersonalization().getQueries().isEmpty()) {
+ query = user.getProjectQueryPersonalization().getQueries().iterator().next().getQuery();
} else {
if (!getProjectSetting().getNamedQueries().isEmpty())
query = getProjectSetting().getNamedQueries().iterator().next().getQuery();
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index da86dd8f50..1be8a7dadb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -15,18 +15,19 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildQuerySettingManager;
+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.BuildQuerySetting;
+import io.onedev.server.model.BuildQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.build.ProjectBuildSetting;
import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -53,8 +54,8 @@ public class ProjectBuildsPage extends ProjectPage {
query = getPageParameters().get(PARAM_QUERY).toOptionalString();
}
- private BuildQuerySettingManager getBuildQuerySettingManager() {
- return OneDev.getInstance(BuildQuerySettingManager.class);
+ private BuildQueryPersonalizationManager getBuildQueryPersonalizationManager() {
+ return OneDev.getInstance(BuildQueryPersonalizationManager.class);
}
protected GlobalBuildSetting getBuildSetting() {
@@ -79,22 +80,17 @@ public class ProjectBuildsPage extends ProjectPage {
}
@Override
- protected QuerySetting<NamedBuildQuery> getQuerySetting() {
- return getProject().getBuildQuerySettingOfCurrentUser();
+ protected QueryPersonalization<NamedBuildQuery> getQueryPersonalization() {
+ return getProject().getBuildQueryPersonalizationOfCurrentUser();
}
@Override
- protected ArrayList<NamedBuildQuery> getQueries() {
+ protected ArrayList<NamedBuildQuery> getGlobalQueries() {
return (ArrayList<NamedBuildQuery>) getProject().getBuildSetting().getNamedQueries(false);
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedBuildQuery> querySetting) {
- getBuildQuerySettingManager().save((BuildQuerySetting) querySetting);
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedBuildQuery> namedQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedBuildQuery> namedQueries) {
getProject().getBuildSetting().setNamedQueries(namedQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@@ -156,25 +152,27 @@ public class ProjectBuildsPage extends ProjectPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- BuildQuerySetting setting = getProject().getBuildQuerySettingOfCurrentUser();
- NamedBuildQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ BuildQueryPersonalization setting = getProject().getBuildQueryPersonalizationOfCurrentUser();
+ NamedBuildQuery namedQuery = NamedQuery.find(setting.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedBuildQuery(name, query);
- setting.getUserQueries().add(namedQuery);
+ setting.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
- getBuildQuerySettingManager().save(setting);
+ getBuildQueryPersonalizationManager().save(setting);
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
ProjectBuildSetting setting = getProject().getBuildSetting();
if (setting.getNamedQueries(false) == null)
setting.setNamedQueries(new ArrayList<>(getBuildSetting().getNamedQueries()));
@@ -194,7 +192,7 @@ public class ProjectBuildsPage extends ProjectPage {
protected void onCancel(AjaxRequestTarget target) {
close();
}
-
+
};
}
@@ -236,9 +234,9 @@ public class ProjectBuildsPage extends ProjectPage {
public static PageParameters paramsOf(Project project, int page) {
String query = null;
- if (project.getBuildQuerySettingOfCurrentUser() != null
- && !project.getBuildQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {
- query = project.getBuildQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();
+ if (project.getBuildQueryPersonalizationOfCurrentUser() != null
+ && !project.getBuildQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
+ query = project.getBuildQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
} else if (!project.getBuildSetting().getNamedQueries(true).isEmpty()) {
query = project.getBuildSetting().getNamedQueries(true).iterator().next().getQuery();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index f9ff8aed97..adc229796b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -15,16 +15,17 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CodeCommentQuerySettingManager;
+import io.onedev.server.entitymanager.CodeCommentQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.CodeCommentQuerySetting;
+import io.onedev.server.model.CodeCommentQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.codecomment.CodeCommentListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -50,8 +51,8 @@ public class ProjectCodeCommentsPage extends ProjectPage {
query = getPageParameters().get(PARAM_QUERY).toString();
}
- private CodeCommentQuerySettingManager getCodeCommentQuerySettingManager() {
- return OneDev.getInstance(CodeCommentQuerySettingManager.class);
+ private CodeCommentQueryPersonalizationManager getCodeCommentQueryPersonalizationManager() {
+ return OneDev.getInstance(CodeCommentQueryPersonalizationManager.class);
}
@Override
@@ -79,22 +80,17 @@ public class ProjectCodeCommentsPage extends ProjectPage {
}
@Override
- protected QuerySetting<NamedCodeCommentQuery> getQuerySetting() {
- return getProject().getCodeCommentQuerySettingOfCurrentUser();
+ protected QueryPersonalization<NamedCodeCommentQuery> getQueryPersonalization() {
+ return getProject().getCodeCommentQueryPersonalizationOfCurrentUser();
}
@Override
- protected ArrayList<NamedCodeCommentQuery> getQueries() {
+ protected ArrayList<NamedCodeCommentQuery> getGlobalQueries() {
return getProject().getNamedCodeCommentQueries();
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedCodeCommentQuery> querySetting) {
- getCodeCommentQuerySettingManager().save((CodeCommentQuerySetting) querySetting);
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {
getProject().setNamedCodeCommentQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@@ -156,25 +152,27 @@ public class ProjectCodeCommentsPage extends ProjectPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- CodeCommentQuerySetting setting = getProject().getCodeCommentQuerySettingOfCurrentUser();
- NamedCodeCommentQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ CodeCommentQueryPersonalization setting = getProject().getCodeCommentQueryPersonalizationOfCurrentUser();
+ NamedCodeCommentQuery namedQuery = NamedQuery.find(setting.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedCodeCommentQuery(name, query);
- setting.getUserQueries().add(namedQuery);
+ setting.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
- getCodeCommentQuerySettingManager().save(setting);
+ getCodeCommentQueryPersonalizationManager().save(setting);
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
NamedCodeCommentQuery namedQuery = NamedQuery.find(getProject().getNamedCodeCommentQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedCodeCommentQuery(name, query);
@@ -226,9 +224,9 @@ public class ProjectCodeCommentsPage extends ProjectPage {
public static PageParameters paramsOf(Project project, int page) {
String query = null;
- if (project.getCodeCommentQuerySettingOfCurrentUser() != null
- && !project.getCodeCommentQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {
- query = project.getCodeCommentQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();
+ if (project.getCodeCommentQueryPersonalizationOfCurrentUser() != null
+ && !project.getCodeCommentQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
+ query = project.getCodeCommentQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
} else if (!project.getNamedCodeCommentQueries().isEmpty()) {
query = project.getNamedCodeCommentQueries().iterator().next().getQuery();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 8bdc662b25..50f4a601ff 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -15,16 +15,17 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.CommitQuerySettingManager;
+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.CommitQuerySetting;
+import io.onedev.server.model.CommitQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.commit.list.CommitListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -52,8 +53,8 @@ public class ProjectCommitsPage extends ProjectPage {
compare = params.get(PARAM_COMPARE).toString();
}
- private CommitQuerySettingManager getCommitQuerySettingManager() {
- return OneDev.getInstance(CommitQuerySettingManager.class);
+ private CommitQueryPersonalizationManager getCommitQueryPersonalizationManager() {
+ return OneDev.getInstance(CommitQueryPersonalizationManager.class);
}
@Override
@@ -81,22 +82,17 @@ public class ProjectCommitsPage extends ProjectPage {
}
@Override
- protected QuerySetting<NamedCommitQuery> getQuerySetting() {
- return getProject().getCommitQuerySettingOfCurrentUser();
+ protected QueryPersonalization<NamedCommitQuery> getQueryPersonalization() {
+ return getProject().getCommitQueryPersonalizationOfCurrentUser();
}
@Override
- protected ArrayList<NamedCommitQuery> getQueries() {
+ protected ArrayList<NamedCommitQuery> getGlobalQueries() {
return getProject().getNamedCommitQueries();
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedCommitQuery> querySetting) {
- getCommitQuerySettingManager().save((CommitQuerySetting) querySetting);
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedCommitQuery> projectQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedCommitQuery> projectQueries) {
getProject().setNamedCommitQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@@ -135,25 +131,27 @@ public class ProjectCommitsPage extends ProjectPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- CommitQuerySetting setting = getProject().getCommitQuerySettingOfCurrentUser();
- NamedCommitQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ CommitQueryPersonalization setting = getProject().getCommitQueryPersonalizationOfCurrentUser();
+ NamedCommitQuery namedQuery = NamedQuery.find(setting.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedCommitQuery(name, query);
- setting.getUserQueries().add(namedQuery);
+ setting.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
- getCommitQuerySettingManager().save(setting);
+ getCommitQueryPersonalizationManager().save(setting);
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
NamedCommitQuery namedQuery = NamedQuery.find(getProject().getNamedCommitQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedCommitQuery(name, query);
@@ -170,7 +168,7 @@ public class ProjectCommitsPage extends ProjectPage {
protected void onCancel(AjaxRequestTarget target) {
close();
}
-
+
};
}
@@ -210,9 +208,9 @@ public class ProjectCommitsPage extends ProjectPage {
public static PageParameters paramsOf(Project project, @Nullable String compareWith) {
String query = null;
- if (project.getCommitQuerySettingOfCurrentUser() != null
- && !project.getCommitQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {
- query = project.getCommitQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();
+ if (project.getCommitQueryPersonalizationOfCurrentUser() != null
+ && !project.getCommitQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
+ query = project.getCommitQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
} else if (!project.getNamedCommitQueries().isEmpty()) {
query = project.getNamedCommitQueries().iterator().next().getQuery();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
index 84ee2f1427..ae2f5e24b9 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/imports/ProjectImportPage.java
@@ -10,6 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Lists;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.imports.Importer;
import io.onedev.server.imports.ProjectImporter;
@@ -19,7 +20,6 @@ import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.imports.ImportPanel;
import io.onedev.server.web.page.layout.LayoutPage;
import io.onedev.server.web.page.project.ProjectListPage;
@@ -62,7 +62,7 @@ public class ProjectImportPage<Where extends Serializable, What extends Serializ
@Override
protected String doImport(Where where, What what, How how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
return importer.doImport(where, what, how, dryRun, logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
index d8dc05cb6a..c05d649666 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/imports/IssueImportPage.java
@@ -10,6 +10,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.collect.Lists;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.imports.Importer;
import io.onedev.server.imports.IssueImporter;
@@ -20,7 +21,6 @@ import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.imports.ImportPanel;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
@@ -63,7 +63,7 @@ public class IssueImportPage<Where extends Serializable, What extends Serializab
@Override
protected String doImport(Where where, What what, How how, boolean dryRun,
- SimpleLogger logger) {
+ TaskLogger logger) {
return importer.doImport(where, what, how, getProject(), dryRun, logger);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index 2c3c9eead6..df16d2f325 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -15,16 +15,17 @@ import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.IssueQuerySettingManager;
+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.IssueQuerySetting;
+import io.onedev.server.model.IssueQueryPersonalization;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.ProjectIssueSetting;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -51,8 +52,8 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
query = getPageParameters().get(PARAM_QUERY).toOptionalString();
}
- private IssueQuerySettingManager getIssueQuerySettingManager() {
- return OneDev.getInstance(IssueQuerySettingManager.class);
+ private IssueQueryPersonalizationManager getIssueQueryPersonalizationManager() {
+ return OneDev.getInstance(IssueQueryPersonalizationManager.class);
}
@Override
@@ -73,22 +74,17 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
}
@Override
- protected QuerySetting<NamedIssueQuery> getQuerySetting() {
- return getProject().getIssueQuerySettingOfCurrentUser();
+ protected QueryPersonalization<NamedIssueQuery> getQueryPersonalization() {
+ return getProject().getIssueQueryPersonalizationOfCurrentUser();
}
@Override
- protected ArrayList<NamedIssueQuery> getQueries() {
+ protected ArrayList<NamedIssueQuery> getGlobalQueries() {
return (ArrayList<NamedIssueQuery>) getProject().getIssueSetting().getNamedQueries(false);
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {
- getIssueQuerySettingManager().save((IssueQuerySetting) querySetting);
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedIssueQuery> namedQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedIssueQuery> namedQueries) {
getProject().getIssueSetting().setNamedQueries(namedQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@@ -152,25 +148,27 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();
- NamedIssueQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ IssueQueryPersonalization setting = getProject().getIssueQueryPersonalizationOfCurrentUser();
+ NamedIssueQuery namedQuery = NamedQuery.find(setting.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedIssueQuery(name, query);
- setting.getUserQueries().add(namedQuery);
+ setting.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
- getIssueQuerySettingManager().save(setting);
+ getIssueQueryPersonalizationManager().save(setting);
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
ProjectIssueSetting setting = getProject().getIssueSetting();
if (setting.getNamedQueries(false) == null)
setting.setNamedQueries(new ArrayList<>(getIssueSetting().getNamedQueries()));
@@ -232,9 +230,9 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
public static PageParameters paramsOf(Project project, int page) {
String query = null;
- if (project.getIssueQuerySettingOfCurrentUser() != null
- && !project.getIssueQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {
- query = project.getIssueQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();
+ if (project.getIssueQueryPersonalizationOfCurrentUser() != null
+ && !project.getIssueQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
+ query = project.getIssueQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
} else if (!project.getIssueSetting().getNamedQueries(true).isEmpty()) {
query = project.getIssueSetting().getNamedQueries(true).iterator().next().getQuery();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index bad4216a50..29f37b43be 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -16,18 +16,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.PullRequestQuerySettingManager;
+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequestQuerySetting;
+import io.onedev.server.model.PullRequestQueryPersonalization;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -54,8 +55,8 @@ public class ProjectPullRequestsPage extends ProjectPage {
query = getPageParameters().get(PARAM_QUERY).toOptionalString();
}
- private PullRequestQuerySettingManager getPullRequestQuerySettingManager() {
- return OneDev.getInstance(PullRequestQuerySettingManager.class);
+ private PullRequestQueryPersonalizationManager getPullRequestQueryPersonalizationManager() {
+ return OneDev.getInstance(PullRequestQueryPersonalizationManager.class);
}
protected GlobalPullRequestSetting getPullRequestSetting() {
@@ -80,12 +81,12 @@ public class ProjectPullRequestsPage extends ProjectPage {
}
@Override
- protected QuerySetting<NamedPullRequestQuery> getQuerySetting() {
- return getProject().getPullRequestQuerySettingOfCurrentUser();
+ protected QueryPersonalization<NamedPullRequestQuery> getQueryPersonalization() {
+ return getProject().getPullRequestQueryPersonalizationOfCurrentUser();
}
@Override
- protected ArrayList<NamedPullRequestQuery> getQueries() {
+ protected ArrayList<NamedPullRequestQuery> getGlobalQueries() {
return (ArrayList<NamedPullRequestQuery>) getProject().getPullRequestSetting().getNamedQueries(false);
}
@@ -93,14 +94,9 @@ public class ProjectPullRequestsPage extends ProjectPage {
protected ArrayList<NamedPullRequestQuery> getDefaultQueries() {
return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();
}
-
- @Override
- protected void onSaveQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {
- getPullRequestQuerySettingManager().save((PullRequestQuerySetting) querySetting);
- }
@Override
- protected void onSaveQueries(ArrayList<NamedPullRequestQuery> namedQueries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedPullRequestQuery> namedQueries) {
getProject().getPullRequestSetting().setNamedQueries(namedQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@@ -159,25 +155,27 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- PullRequestQuerySetting setting = getProject().getPullRequestQuerySettingOfCurrentUser();
- NamedPullRequestQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ PullRequestQueryPersonalization setting = getProject().getPullRequestQueryPersonalizationOfCurrentUser();
+ NamedPullRequestQuery namedQuery = NamedQuery.find(setting.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedPullRequestQuery(name, query);
- setting.getUserQueries().add(namedQuery);
+ setting.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
- getPullRequestQuerySettingManager().save(setting);
+ getPullRequestQueryPersonalizationManager().save(setting);
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
ProjectPullRequestSetting setting = getProject().getPullRequestSetting();
if (setting.getNamedQueries(false) == null)
setting.setNamedQueries(new ArrayList<>(getPullRequestSetting().getNamedQueries()));
@@ -244,9 +242,9 @@ public class ProjectPullRequestsPage extends ProjectPage {
public static PageParameters paramsOf(Project project, int page) {
String query = null;
- if (project.getPullRequestQuerySettingOfCurrentUser() != null
- && !project.getPullRequestQuerySettingOfCurrentUser().getUserQueries().isEmpty()) {
- query = project.getPullRequestQuerySettingOfCurrentUser().getUserQueries().iterator().next().getQuery();
+ if (project.getPullRequestQueryPersonalizationOfCurrentUser() != null
+ && !project.getPullRequestQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
+ query = project.getPullRequestQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
} else if (!project.getPullRequestSetting().getNamedQueries(true).isEmpty()) {
query = project.getPullRequestSetting().getNamedQueries(true).iterator().next().getQuery();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
index 80e33a9c42..91e6ce600f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ActionAuthorizationsPage.java
@@ -30,7 +30,7 @@ import io.onedev.server.web.component.datatable.OneDataTable;
import io.onedev.server.web.component.modal.ModalPanel;
@SuppressWarnings("serial")
-public class ActionAuthorizationsPage extends BuildSettingPage {
+public class ActionAuthorizationsPage extends ProjectBuildSettingPage {
private DataTable<ActionAuthorization, Void> authorizationsTable;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
index 6a9b508eb9..6d0b805a88 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildPreservationsPage.java
@@ -14,7 +14,7 @@ import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
-public class BuildPreservationsPage extends BuildSettingPage {
+public class BuildPreservationsPage extends ProjectBuildSettingPage {
public BuildPreservationsPage(PageParameters params) {
super(params);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java
index 467a79b1b4..d856980d0e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/DefaultFixedIssueFiltersPage.java
@@ -14,7 +14,7 @@ import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyEditor;
@SuppressWarnings("serial")
-public class DefaultFixedIssueFiltersPage extends BuildSettingPage {
+public class DefaultFixedIssueFiltersPage extends ProjectBuildSettingPage {
public DefaultFixedIssueFiltersPage(PageParameters params) {
super(params);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
index fe30af25cf..3c92e3fe24 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/JobSecretsPage.java
@@ -32,7 +32,7 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.svg.SpriteImage;
@SuppressWarnings("serial")
-public class JobSecretsPage extends BuildSettingPage {
+public class JobSecretsPage extends ProjectBuildSettingPage {
private DataTable<JobSecret, Void> secretsTable;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.html
rename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.html
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java
similarity index 65%
rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java
rename to server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java
index 41176b109e..55e52a821f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/BuildSettingPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/build/ProjectBuildSettingPage.java
@@ -5,9 +5,9 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
-public abstract class BuildSettingPage extends ProjectSettingPage {
+public abstract class ProjectBuildSettingPage extends ProjectSettingPage {
- public BuildSettingPage(PageParameters params) {
+ public ProjectBuildSettingPage(PageParameters params) {
super(params);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
index 1dc00affd8..4b8ed0065c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
@@ -20,12 +20,13 @@ import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.model.support.NamedQuery;
-import io.onedev.server.model.support.QuerySetting;
+import io.onedev.server.model.support.QueryPersonalization;
import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
@@ -74,26 +75,18 @@ public class PullRequestListPage extends LayoutPage {
}
@Override
- protected QuerySetting<NamedPullRequestQuery> getQuerySetting() {
- if (getLoginUser() != null)
- return getLoginUser().getPullRequestQuerySetting();
- else
- return null;
+ protected QueryPersonalization<NamedPullRequestQuery> getQueryPersonalization() {
+ return getLoginUser().getPullRequestQueryPersonalization();
}
@Override
- protected void onSaveQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {
- OneDev.getInstance(UserManager.class).save(getLoginUser());
- }
-
- @Override
- protected void onSaveQueries(ArrayList<NamedPullRequestQuery> queries) {
+ protected void onSaveGlobalQueries(ArrayList<NamedPullRequestQuery> queries) {
getPullRequestSetting().setNamedQueries(queries);
OneDev.getInstance(SettingManager.class).savePullRequestSetting(getPullRequestSetting());
}
@Override
- protected ArrayList<NamedPullRequestQuery> getQueries() {
+ protected ArrayList<NamedPullRequestQuery> getGlobalQueries() {
return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();
}
@@ -151,15 +144,15 @@ public class PullRequestListPage extends LayoutPage {
@Override
protected Component newContent(String id) {
- return new SaveQueryPanel(id) {
+ return new SaveQueryPanel(id, new PersonalQuerySupport() {
@Override
- protected void onSaveForMine(AjaxRequestTarget target, String name) {
- QuerySetting<NamedPullRequestQuery> querySetting = getLoginUser().getPullRequestQuerySetting();
- NamedPullRequestQuery namedQuery = NamedQuery.find(querySetting.getUserQueries(), name);
+ public void onSave(AjaxRequestTarget target, String name) {
+ QueryPersonalization<NamedPullRequestQuery> queryPersonalization = getLoginUser().getPullRequestQueryPersonalization();
+ NamedPullRequestQuery namedQuery = NamedQuery.find(queryPersonalization.getQueries(), name);
if (namedQuery == null) {
namedQuery = new NamedPullRequestQuery(name, query);
- querySetting.getUserQueries().add(namedQuery);
+ queryPersonalization.getQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -167,9 +160,11 @@ public class PullRequestListPage extends LayoutPage {
target.add(savedQueries);
close();
}
+
+ }) {
@Override
- protected void onSaveForAll(AjaxRequestTarget target, String name) {
+ protected void onSave(AjaxRequestTarget target, String name) {
GlobalPullRequestSetting pullRequestSetting = getPullRequestSetting();
NamedPullRequestQuery namedQuery = pullRequestSetting.getNamedQuery(name);
if (namedQuery == null) {
@@ -187,7 +182,7 @@ public class PullRequestListPage extends LayoutPage {
protected void onCancel(AjaxRequestTarget target) {
close();
}
-
+
};
}
@@ -235,8 +230,8 @@ public class PullRequestListPage extends LayoutPage {
public static PageParameters paramsOf(int page) {
String query = null;
User user = SecurityUtils.getUser();
- if (user != null && !user.getPullRequestQuerySetting().getUserQueries().isEmpty())
- query = user.getPullRequestQuerySetting().getUserQueries().iterator().next().getQuery();
+ if (user != null && !user.getPullRequestQueryPersonalization().getQueries().isEmpty())
+ query = user.getPullRequestQueryPersonalization().getQueries().iterator().next().getQuery();
else if (!getPullRequestSetting().getNamedQueries().isEmpty())
query = getPullRequestSetting().getNamedQueries().iterator().next().getQuery();
return paramsOf(query, page);
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/MethodNotAllowedErrorPage.html b/server-core/src/main/java/io/onedev/server/web/page/simple/error/MethodNotAllowedErrorPage.html
new file mode 100644
index 0000000000..c91a6bc596
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/MethodNotAllowedErrorPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <a wicket:id="goHome" class="btn btn-primary">Back To Home</a>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/error/MethodNotAllowedErrorPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/error/MethodNotAllowedErrorPage.java
new file mode 100644
index 0000000000..cd884c670e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/error/MethodNotAllowedErrorPage.java
@@ -0,0 +1,36 @@
+package io.onedev.server.web.page.simple.error;
+
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.web.page.simple.SimplePage;
+
+@SuppressWarnings("serial")
+public class MethodNotAllowedErrorPage extends SimplePage {
+
+ public MethodNotAllowedErrorPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new BookmarkablePageLink<Void>("goHome", getApplication().getHomePage()));
+ }
+
+ @Override
+ protected String getLogoHref() {
+ return "sad-panda";
+ }
+
+ @Override
+ protected String getTitle() {
+ return "Method Not Allowed";
+ }
+
+ @Override
+ protected String getSubTitle() {
+ return "This http method is not allowed";
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
index f2ca5958b2..e4a1d5e33c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/PasswordResetPage.java
@@ -17,12 +17,12 @@ import com.google.common.collect.Lists;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.model.User;
import io.onedev.server.notification.MailManager;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.component.taskbutton.TaskButton;
import io.onedev.server.web.page.simple.SimplePage;
@@ -62,7 +62,7 @@ public class PasswordResetPage extends SimplePage {
form.add(new TaskButton("resettingPassword") {
@Override
- protected String runTask(SimpleLogger logger) {
+ protected String runTask(TaskLogger logger) {
UserManager userManager = OneDev.getInstance(UserManager.class);
User user = userManager.findByName(loginNameOrEmail);
if (user == null)
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 59f9329006..795b443f3a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,6 +1,3 @@
<wicket:extend>
- <div class="d-flex border-primary justify-content-between align-items-center">
- <span style="font-size: 64px;">hello</span>
- <span>world</span>
- </div>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 066be5dd6a..c331d117bb 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -17,6 +18,14 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java
new file mode 100644
index 0000000000..09d2dba793
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResource.java
@@ -0,0 +1,78 @@
+package io.onedev.server.web.resource;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.http.HttpHeaders;
+import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.request.resource.AbstractResource;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.agent.Agent;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.model.AgentToken;
+
+public class AgentLibResource extends AbstractResource {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ HttpServletRequest request = (HttpServletRequest) attributes.getRequest().getContainerRequest();
+ String bearer = request.getHeader(HttpHeaders.AUTHORIZATION);
+ if (bearer != null && bearer.startsWith(Agent.BEARER + " ")) {
+ String tokenValue = bearer.substring(Agent.BEARER.length() + 1);
+ AgentToken token = OneDev.getInstance(AgentTokenManager.class).find(tokenValue);
+ if (token == null)
+ throw new ExplicitException("Invalid agent token");
+ } else {
+ throw new ExplicitException("No agent token");
+ }
+
+ ResourceResponse response = new ResourceResponse();
+ response.setContentType(MimeTypes.OCTET_STREAM);
+
+ response.disableCaching();
+
+ response.setWriteCallback(new WriteCallback() {
+
+ @Override
+ public void writeData(Attributes attributes) throws IOException {
+ File tempDir = FileUtils.createTempDir("agent-lib");
+ try {
+ Collection<String> agentLibs = OneDev.getInstance(AgentManager.class).getAgentLibs();
+
+ for (File file: Bootstrap.getBootDir().listFiles()) {
+ if (agentLibs.contains(file.getName()))
+ FileUtils.copyFileToDirectory(file, tempDir);
+ }
+
+ for (File file: Bootstrap.getLibDir().listFiles()) {
+ if (agentLibs.contains(file.getName()))
+ FileUtils.copyFileToDirectory(file, tempDir);
+ }
+
+ OutputStream os = attributes.getResponse().getOutputStream();
+ FileUtils.tar(tempDir, Lists.newArrayList("**"), new ArrayList<>(), os, false);
+ } finally {
+ FileUtils.deleteDir(tempDir);
+ }
+ }
+
+ });
+
+ return response;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResourceReference.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResourceReference.java
new file mode 100644
index 0000000000..c017d20f7b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLibResourceReference.java
@@ -0,0 +1,19 @@
+package io.onedev.server.web.resource;
+
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
+
+public class AgentLibResourceReference extends ResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public AgentLibResourceReference() {
+ super("agent-lib");
+ }
+
+ @Override
+ public IResource getResource() {
+ return new AgentLibResource();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.java
new file mode 100644
index 0000000000..cf53e5a8dd
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResource.java
@@ -0,0 +1,74 @@
+package io.onedev.server.web.resource;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+
+import javax.persistence.EntityNotFoundException;
+
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.request.resource.AbstractResource;
+
+import com.google.common.base.Joiner;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.security.SecurityUtils;
+
+public class AgentLogResource extends AbstractResource {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final String PARAM_AGENT = "agent";
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ String agentName = attributes.getParameters().get(PARAM_AGENT).toString();
+ Agent agent = OneDev.getInstance(AgentManager.class).findByName(agentName);
+ if (agent == null)
+ throw new EntityNotFoundException("Unable to find agent: " + agentName);
+
+ if (!agent.isOnline())
+ throw new ExplicitException("Unable to read log: agent is offline");
+
+ ResourceResponse response = new ResourceResponse();
+ response.setContentType(MimeTypes.OCTET_STREAM);
+
+ response.disableCaching();
+
+ try {
+ response.setFileName(URLEncoder.encode("agent-log.txt", StandardCharsets.UTF_8.name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ Long agentId = agent.getId();
+ response.setWriteCallback(new WriteCallback() {
+
+ @Override
+ public void writeData(Attributes attributes) throws IOException {
+ Agent agent = OneDev.getInstance(AgentManager.class).load(agentId);
+ List<String> agentLog = OneDev.getInstance(AgentManager.class).getAgentLog(agent);
+ String content = Joiner.on("\n").join(agentLog);
+ attributes.getResponse().getOutputStream().write(content.getBytes(StandardCharsets.UTF_8));
+ }
+ });
+
+ return response;
+ }
+
+ public static PageParameters paramsOf(Agent agent) {
+ PageParameters params = new PageParameters();
+ params.add(PARAM_AGENT, agent.getName());
+ return params;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResourceReference.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResourceReference.java
new file mode 100644
index 0000000000..1f43924145
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentLogResourceReference.java
@@ -0,0 +1,19 @@
+package io.onedev.server.web.resource;
+
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
+
+public class AgentLogResourceReference extends ResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public AgentLogResourceReference() {
+ super("agent-log");
+ }
+
+ @Override
+ public IResource getResource() {
+ return new AgentLogResource();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java
new file mode 100644
index 0000000000..9f01468c34
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResource.java
@@ -0,0 +1,144 @@
+package io.onedev.server.web.resource;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Properties;
+import java.util.UUID;
+
+import org.apache.commons.compress.utils.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.UnauthorizedException;
+import org.apache.tika.mime.MimeTypes;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.resource.AbstractResource;
+
+import com.google.common.collect.Lists;
+
+import io.onedev.agent.Agent;
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.launcher.bootstrap.BootstrapUtils;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.AgentTokenManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.AgentToken;
+import io.onedev.server.security.SecurityUtils;
+
+public class AgentResource extends AbstractResource {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected ResourceResponse newResourceResponse(Attributes attributes) {
+ if (!SecurityUtils.isAdministrator())
+ throw new UnauthorizedException();
+
+ if (!new File(Bootstrap.installDir, "agent").exists())
+ throw new ExplicitException("No agent package to download");
+
+ String path = RequestCycle.get().getRequest().getUrl().getPath();
+ boolean zipFormat = path.endsWith(".zip");
+
+ ResourceResponse response = new ResourceResponse();
+ response.setContentType(MimeTypes.OCTET_STREAM);
+
+ response.disableCaching();
+
+ try {
+ String fileName = StringUtils.substringAfterLast(path, "/");
+ response.setFileName(URLEncoder.encode(fileName, StandardCharsets.UTF_8.name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ response.setWriteCallback(new WriteCallback() {
+
+ @Override
+ public void writeData(Attributes attributes) throws IOException {
+ File tempDir = FileUtils.createTempDir("agent");
+ try {
+ String agentVersion = OneDev.getInstance(AgentManager.class).getAgentVersion();
+
+ String wrapperConfContent = FileUtils.readFileToString(
+ new File(Bootstrap.installDir, "agent/wrapper.conf"), StandardCharsets.UTF_8);
+ wrapperConfContent = wrapperConfContent.replace("agentVersion", agentVersion);
+ FileUtils.writeStringToFile(new File(tempDir, "agent/conf/wrapper.conf"),
+ wrapperConfContent, StandardCharsets.UTF_8);
+
+ FileUtils.copyFile(new File(Bootstrap.installDir, "agent/wrapper-license.conf"),
+ new File(tempDir, "agent/conf/wrapper-license.conf"));
+ FileUtils.copyFile(new File(Bootstrap.installDir, "agent/App.sh.in"),
+ new File(tempDir, "agent/bin/agent.sh"));
+ FileUtils.copyFile(new File(Bootstrap.installDir, "agent/AppCommand.bat.in"),
+ new File(tempDir, "agent/bin/agent.bat"));
+
+ new File(tempDir, "agent/bin/agent.sh").setExecutable(true);
+
+ Properties props = new Properties();
+ props.setProperty("serverUrl", OneDev.getInstance(SettingManager.class).getSystemSetting().getServerUrl());
+
+ AgentToken token = new AgentToken();
+ token.setNote("Token for downlaoded agent");
+ token.setValue(UUID.randomUUID().toString());
+ OneDev.getInstance(AgentTokenManager.class).save(token);
+ props.setProperty("agentToken", token.getValue());
+
+ try (OutputStream os = new FileOutputStream(new File(tempDir, "agent/conf/agent.properties"))) {
+ props.store(os, "");
+ }
+
+ try (
+ InputStream is = Agent.class.getClassLoader().getResourceAsStream("agent/conf/logback.xml");
+ OutputStream os = new FileOutputStream(new File(tempDir, "agent/conf/logback.xml"));) {
+ IOUtils.copy(is, os);
+ }
+ FileUtils.touchFile(new File(tempDir, "agent/conf/attributes.properties"));
+ FileUtils.touchFile(new File(tempDir, "agent/logs/console.log"));
+ FileUtils.touchFile(new File(tempDir, "agent/status/do_not_remove.txt"));
+
+ Collection<String> agentLibs = OneDev.getInstance(AgentManager.class).getAgentLibs();
+
+ for (File file: Bootstrap.getBootDir().listFiles()) {
+ if (file.getName().startsWith("libwrapper-")
+ || file.getName().startsWith("wrapper-")
+ || file.getName().equals("wrapper.jar")) {
+ FileUtils.copyFileToDirectory(file, new File(tempDir, "agent/boot"));
+ if (file.getName().startsWith("wrapper-") && !file.getName().startsWith("wrapper-windows-"))
+ new File(tempDir, "agent/boot/" + file.getName()).setExecutable(true);
+ }
+ }
+
+ for (File file: Bootstrap.getBootDir().listFiles()) {
+ if (agentLibs.contains(file.getName()))
+ FileUtils.copyFileToDirectory(file, new File(tempDir, "agent/lib/" + agentVersion));
+ }
+ for (File file: Bootstrap.getLibDir().listFiles()) {
+ if (agentLibs.contains(file.getName()))
+ FileUtils.copyFileToDirectory(file, new File(tempDir, "agent/lib/" + agentVersion));
+ }
+
+ OutputStream os = attributes.getResponse().getOutputStream();
+ if (zipFormat)
+ BootstrapUtils.zip(tempDir, os);
+ else
+ FileUtils.tar(tempDir, Lists.newArrayList("**"), new ArrayList<>(), os, true);
+ } finally {
+ FileUtils.deleteDir(tempDir);
+ }
+ }
+
+ });
+
+ return response;
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/AgentResourceReference.java b/server-core/src/main/java/io/onedev/server/web/resource/AgentResourceReference.java
new file mode 100644
index 0000000000..1ae8a0f80d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/resource/AgentResourceReference.java
@@ -0,0 +1,19 @@
+package io.onedev.server.web.resource;
+
+import org.apache.wicket.request.resource.IResource;
+import org.apache.wicket.request.resource.ResourceReference;
+
+public class AgentResourceReference extends ResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public AgentResourceReference() {
+ super("agent");
+ }
+
+ @Override
+ public IResource getResource() {
+ return new AgentResource();
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java
index d38c892a6a..6cf3ea0d56 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/BuildLogResource.java
@@ -16,12 +16,12 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.request.resource.AbstractResource;
import io.onedev.server.OneDev;
-import io.onedev.server.buildspec.job.log.LogManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.tasklog.LogManager;
public class BuildLogResource extends AbstractResource {
diff --git a/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java b/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java
index 67178dc34b..ec62a00499 100644
--- a/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java
+++ b/server-core/src/main/java/io/onedev/server/web/resource/ServerLogResource.java
@@ -5,7 +5,6 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.List;
import org.apache.shiro.authz.UnauthorizedException;
@@ -14,8 +13,8 @@ import org.apache.wicket.request.resource.AbstractResource;
import com.google.common.base.Joiner;
+import io.onedev.agent.job.LogRequest;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
-import io.onedev.commons.utils.FileUtils;
import io.onedev.server.security.SecurityUtils;
public class ServerLogResource extends AbstractResource {
@@ -50,21 +49,7 @@ public class ServerLogResource extends AbstractResource {
}
public static List<String> readServerLog() {
- File logFile = new File(Bootstrap.installDir, "logs/server.log");
- List<String> lines = new ArrayList<>();
- int index = logFile.getParentFile().list().length;
- try {
- File logDir = logFile.getParentFile();
- for (int i=index; i>=1; i--) {
- File rollFile = new File(logDir, logFile.getName() + "." + i);
- if (rollFile.exists())
- lines.addAll((FileUtils.readLines(rollFile, StandardCharsets.UTF_8)));
- }
- lines.addAll((FileUtils.readLines(logFile, StandardCharsets.UTF_8)));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return lines;
+ return LogRequest.readLog(new File(Bootstrap.installDir, "logs/server.log"));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.java
new file mode 100644
index 0000000000..25bde83746
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedAgentQueriesBean.java
@@ -0,0 +1,31 @@
+package io.onedev.server.web.util;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.NotNull;
+
+import io.onedev.server.model.support.NamedAgentQuery;
+import io.onedev.server.web.component.savedquery.NamedQueriesBean;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.OmitName;
+
+@Editable
+public class NamedAgentQueriesBean extends NamedQueriesBean<NamedAgentQuery> {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<NamedAgentQuery> queries = new ArrayList<>();
+
+ @NotNull
+ @Editable
+ @OmitName
+ public List<NamedAgentQuery> getQueries() {
+ return queries;
+ }
+
+ public void setQueries(List<NamedAgentQuery> queries) {
+ this.queries = queries;
+ }
+
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index d1c47d3ac5..847d149537 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -29,6 +29,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.param.spec.ParamSpec;
+import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.entitymanager.BuildMetricManager;
import io.onedev.server.entitymanager.GroupManager;
@@ -136,6 +137,15 @@ public class SuggestionUtils {
return suggest(projectNames, matchWith);
}
+ public static List<InputSuggestion> suggestAgents(String matchWith) {
+ List<String> agentNames = OneDev.getInstance(AgentManager.class).query()
+ .stream()
+ .map(it->it.getName())
+ .sorted()
+ .collect(Collectors.toList());
+ return suggest(agentNames, matchWith);
+ }
+
public static List<InputSuggestion> suggestVariables(Project project, BuildSpec buildSpec,
@Nullable List<ParamSpec> paramSpecs, String matchWith, boolean withBuildVersion,
boolean withFile) {
diff --git a/server-core/src/main/java/io/onedev/server/web/util/Testable.java b/server-core/src/main/java/io/onedev/server/web/util/Testable.java
index ab1dd45149..5518f491ee 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/Testable.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/Testable.java
@@ -2,10 +2,10 @@ package io.onedev.server.web.util;
import java.io.Serializable;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.commons.utils.TaskLogger;
public interface Testable<T extends Serializable> {
- void test(T data, SimpleLogger logger);
+ void test(T data, TaskLogger logger);
}
diff --git a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java
index d5479d002e..099195f053 100644
--- a/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java
+++ b/server-core/src/test/java/io/onedev/server/buildspec/job/log/JobLogEntryExTest.java
@@ -1,11 +1,14 @@
package io.onedev.server.buildspec.job.log;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import com.google.common.collect.Lists;
+import io.onedev.server.tasklog.Style;
+import io.onedev.server.tasklog.StyleBuilder;
+
public class JobLogEntryExTest {
@Test
diff --git a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
index 9dc69ade06..5f8b1d6387 100644
--- a/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
+++ b/server-core/src/test/java/io/onedev/server/git/GitUtilsTest.java
@@ -21,8 +21,8 @@ import org.junit.Test;
import com.google.common.collect.Sets;
import com.google.common.io.Resources;
+import io.onedev.commons.launcher.bootstrap.BootstrapUtils;
import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.ZipUtils;
public class GitUtilsTest extends AbstractGitTest {
@@ -328,7 +328,7 @@ public class GitUtilsTest extends AbstractGitTest {
tempDir = FileUtils.createTempDir();
try (InputStream is = Resources.getResource(GitUtilsTest.class, "git-conflict-link-link.zip").openStream()) {
- ZipUtils.unzip(is, tempDir);
+ BootstrapUtils.unzip(is, tempDir);
try (Git git = Git.open(tempDir)) {
ObjectId mergeCommitId;
@@ -363,7 +363,7 @@ public class GitUtilsTest extends AbstractGitTest {
tempDir = FileUtils.createTempDir();
try (InputStream is = Resources.getResource(GitUtilsTest.class, "git-conflict-link-file.zip").openStream()) {
- ZipUtils.unzip(is, tempDir);
+ BootstrapUtils.unzip(is, tempDir);
try (Git git = Git.open(tempDir)) {
ObjectId mergeCommitId;
@@ -412,7 +412,7 @@ public class GitUtilsTest extends AbstractGitTest {
tempDir = FileUtils.createTempDir();
try (InputStream is = Resources.getResource(GitUtilsTest.class, "git-conflict-link-dir.zip").openStream()) {
- ZipUtils.unzip(is, tempDir);
+ BootstrapUtils.unzip(is, tempDir);
try (Git git = Git.open(tempDir)) {
ObjectId mergeCommitId;
diff --git a/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java b/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java
deleted file mode 100644
index 3dc2e80658..0000000000
--- a/server-core/src/test/java/io/onedev/server/git/GitVersionTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package io.onedev.server.git;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import org.junit.Test;
-
-public class GitVersionTest {
-
- @Test
- public void shouldCompareVersionCorrectly() {
- assertTrue(new GitVersion("1.8.3.msysgit.0").isOlderThan(new GitVersion("1.8.4.0")));
- assertTrue(new GitVersion("1.8.3").isNotOlderThan(new GitVersion("1.8.3.0")));
- assertTrue(new GitVersion("1.8.3.0.0").isNotOlderThan(new GitVersion("1.8.3.0")));
- assertFalse(new GitVersion("1.8.3.0.0").isNotOlderThan(new GitVersion("1.8.3.2")));
- assertTrue(new GitVersion("1.9.3.0.0").isNewerThan(new GitVersion("1.8.3.2")));
- assertTrue(new GitVersion("1.9").isNewerThan(new GitVersion("1.8.3.2")));
- assertTrue(new GitVersion("1.8.3.2.0.0.1").isNewerThan(new GitVersion("1.8.3.2")));
- }
-
- @Test
- public void shouldHandleMsysgitCorrectly() {
- assertTrue(new GitVersion("1.8.3.msysgit.0").isMsysgit());
- }
-
- @Test
- public void shouldConvertToStringCorrectly() {
- assertEquals(new GitVersion("1.8.3.msysgit.0").toString(), "1.8.3.0");
- assertEquals(new GitVersion("1.8.3.05").toString(), "1.8.3.5");
- }
-
-}
diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml
index bc6e32a875..f24c7fcdf7 100644
--- a/server-plugin/pom.xml
+++ b/server-plugin/pom.xml
@@ -18,7 +18,7 @@
<modules>
<module>server-plugin-archetype</module>
<module>server-plugin-executor-kubernetes</module>
- <module>server-plugin-executor-docker</module>
+ <module>server-plugin-executor-serverdocker</module>
<module>server-plugin-buildspec-maven</module>
<module>server-plugin-buildspec-gradle</module>
<module>server-plugin-buildspec-node</module>
@@ -34,5 +34,6 @@
<module>server-plugin-import-gitea</module>
<module>server-plugin-import-bitbucketcloud</module>
<module>server-plugin-import-jiracloud</module>
+ <module>server-plugin-executor-remotedocker</module>
</modules>
</project>
\ No newline at end of file
diff --git a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
index 5c7a199d02..3841a2ccd9 100644
--- a/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/server-plugin/server-plugin-archetype/src/main/resources/archetype-resources/pom.xml
@@ -114,7 +114,7 @@
<plugin>
<groupId>io.onedev</groupId>
<artifactId>plugin-maven</artifactId>
- <version>2.0.5</version>
+ <version>2.0.6</version>
<executions>
<execution>
<id>populate-resources</id>
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 95d2d19521..1a65d59a15 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
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
@@ -47,6 +48,7 @@ import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
@@ -62,7 +64,6 @@ import io.onedev.server.buildspec.Service;
import io.onedev.server.buildspec.job.CacheSpec;
import io.onedev.server.buildspec.job.EnvVar;
import io.onedev.server.buildspec.job.JobContext;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
@@ -73,14 +74,13 @@ import io.onedev.server.plugin.executor.kubernetes.KubernetesExecutor.TestData;
import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Horizontal;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.util.Testable;
-@Editable(order=100, description="This executor runs build jobs as pods in a kubernetes cluster. "
+@Editable(order=300, description="This executor runs build jobs as pods in a kubernetes cluster. "
+ "<b class='text-danger'>Note:</b> Make sure server url is specified correctly in system "
+ "setting as job pods need to access it to download source and artifacts")
@Horizontal
@@ -198,7 +198,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Override
- public void test(TestData testData, SimpleLogger jobLogger) {
+ public void test(TestData testData, TaskLogger jobLogger) {
execute(KubernetesResource.TEST_JOB_TOKEN, jobLogger, testData.getDockerImage());
}
@@ -212,7 +212,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return cmdline;
}
- private String createResource(Map<Object, Object> resourceDef, Collection<String> secretsToMask, SimpleLogger jobLogger) {
+ private String createResource(Map<Object, Object> resourceDef, Collection<String> secretsToMask, TaskLogger jobLogger) {
Commandline kubectl = newKubeCtl();
File file = null;
try {
@@ -253,7 +253,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void deleteNamespace(String namespace, SimpleLogger jobLogger) {
+ private void deleteNamespace(String namespace, TaskLogger jobLogger) {
try {
Commandline cmd = newKubeCtl();
cmd.timeout(NAMESPACE_DELETION_TIMEOUT).addArgs("delete", "namespace", namespace);
@@ -280,7 +280,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void deleteClusterRoleBinding(String namespace, SimpleLogger jobLogger) {
+ private void deleteClusterRoleBinding(String namespace, TaskLogger jobLogger) {
Commandline cmd = newKubeCtl();
cmd.addArgs("delete", "clusterrolebinding", namespace);
cmd.execute(new LineConsumer() {
@@ -300,7 +300,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}).checkReturnCode();
}
- private String createNamespace(String namespace, @Nullable JobContext jobContext, SimpleLogger jobLogger) {
+ 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,
@@ -393,7 +393,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return null;
}
- private OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, SimpleLogger jobLogger) {
+ private OsInfo getBaselineOsInfo(Collection<NodeSelectorEntry> nodeSelector, TaskLogger jobLogger) {
Commandline kubectl = newKubeCtl();
kubectl.addArgs("get", "nodes", "-o", "jsonpath={range .items[*]}{.status.nodeInfo.operatingSystem} {.status.nodeInfo.kernelVersion} {.spec.unschedulable}{'|'}{end}");
for (NodeSelectorEntry entry: nodeSelector)
@@ -430,7 +430,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Nullable
- private String createImagePullSecret(String namespace, SimpleLogger jobLogger) {
+ private String createImagePullSecret(String namespace, TaskLogger jobLogger) {
if (!getRegistryLogins().isEmpty()) {
Map<Object, Object> auths = new LinkedHashMap<>();
for (RegistryLogin login: getRegistryLogins()) {
@@ -466,7 +466,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void createClusterRoleBinding(String namespace, SimpleLogger jobLogger) {
+ private void createClusterRoleBinding(String namespace, TaskLogger jobLogger) {
AtomicBoolean clusterRoleBindingExists = new AtomicBoolean(false);
Commandline cmd = newKubeCtl();
cmd.addArgs("get", "clusterrolebindings", "--field-selector", "metadata.name=" + namespace,
@@ -507,7 +507,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
@Nullable
- private String createTrustCertsConfigMap(String namespace, SimpleLogger jobLogger) {
+ private String createTrustCertsConfigMap(String namespace, TaskLogger jobLogger) {
Map<String, String> configMapData = new LinkedHashMap<>();
ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
File keystoreFile = serverConfig.getKeystoreFile();
@@ -544,7 +544,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
private void startService(String namespace, JobContext jobContext, Service jobService,
- @Nullable String imagePullSecretName, SimpleLogger jobLogger) {
+ @Nullable String imagePullSecretName, TaskLogger jobLogger) {
jobLogger.log("Creating service pod from image " + jobService.getImage() + "...");
List<NodeSelectorEntry> nodeSelector = getNodeSelector();
@@ -560,8 +560,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"name", "default",
"image", jobService.getImage());
containerSpec.put("resources", CollectionUtils.newLinkedHashMap("requests", CollectionUtils.newLinkedHashMap(
- "cpu", jobService.getCpuRequirement(),
- "memory", jobService.getMemoryRequirement())));
+ "cpu", jobService.getCpuRequirement() + "m",
+ "memory", jobService.getMemoryRequirement() + "m")));
List<Map<Object, Object>> envs = new ArrayList<>();
for (EnvVar envVar: jobService.getEnvVars()) {
envs.add(CollectionUtils.newLinkedHashMap(
@@ -706,7 +706,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void execute(String jobToken, SimpleLogger jobLogger, Object executionContext) {
+ private void execute(String jobToken, TaskLogger jobLogger, Object executionContext) {
jobLogger.log("Checking cluster access...");
JobContext jobContext;
if (executionContext instanceof JobContext)
@@ -768,21 +768,21 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
String containerBuildHome;
String containerCommandHome;
String containerCacheHome;
- String containerUserHome;
+ String containerAuthInfoHome;
String trustCertsHome;
String dockerSock;
if (baselineOsInfo.isLinux()) {
containerBuildHome = "/onedev-build";
containerCacheHome = containerBuildHome + "/cache";
containerCommandHome = containerBuildHome + "/command";
- containerUserHome = "/root/onedev";
+ containerAuthInfoHome = "/root/auth-info";
trustCertsHome = containerBuildHome + "/trust-certs";
dockerSock = "/var/run/docker.sock";
} else {
containerBuildHome = "C:\\onedev-build";
containerCacheHome = containerBuildHome + "\\cache";
containerCommandHome = containerBuildHome + "\\command";
- containerUserHome = "C:\\Users\\ContainerAdministrator\\onedev";
+ containerAuthInfoHome = "C:\\Users\\ContainerAdministrator\\auth-info";
trustCertsHome = containerBuildHome + "\\trust-certs";
dockerSock = null;
}
@@ -790,14 +790,14 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
Map<String, String> buildHomeMount = CollectionUtils.newLinkedHashMap(
"name", "build-home",
"mountPath", containerBuildHome);
- Map<String, String> userHomeMount = CollectionUtils.newLinkedHashMap(
- "name", "user-home",
- "mountPath", containerUserHome);
+ Map<String, String> authInfoMount = CollectionUtils.newLinkedHashMap(
+ "name", "auth-info-home",
+ "mountPath", containerAuthInfoHome);
// Windows nanoserver default user is ContainerUser
- Map<String, String> userHomeMount2 = CollectionUtils.newLinkedHashMap(
- "name", "user-home",
- "mountPath", "C:\\Users\\ContainerUser\\onedev");
+ Map<String, String> authInfoMount2 = CollectionUtils.newLinkedHashMap(
+ "name", "auth-info-home",
+ "mountPath", "C:\\Users\\ContainerUser\\auth-info");
Map<String, String> cacheHomeMount = CollectionUtils.newLinkedHashMap(
"name", "cache-home",
@@ -809,9 +809,9 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"name", "docker-sock",
"mountPath", dockerSock);
- List<Object> volumeMounts = Lists.<Object>newArrayList(buildHomeMount, userHomeMount, cacheHomeMount);
+ List<Object> volumeMounts = Lists.<Object>newArrayList(buildHomeMount, authInfoMount, cacheHomeMount);
if (baselineOsInfo.isWindows())
- volumeMounts.add(userHomeMount2);
+ volumeMounts.add(authInfoMount2);
if (trustCertsConfigMapName != null)
volumeMounts.add(trustCertsMount);
if (dockerSock != null)
@@ -920,8 +920,8 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
if (jobContext != null) {
sidecarContainerSpec.put("resources", CollectionUtils.newLinkedHashMap("requests", CollectionUtils.newLinkedHashMap(
- "cpu", jobContext.getCpuRequirement(),
- "memory", jobContext.getMemoryRequirement())));
+ "cpu", jobContext.getCpuRequirement() + "m",
+ "memory", jobContext.getMemoryRequirement() + "m")));
}
containerSpecs.add(sidecarContainerSpec);
@@ -945,7 +945,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
"name", "build-home",
"emptyDir", CollectionUtils.newLinkedHashMap());
Map<Object, Object> userHomeVolume = CollectionUtils.newLinkedHashMap(
- "name", "user-home",
+ "name", "auth-info-home",
"emptyDir", CollectionUtils.newLinkedHashMap());
Map<Object, Object> cacheHomeVolume = CollectionUtils.newLinkedHashMap(
"name", "cache-home",
@@ -999,7 +999,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}, jobLogger);
if (jobContext != null)
- jobContext.notifyJobRunning();
+ jobContext.notifyJobRunning(null);
String nodeName = Preconditions.checkNotNull(nodeNameRef.get());
jobLogger.log("Running job on node " + nodeName + "...");
@@ -1166,7 +1166,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
return stoppedContainers;
}
- private void updateCacheLabels(String nodeName, JobContext jobContext, SimpleLogger jobLogger) {
+ private void updateCacheLabels(String nodeName, JobContext jobContext, TaskLogger jobLogger) {
jobLogger.log("Updating cache labels on node...");
Commandline kubectl = newKubeCtl();
@@ -1251,7 +1251,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void checkConditions(JsonNode statusNode, SimpleLogger jobLogger) {
+ private void checkConditions(JsonNode statusNode, TaskLogger jobLogger) {
JsonNode conditionsNode = statusNode.get("conditions");
if (conditionsNode != null) {
for (JsonNode conditionNode: conditionsNode) {
@@ -1264,7 +1264,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
}
- private void watchPod(String namespace, String podName, AbortChecker abortChecker, SimpleLogger jobLogger) {
+ private void watchPod(String namespace, String podName, AbortChecker abortChecker, TaskLogger jobLogger) {
Commandline kubectl = newKubeCtl();
ObjectMapper mapper = OneDev.getInstance(ObjectMapper.class);
@@ -1359,7 +1359,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
}
private void collectContainerLog(String namespace, String podName, String containerName,
- @Nullable String logEndMessage, SimpleLogger jobLogger) {
+ @Nullable String logEndMessage, TaskLogger jobLogger) {
Thread thread = Thread.currentThread();
AtomicReference<Boolean> abortError = new AtomicReference<>(false);
AtomicReference<Instant> lastInstantRef = new AtomicReference<>(null);
@@ -1373,7 +1373,7 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
class Logger extends LineConsumer {
- private final StyleBuilder styleBuilder = new StyleBuilder();
+ private final String taskId = UUID.randomUUID().toString();
@Override
public void consume(String line) {
@@ -1397,12 +1397,12 @@ public class KubernetesExecutor extends JobExecutor implements Testable<TestData
Instant instant = Instant.from(DateTimeFormatter.ISO_INSTANT.parse(timestamp));
if (lastInstantRef.get() == null || lastInstantRef.get().isBefore(instant))
lastInstantRef.set(instant);
- jobLogger.log(StringUtils.substringAfter(line, " "), styleBuilder);
+ jobLogger.log(StringUtils.substringAfter(line, " "), taskId);
} catch (DateTimeParseException e) {
- jobLogger.log(line, styleBuilder);
+ jobLogger.log(line, taskId);
}
} else {
- jobLogger.log(line, styleBuilder);
+ jobLogger.log(line, taskId);
}
}
diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
index a7612bcc31..f9cba88e3f 100644
--- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
+++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java
@@ -37,16 +37,15 @@ import com.google.common.collect.Lists;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.commons.utils.TarUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.k8shelper.CacheAllocationRequest;
import io.onedev.k8shelper.CacheInstance;
+import io.onedev.k8shelper.JobData;
import io.onedev.k8shelper.KubernetesHelper;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobContext;
import io.onedev.server.buildspec.job.JobManager;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.rest.annotation.Api;
-import io.onedev.server.util.SimpleLogger;
@Api(internal=true)
@Path("/k8s")
@@ -66,18 +65,15 @@ public class KubernetesResource {
this.jobManager = jobManager;
}
- @Path("/job-context")
+ @Path("/job-data")
@Produces(MediaType.APPLICATION_OCTET_STREAM)
@POST
- public byte[] getJobContext(@Nullable String jobWorkspace) {
+ public byte[] getJobData(@Nullable String jobWorkspace) {
JobContext context = jobManager.getJobContext(getJobToken(), true);
if (StringUtils.isNotBlank(jobWorkspace))
- context.reportJobWorkspace(jobWorkspace);
- Map<String, Object> contextMap = new HashMap<>();
- contextMap.put("actions", context.getActions());
- contextMap.put("projectName", context.getProjectName());
- contextMap.put("commitHash", context.getCommitId().name());
- return SerializationUtils.serialize((Serializable) contextMap);
+ context.reportJobWorkspace(jobWorkspace);
+ JobData jobData = new JobData(context.getCommitId().name(), context.getActions());
+ return SerializationUtils.serialize(jobData);
}
@Path("/allocate-job-caches")
@@ -120,13 +116,13 @@ public class KubernetesResource {
for (int i=0; i<length; i++)
placeholderValues.put(readString(is), readString(is));
- TarUtils.untar(is, filesDir);
+ FileUtils.untar(is, filesDir, false);
Map<String, byte[]> outputFiles = jobManager.runServerStep(getJobToken(), stepPosition,
- filesDir, placeholderValues, new SimpleLogger() {
+ filesDir, placeholderValues, new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
// While testing, ngrok.io buffers response and build can not get log entries
// timely. This won't happen on pagekite however
KubernetesHelper.writeInt(output, 1);
@@ -166,7 +162,7 @@ public class KubernetesResource {
File tempDir = FileUtils.createTempDir();
try {
context.copyDependencies(tempDir);
- TarUtils.tar(tempDir, Lists.newArrayList("**"), new ArrayList<>(), output);
+ FileUtils.tar(tempDir, Lists.newArrayList("**"), new ArrayList<>(), output, false);
output.flush();
} finally {
FileUtils.deleteDir(tempDir);
diff --git a/server-plugin/server-plugin-executor-remotedocker/pom.xml b/server-plugin/server-plugin-executor-remotedocker/pom.xml
new file mode 100644
index 0000000000..dea95f771a
--- /dev/null
+++ b/server-plugin/server-plugin-executor-remotedocker/pom.xml
@@ -0,0 +1,20 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>server-plugin-executor-remotedocker</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin</artifactId>
+ <version>4.9.3</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-executor-serverdocker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <moduleClass>io.onedev.server.plugin.executor.remotedocker.RemoteDockerModule</moduleClass>
+ </properties>
+</project>
diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
new file mode 100644
index 0000000000..f80d51a2dc
--- /dev/null
+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerExecutor.java
@@ -0,0 +1,105 @@
+package io.onedev.server.plugin.executor.remotedocker;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeoutException;
+
+import org.eclipse.jetty.websocket.api.Session;
+
+import io.onedev.agent.AgentData;
+import io.onedev.agent.Message;
+import io.onedev.agent.MessageType;
+import io.onedev.agent.WebsocketUtils;
+import io.onedev.agent.job.JobData;
+import io.onedev.commons.utils.TaskLogger;
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.Service;
+import io.onedev.server.buildspec.job.JobContext;
+import io.onedev.server.job.resource.AgentAwareRunnable;
+import io.onedev.server.job.resource.ResourceManager;
+import io.onedev.server.model.support.RegistryLogin;
+import io.onedev.server.plugin.executor.serverdocker.ServerDockerExecutor;
+import io.onedev.server.search.entity.agent.AgentQuery;
+import io.onedev.server.search.entity.agent.AgentQueryAware;
+import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+
+@Editable(order=210, description="This executor runs build jobs as docker containers on remote machines via agents")
+public class RemoteDockerExecutor extends ServerDockerExecutor implements AgentQueryAware {
+
+ private static final long serialVersionUID = 1L;
+
+ private String agentQuery;
+
+ @Editable(order=390, name="Agent Selector", description="Specify agents applicable for this executor")
+ @io.onedev.server.web.editable.annotation.AgentQuery(forExecutor=true)
+ @NameOfEmptyValue("Any agent")
+ @Override
+ public String getAgentQuery() {
+ return agentQuery;
+ }
+
+ public void setAgentQuery(String agentQuery) {
+ this.agentQuery = agentQuery;
+ }
+
+ @Override
+ public void execute(String jobToken, JobContext jobContext) {
+ AgentQuery parsedQeury = AgentQuery.parse(agentQuery, true);
+
+ TaskLogger jobLogger = jobContext.getLogger();
+ OneDev.getInstance(ResourceManager.class).run(new AgentAwareRunnable() {
+
+ @Override
+ public void runOn(Long agentId, Session agentSession, AgentData agentData) {
+ jobLogger.log(String.format("Executing job (executor: %s, agent: %s)...", getName(), agentData.getName()));
+ jobContext.notifyJobRunning(agentId);
+
+ List<Map<String, String>> registryLogins = new ArrayList<>();
+ for (RegistryLogin login: getRegistryLogins()) {
+ registryLogins.add(CollectionUtils.newHashMap(
+ "url", login.getRegistryUrl(),
+ "userName", login.getUserName(),
+ "password", login.getPassword()));
+ }
+
+ Map<String, Serializable> jobContextMap = new HashMap<>();
+ jobContextMap.put("projectName", jobContext.getProjectName());
+ jobContextMap.put("commitHash", jobContext.getCommitId().name());
+ jobContextMap.put("buildNumber", jobContext.getBuildNumber());
+ jobContextMap.put("actions", (Serializable)jobContext.getActions());
+ jobContextMap.put("retried", jobContext.getRetried());
+
+ List<Map<String, Serializable>> services = new ArrayList<>();
+ for (Service service: jobContext.getServices())
+ services.add(service.toMap());
+ jobContextMap.put("services", (Serializable) services);
+
+ List<String> trustCertContent = getTrustCertContent();
+ JobData jobData = new JobData(jobToken, getName(), jobContext.getProjectName(),
+ jobContext.getCommitId().name(), jobContext.getBuildNumber(),
+ jobContext.getActions(), jobContext.getRetried(), services, registryLogins,
+ trustCertContent, getRunOptions());
+
+ try {
+ WebsocketUtils.call(agentSession, jobData, 0);
+ } catch (InterruptedException | TimeoutException e) {
+ new Message(MessageType.CANCEL_JOB, jobToken).sendBy(agentSession);
+ }
+
+ }
+
+ }, new HashMap<>(), parsedQeury, jobContext.getResourceRequirements(), jobLogger);
+
+ }
+
+ @Override
+ public String getDockerExecutable() {
+ return super.getDockerExecutable();
+ }
+
+}
\ No newline at end of file
diff --git a/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.java b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.java
new file mode 100644
index 0000000000..543e304578
--- /dev/null
+++ b/server-plugin/server-plugin-executor-remotedocker/src/main/java/io/onedev/server/plugin/executor/remotedocker/RemoteDockerModule.java
@@ -0,0 +1,37 @@
+package io.onedev.server.plugin.executor.remotedocker;
+
+import java.util.Collection;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.commons.launcher.loader.AbstractPluginModule;
+import io.onedev.commons.launcher.loader.ImplementationProvider;
+import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
+
+/**
+ * NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
+ *
+ */
+public class RemoteDockerModule extends AbstractPluginModule {
+
+ @Override
+ protected void configure() {
+ super.configure();
+
+ // put your guice bindings here
+ contribute(ImplementationProvider.class, new ImplementationProvider() {
+
+ @Override
+ public Class<?> getAbstractClass() {
+ return JobExecutor.class;
+ }
+
+ @Override
+ public Collection<Class<?>> getImplementations() {
+ return Sets.newHashSet(RemoteDockerExecutor.class);
+ }
+
+ });
+ }
+
+}
diff --git a/server-plugin/server-plugin-executor-docker/pom.xml b/server-plugin/server-plugin-executor-serverdocker/pom.xml
similarity index 71%
rename from server-plugin/server-plugin-executor-docker/pom.xml
rename to server-plugin/server-plugin-executor-serverdocker/pom.xml
index 80d1ecc1d7..e656e05070 100644
--- a/server-plugin/server-plugin-executor-docker/pom.xml
+++ b/server-plugin/server-plugin-executor-serverdocker/pom.xml
@@ -1,13 +1,13 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>server-plugin-executor-docker</artifactId>
+ <artifactId>server-plugin-executor-serverdocker</artifactId>
<parent>
<groupId>io.onedev</groupId>
<artifactId>server-plugin</artifactId>
<version>4.9.3</version>
</parent>
<properties>
- <moduleClass>io.onedev.server.plugin.executor.docker.DockerModule</moduleClass>
+ <moduleClass>io.onedev.server.plugin.executor.serverdocker.ServerDockerModule</moduleClass>
</properties>
</project>
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
similarity index 54%
rename from server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerExecutor.java
rename to server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
index 91e4a8620d..969fd7425f 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerExecutor.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerExecutor.java
@@ -1,19 +1,12 @@
-package io.onedev.server.plugin.executor.docker;
+package io.onedev.server.plugin.executor.serverdocker;
+
+import static io.onedev.k8shelper.KubernetesHelper.*;
-import static io.onedev.k8shelper.KubernetesHelper.cloneRepository;
-import static io.onedev.k8shelper.KubernetesHelper.getCacheInstances;
-import static io.onedev.k8shelper.KubernetesHelper.installGitCert;
-import static io.onedev.k8shelper.KubernetesHelper.preprocess;
-import static io.onedev.k8shelper.KubernetesHelper.readPlaceholderValues;
-import static io.onedev.k8shelper.KubernetesHelper.replacePlaceholders;
-import static io.onedev.k8shelper.KubernetesHelper.stringifyPosition;
import static java.nio.charset.StandardCharsets.UTF_8;
-import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,11 +16,10 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
-import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
+import javax.inject.Provider;
import javax.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.SystemUtils;
@@ -35,19 +27,19 @@ import org.hibernate.validator.constraints.NotEmpty;
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.Joiner;
import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
import com.google.common.base.Throwables;
+import io.onedev.agent.DockerUtils;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
import io.onedev.commons.launcher.loader.AppLoader;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.PathUtils;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.commons.utils.command.Commandline;
import io.onedev.commons.utils.command.ExecutionResult;
import io.onedev.commons.utils.command.LineConsumer;
@@ -63,19 +55,16 @@ import io.onedev.k8shelper.ServerExecutable;
import io.onedev.k8shelper.SshCloneInfo;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.Service;
-import io.onedev.server.buildspec.job.EnvVar;
import io.onedev.server.buildspec.job.JobContext;
import io.onedev.server.buildspec.job.JobManager;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
import io.onedev.server.git.config.GitConfig;
+import io.onedev.server.job.resource.ResourceManager;
import io.onedev.server.model.support.RegistryLogin;
import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
-import io.onedev.server.plugin.executor.docker.DockerExecutor.TestData;
+import io.onedev.server.plugin.executor.serverdocker.ServerDockerExecutor.TestData;
import io.onedev.server.util.ExceptionUtils;
import io.onedev.server.util.PKCS12CertExtractor;
import io.onedev.server.util.ServerConfig;
-import io.onedev.server.util.SimpleLogger;
-import io.onedev.server.util.concurrent.CapacityRunner;
import io.onedev.server.util.patternset.PatternSet;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
@@ -85,25 +74,21 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.util.Testable;
-@Editable(order=200, description="This executor runs build jobs as docker containers on OneDev server")
+@Editable(order=200, name="Server Docker Executor", description="This executor runs build jobs as docker containers on OneDev server")
@ClassValidating
@Horizontal
-public class DockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
+public class ServerDockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
private static final long serialVersionUID = 1L;
- private static final Logger logger = LoggerFactory.getLogger(DockerExecutor.class);
+ private static final Logger logger = LoggerFactory.getLogger(ServerDockerExecutor.class);
private List<RegistryLogin> registryLogins = new ArrayList<>();
- private int capacity = Runtime.getRuntime().availableProcessors();
-
private String runOptions;
private String dockerExecutable;
- private transient CapacityRunner capacityRunner;
-
private transient volatile String outerInstallPath;
@Editable(order=400, description="Specify login information for docker registries if necessary")
@@ -115,16 +100,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
this.registryLogins = registryLogins;
}
- @Editable(order=475, description="Specify max number of concurrent jobs being executed. Each job execution "
- + "will launch a separate docker container. Defaults to number of processors in the system")
- public int getCapacity() {
- return capacity;
- }
-
- public void setCapacity(int capacity) {
- this.capacity = capacity;
- }
-
@Editable(order=50050, group="More Settings", description="Optionally specify options to run container. For instance, you may use <tt>-m 2g</tt> "
+ "to limit memory of created container to be 2 giga bytes")
public String getRunOptions() {
@@ -153,310 +128,71 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return new Commandline("docker");
}
- private synchronized CapacityRunner getCapacityRunner() {
- if (capacityRunner == null)
- capacityRunner = new CapacityRunner(capacity);
- return capacityRunner;
- }
-
private File getCacheHome() {
return new File(Bootstrap.getSiteDir(), "cache");
}
- private void createNetwork(String network, JobContext jobContext, SimpleLogger jobLogger) {
- AtomicBoolean networkExists = new AtomicBoolean(false);
- Commandline docker = newDocker();
- docker.addArgs("network", "ls", "-q", "--filter", "name=" + network);
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- networkExists.set(true);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- if (networkExists.get()) {
- clearNetwork(network, jobLogger);
- } else {
- docker.clearArgs();
- docker.addArgs("network", "create");
- if (SystemUtils.IS_OS_WINDOWS)
- docker.addArgs("-d", "nat");
- docker.addArgs(network);
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
- }
- }
-
- private void deleteNetwork(String network, SimpleLogger jobLogger) {
- clearNetwork(network, jobLogger);
-
- Commandline docker = newDocker();
- docker.clearArgs();
- docker.addArgs("network", "rm", network);
- docker.execute(new LineConsumer() {
+ private LineConsumer newInfoLogger(TaskLogger jobLogger) {
+ return new LineConsumer(StandardCharsets.UTF_8.name()) {
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
+ private final String taskId = UUID.randomUUID().toString();
- }, new LineConsumer() {
-
@Override
public void consume(String line) {
- jobLogger.log(line);
+ jobLogger.log(line, taskId);
}
- }).checkReturnCode();
+ };
}
- private void clearNetwork(String network, SimpleLogger jobLogger) {
- Commandline docker = newDocker();
-
- List<String> containerIds = new ArrayList<>();
- docker.addArgs("ps", "-a", "-q", "--filter", "network=" + network);
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- containerIds.add(line);
- }
-
- }, new LineConsumer() {
+ private LineConsumer newErrorLogger(TaskLogger jobLogger) {
+ return new LineConsumer(StandardCharsets.UTF_8.name()) {
@Override
public void consume(String line) {
- jobLogger.log(line);
+ jobLogger.warning(line);
}
- }).checkReturnCode();
-
- for (String container: containerIds) {
- docker.clearArgs();
- docker.addArgs("container", "stop", container);
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- docker.clearArgs();
- docker.addArgs("container", "rm", container);
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
- }
+ };
}
- @SuppressWarnings("resource")
- private void startService(String network, Service jobService, SimpleLogger jobLogger) {
- jobLogger.log("Creating service container...");
-
- String containerName = network + "-service-" + jobService.getName();
-
- Commandline docker = newDocker();
- docker.clearArgs();
- docker.addArgs("run", "-d", "--name=" + containerName, "--network=" + network,
- "--network-alias=" + jobService.getName());
- for (EnvVar var: jobService.getEnvVars())
- docker.addArgs("--env", var.getName() + "=" + var.getValue());
- docker.addArgs(jobService.getImage());
- if (jobService.getArguments() != null) {
- for (String token: StringUtils.parseQuoteTokens(jobService.getArguments()))
- docker.addArgs(token);
+ protected List<String> getTrustCertContent() {
+ List<String> trustCertContent = new ArrayList<>();
+ ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
+ File keystoreFile = serverConfig.getKeystoreFile();
+ if (keystoreFile != null) {
+ String password = serverConfig.getKeystorePassword();
+ for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
+ trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
}
-
- docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
-
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- jobLogger.log("Waiting for service to be ready...");
-
- ObjectMapper jsonReader = OneDev.getInstance(ObjectMapper.class);
- while (true) {
- StringBuilder builder = new StringBuilder();
- docker.clearArgs();
- docker.addArgs("inspect", containerName);
- docker.execute(new LineConsumer(UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- builder.append(line).append("\n");
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- JsonNode stateNode;
- try {
- stateNode = jsonReader.readTree(builder.toString()).iterator().next().get("State");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- if (stateNode.get("Status").asText().equals("running")) {
- docker.clearArgs();
- docker.addArgs("exec", containerName);
-
- if (SystemUtils.IS_OS_WINDOWS)
- docker.addArgs("cmd", "/c", jobService.getReadinessCheckCommand());
- else
- docker.addArgs("sh", "-c", jobService.getReadinessCheckCommand());
-
- ExecutionResult result = docker.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log("Service readiness check: " + line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log("Service readiness check: " + line);
+ if (serverConfig.getTrustCertsDir() != null) {
+ for (File file: serverConfig.getTrustCertsDir().listFiles()) {
+ if (file.isFile()) {
+ try {
+ trustCertContent.addAll(FileUtils.readLines(file, UTF_8));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
}
-
- });
- if (result.getReturnCode() == 0) {
- jobLogger.log("Service is ready");
- break;
}
- } else if (stateNode.get("Status").asText().equals("exited")) {
- if (stateNode.get("OOMKilled").asText().equals("true"))
- jobLogger.error("Out of memory");
- else if (stateNode.get("Error").asText().length() != 0)
- jobLogger.error(stateNode.get("Error").asText());
-
- docker.clearArgs();
- docker.addArgs("logs", containerName);
- docker.execute(new LineConsumer(UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }, new LineConsumer(UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
-
- throw new ExplicitException(String.format("Service '" + jobService.getName() + "' is stopped unexpectedly"));
}
-
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- private LineConsumer newStyledLogger(SimpleLogger jobLogger) {
- return new LineConsumer(StandardCharsets.UTF_8.name()) {
-
- private final StyleBuilder styleBuilder = new StyleBuilder();
-
- @Override
- public void consume(String line) {
- jobLogger.log(line, styleBuilder);
- }
-
- };
- }
-
- private LineConsumer newErrorLogger(SimpleLogger jobLogger) {
- return new LineConsumer(StandardCharsets.UTF_8.name()) {
-
- @Override
- public void consume(String line) {
- jobLogger.warning(line);
- }
-
- };
+ }
+ return trustCertContent;
}
@Override
public void execute(String jobToken, JobContext jobContext) {
File hostBuildHome = FileUtils.createTempDir("onedev-build");
try {
- SimpleLogger jobLogger = jobContext.getLogger();
- getCapacityRunner().call(new Callable<Void>() {
-
+ TaskLogger jobLogger = jobContext.getLogger();
+ OneDev.getInstance(ResourceManager.class).run(new Runnable() {
+
@Override
- public Void call() {
+ public void run() {
String network = getName() + "-" + jobContext.getProjectName() + "-"
+ jobContext.getBuildNumber() + "-" + jobContext.getRetried();
jobLogger.log(String.format("Executing job (executor: %s, network: %s)...", getName(), network));
- jobContext.notifyJobRunning();
+ jobContext.notifyJobRunning(null);
JobManager jobManager = OneDev.getInstance(JobManager.class);
File hostCacheHome = getCacheHome();
@@ -469,18 +205,18 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
@Override
public void accept(File directory) {
- cleanDirAsRoot(directory);
+ DockerUtils.cleanDirAsRoot(directory, newDocker(), Bootstrap.isInDocker());
}
});
login(jobLogger);
- createNetwork(network, jobContext, jobLogger);
+ DockerUtils.createNetwork(newDocker(), network, jobLogger);
try {
for (Service jobService: jobContext.getServices()) {
jobLogger.log("Starting service (name: " + jobService.getName() + ", image: " + jobService.getImage() + ")...");
- startService(network, jobService, jobLogger);
+ DockerUtils.startService(newDocker(), network, jobService.toMap(), jobLogger);
}
AtomicReference<File> workspaceCache = new AtomicReference<>(null);
@@ -499,7 +235,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
FileUtils.createDir(hostWorkspace);
}
- AtomicReference<File> hostHome = new AtomicReference<>(null);
+ AtomicReference<File> hostAuthInfoHome = new AtomicReference<>(null);
try {
jobLogger.log("Copying job dependencies...");
jobContext.copyDependencies(hostWorkspace);
@@ -533,8 +269,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
CommandExecutable commandExecutable = (CommandExecutable) executable;
String[] containerCommand;
if (SystemUtils.IS_OS_WINDOWS) {
- if (hostHome.get() != null)
- containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\onedev\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};
+ if (hostAuthInfoHome.get() != null)
+ containerCommand = new String[] {"/c", "xcopy /Y /S /K /Q /H /R C:\\Users\\%USERNAME%\\auth-info\\* C:\\Users\\%USERNAME% > nul && C:\\onedev-build\\job-commands.bat"};
else
containerCommand = new String[] {"/c", "C:\\onedev-build\\job-commands.bat"};
File scriptFile = new File(hostBuildHome, "job-commands.bat");
@@ -547,8 +283,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
throw new RuntimeException(e);
}
} else {
- if (hostHome.get() != null)
- containerCommand = new String[] {"-c", "cp -r -f -p /root/onedev/. /root && sh /onedev-build/job-commands.sh"};
+ if (hostAuthInfoHome.get() != null)
+ containerCommand = new String[] {"-c", "cp -r -f -p /root/auth-info/. /root && sh /onedev-build/job-commands.sh"};
else
containerCommand = new String[] {"/onedev-build/job-commands.sh"};
File scriptFile = new File(hostBuildHome, "job-commands.sh");
@@ -583,13 +319,13 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
if (SystemUtils.IS_OS_LINUX)
docker.addArgs("-v", "/var/run/docker.sock:/var/run/docker.sock");
- if (hostHome.get() != null) {
- String outerPath = getOuterPath(hostHome.get().getAbsolutePath());
+ if (hostAuthInfoHome.get() != null) {
+ String outerPath = getOuterPath(hostAuthInfoHome.get().getAbsolutePath());
if (SystemUtils.IS_OS_WINDOWS) {
- docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerAdministrator\\onedev");
- docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerUser\\onedev");
+ docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerAdministrator\\auth-info");
+ docker.addArgs("-v", outerPath + ":C:\\Users\\ContainerUser\\auth-info");
} else {
- docker.addArgs("-v", outerPath + ":/root/onedev");
+ docker.addArgs("-v", outerPath + ":/root/auth-info");
}
}
@@ -600,33 +336,8 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
docker.addArgs(commandExecutable.getImage());
docker.addArgs(containerCommand);
- ProcessKiller killer = new ProcessKiller() {
-
- @Override
- public void kill(Process process, String executionId) {
- jobLogger.log("Stopping step container...");
- Commandline cmd = newDocker();
- cmd.addArgs("stop", containerName);
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- DockerExecutor.logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
- }
-
- };
-
- ExecutionResult result = docker.execute(newStyledLogger(jobLogger), newErrorLogger(jobLogger), null, killer);
+ ProcessKiller killer = DockerUtils.newDockerKiller(newDocker(), containerName, jobLogger);
+ ExecutionResult result = docker.execute(newInfoLogger(jobLogger), newErrorLogger(jobLogger), null, killer);
if (result.getReturnCode() != 0) {
errorMessages.add("Step \"" + stepNames + "\": Command failed with exit code " + result.getReturnCode());
return false;
@@ -637,105 +348,54 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
try {
CheckoutExecutable checkoutExecutable = (CheckoutExecutable) executable;
jobLogger.log("Checking out code...");
- if (hostHome.get() == null)
- hostHome.set(FileUtils.createTempDir());
+ if (hostAuthInfoHome.get() == null)
+ hostAuthInfoHome.set(FileUtils.createTempDir());
Commandline git = new Commandline(AppLoader.getInstance(GitConfig.class).getExecutable());
- git.workingDir(hostWorkspace).environments().put("HOME", hostHome.get().getAbsolutePath());
+ git.workingDir(hostWorkspace).environments().put("HOME", hostAuthInfoHome.get().getAbsolutePath());
CloneInfo cloneInfo = checkoutExecutable.getCloneInfo();
- cloneInfo.writeAuthData(hostHome.get(), git, newStyledLogger(jobLogger), newErrorLogger(jobLogger));
+ cloneInfo.writeAuthData(hostAuthInfoHome.get(), git, newInfoLogger(jobLogger), newErrorLogger(jobLogger));
- List<String> trustCertContent = new ArrayList<>();
- ServerConfig serverConfig = OneDev.getInstance(ServerConfig.class);
- File keystoreFile = serverConfig.getKeystoreFile();
- if (keystoreFile != null) {
- String password = serverConfig.getKeystorePassword();
- for (Map.Entry<String, String> entry: new PKCS12CertExtractor(keystoreFile, password).extact().entrySet())
- trustCertContent.addAll(Splitter.on('\n').trimResults().splitToList(entry.getValue()));
- }
- if (serverConfig.getTrustCertsDir() != null) {
- for (File file: serverConfig.getTrustCertsDir().listFiles()) {
- if (file.isFile())
- trustCertContent.addAll(FileUtils.readLines(file, UTF_8));
- }
- }
-
+ List<String> trustCertContent = getTrustCertContent();
if (!trustCertContent.isEmpty()) {
- installGitCert(new File(hostHome.get(), "trust-cert.pem"), trustCertContent,
- git, newStyledLogger(jobLogger), newErrorLogger(jobLogger));
+ installGitCert(new File(hostAuthInfoHome.get(), "trust-cert.pem"), trustCertContent,
+ git, newInfoLogger(jobLogger), newErrorLogger(jobLogger));
}
int cloneDepth = checkoutExecutable.getCloneDepth();
- cloneRepository(hostWorkspace, jobContext.getProjectGitDir().getAbsolutePath(),
- jobContext.getCommitId().name(), cloneDepth, git,
- newStyledLogger(jobLogger), newErrorLogger(jobLogger));
+ cloneRepository(git, jobContext.getProjectGitDir().getAbsolutePath(),
+ jobContext.getCommitId().name(), cloneDepth,
+ newInfoLogger(jobLogger), newErrorLogger(jobLogger));
- git.clearArgs();
- git.addArgs("remote", "add", "origin", cloneInfo.getCloneUrl());
- git.execute(newStyledLogger(jobLogger), newErrorLogger(jobLogger)).checkReturnCode();
+ addOriginRemote(git, cloneInfo.getCloneUrl(), newInfoLogger(jobLogger), newErrorLogger(jobLogger));
- if (new File(hostWorkspace, ".gitmodules").exists()) {
- if (SystemUtils.IS_OS_WINDOWS || !(cloneInfo instanceof SshCloneInfo)) {
- jobLogger.log("Retrieving submodules...");
-
- git.clearArgs();
- git.addArgs("submodule", "update", "--init", "--recursive", "--force", "--quiet");
- if (cloneDepth != 0)
- git.addArgs("--depth=" + cloneDepth);
- git.execute(newStyledLogger(jobLogger), newErrorLogger(jobLogger)).checkReturnCode();
- } else {
- /*
- * We need to update submodules within a helper image in order to use our own .ssh folder.
- * Specifying HOME env to change ~/.ssh folder does not have effect on Linux
- */
- Commandline cmd = newDocker();
- String containerName = network + "-submodule-update-helper";
- String homeOuterPath = getOuterPath(hostHome.get().getAbsolutePath());
- String workspaceOuterPath = getOuterPath(hostWorkspace.getAbsolutePath());
- cmd.addArgs("run", "--name=" + containerName, "-v", homeOuterPath + ":/root",
- "-v", workspaceOuterPath+ ":/git", "--rm", "alpine/git",
- "submodule", "update", "--init", "--recursive", "--force", "--quiet");
- if (cloneDepth != 0)
- cmd.addArgs("--depth=" + cloneDepth);
-
- jobLogger.log("Retrieving submodules with helper image...");
+ if (SystemUtils.IS_OS_WINDOWS || !(cloneInfo instanceof SshCloneInfo)) {
+ updateSubmodulesIfNecessary(git, cloneDepth, newInfoLogger(jobLogger), newErrorLogger(jobLogger));
+ } else if (new File(hostWorkspace, ".gitmodules").exists()) {
+ /*
+ * We need to update submodules within a helper image in order to use our own .ssh folder.
+ * Specifying HOME env to change ~/.ssh folder does not have effect on Linux
+ */
+ Provider<Commandline> dockerProvider = new Provider<Commandline>() {
+
+ @Override
+ public Commandline get() {
+ return newDocker();
+ }
- cmd.execute(newStyledLogger(jobLogger), newErrorLogger(jobLogger), null, new ProcessKiller() {
-
- @Override
- public void kill(Process process, String executionId) {
- jobLogger.log("Stopping submodule update helper container...");
- Commandline cmd = newDocker();
- cmd.addArgs("stop", containerName);
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- DockerExecutor.logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }).checkReturnCode();
- }
-
- }).checkReturnCode();
- }
- }
+ };
+
+ String hostAuthInfoHomeOuterPath = getOuterPath(hostAuthInfoHome.get().getAbsolutePath());
+ String workspaceOuterPath = getOuterPath(hostWorkspace.getAbsolutePath());
+ DockerUtils.dockerUpdateSubmodules(dockerProvider, network, hostAuthInfoHomeOuterPath,
+ workspaceOuterPath, cloneDepth, jobLogger);
+ }
return true;
} catch (Exception e) {
- String errorMessage = ExceptionUtils.getExpectedError(e);
- if (errorMessage == null)
- errorMessage = Throwables.getStackTraceAsString(e);
- errorMessages.add("Step \"" + stepNames + "\" is failed: " + errorMessage);
+ errorMessages.add("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
}
} else {
@@ -770,10 +430,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return true;
} catch (Exception e) {
- String errorMessage = ExceptionUtils.getExpectedError(e);
- if (errorMessage == null)
- errorMessage = Throwables.getStackTraceAsString(e);
- errorMessages.add("Step \"" + stepNames + "\" is failed: " + errorMessage);
+ errorMessages.add("Step \"" + stepNames + "\" is failed: " + getErrorMessage(e));
return false;
} finally {
FileUtils.deleteDir(filesDir);
@@ -794,56 +451,25 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
jobLogger.log("Reporting job caches...");
jobManager.reportJobCaches(jobToken, getCacheInstances(hostCacheHome).keySet());
-
- return null;
} finally {
- if (hostHome.get() != null)
- FileUtils.deleteDir(hostHome.get());
+ if (hostAuthInfoHome.get() != null)
+ FileUtils.deleteDir(hostAuthInfoHome.get());
}
} finally {
- deleteNetwork(network, jobLogger);
- }
+ DockerUtils.deleteNetwork(newDocker(), network, jobLogger);
+ }
}
- });
+ }, jobContext.getResourceRequirements(), jobLogger);
} finally {
- cleanDirAsRoot(hostBuildHome);
+ DockerUtils.cleanDirAsRoot(hostBuildHome, newDocker(), Bootstrap.isInDocker());
FileUtils.deleteDir(hostBuildHome);
}
}
- private void login(SimpleLogger jobLogger) {
- for (RegistryLogin login: getRegistryLogins()) {
- if (login.getRegistryUrl() != null)
- jobLogger.log(String.format("Login to docker registry '%s'...", login.getRegistryUrl()));
- else
- jobLogger.log("Login to official docker registry...");
- Commandline cmd = newDocker();
- cmd.addArgs("login", "-u", login.getUserName(), "--password-stdin");
- if (login.getRegistryUrl() != null)
- cmd.addArgs(login.getRegistryUrl());
- ByteArrayInputStream input;
- try {
- input = new ByteArrayInputStream(login.getPassword().getBytes(UTF_8.name()));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.debug(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- jobLogger.log(line);
- }
-
- }, input).checkReturnCode();
- }
+ private void login(TaskLogger jobLogger) {
+ for (RegistryLogin login: getRegistryLogins())
+ DockerUtils.login(newDocker(), login.getRegistryUrl(), login.getUserName(), login.getPassword(), jobLogger);
}
private boolean hasOptions(String[] arguments, String... options) {
@@ -863,6 +489,13 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
return false;
}
+ private String getErrorMessage(Exception exception) {
+ String errorMessage = ExceptionUtils.getExpectedError(exception);
+ if (errorMessage == null)
+ errorMessage = Throwables.getStackTraceAsString(exception);
+ return errorMessage;
+ }
+
@Override
public boolean isValid(ConstraintValidatorContext context) {
boolean isValid = true;
@@ -934,7 +567,7 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
@Override
- public void test(TestData testData, SimpleLogger jobLogger) {
+ public void test(TestData testData, TaskLogger jobLogger) {
login(jobLogger);
jobLogger.log("Running container...");
@@ -1015,35 +648,6 @@ public class DockerExecutor extends JobExecutor implements Testable<TestData>, V
}
}
- public void cleanDirAsRoot(File dir) {
- if (SystemUtils.IS_OS_WINDOWS || Bootstrap.isInDocker()) {
- FileUtils.cleanDir(dir);
- } else {
- Commandline cmd = newDocker();
- String containerPath = "/dir-to-clean";
- cmd.addArgs("run", "-v", dir.getAbsolutePath() + ":" + containerPath, "--rm",
- "busybox", "sh", "-c", "rm -rf " + containerPath + "/*");
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.info(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.contains("Error response from daemon"))
- logger.error(line);
- else
- logger.info(line);
- }
-
- }).checkReturnCode();
- }
- }
-
@Editable(name="Specify a Docker Image to Test Against")
public static class TestData implements Serializable {
diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerModule.java b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
similarity index 88%
rename from server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerModule.java
rename to server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
index da7ab33880..3266aae74b 100644
--- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/executor/docker/DockerModule.java
+++ b/server-plugin/server-plugin-executor-serverdocker/src/main/java/io/onedev/server/plugin/executor/serverdocker/ServerDockerModule.java
@@ -1,4 +1,4 @@
-package io.onedev.server.plugin.executor.docker;
+package io.onedev.server.plugin.executor.serverdocker;
import java.util.Collection;
@@ -16,7 +16,7 @@ import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;
* NOTE: Do not forget to rename moduleClass property defined in the pom if you've renamed this class.
*
*/
-public class DockerModule extends AbstractPluginModule {
+public class ServerDockerModule extends AbstractPluginModule {
@Override
protected void configure() {
@@ -32,7 +32,7 @@ public class DockerModule extends AbstractPluginModule {
@Override
public Collection<Class<?>> getImplementations() {
- return Sets.newHashSet(DockerExecutor.class);
+ return Sets.newHashSet(ServerDockerExecutor.class);
}
});
@@ -58,7 +58,7 @@ public class DockerModule extends AbstractPluginModule {
}).checkReturnCode();
- return new DockerExecutor();
+ return new ServerDockerExecutor();
} catch (Exception e) {
if (ExceptionUtils.find(e, InterruptedException.class) != null)
throw ExceptionUtils.unchecked(e);
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java
index b769f1dc5c..5c0ab1b93a 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/BitbucketProjectImporter.java
@@ -10,13 +10,13 @@ import org.apache.http.client.utils.URIBuilder;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.model.Project;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.JerseyUtils;
-import io.onedev.server.util.SimpleLogger;
public class BitbucketProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {
@@ -29,7 +29,7 @@ public class BitbucketProjectImporter extends ProjectImporter<ImportServer, Proj
@Override
public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Collection<Long> projectIds = new ArrayList<>();
Client client = where.newClient();
try {
@@ -77,7 +77,7 @@ public class BitbucketProjectImporter extends ProjectImporter<ImportServer, Proj
}
@Override
- public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public ProjectImportSource getWhat(ImportServer where, TaskLogger logger) {
ProjectImportSource importSource = new ProjectImportSource();
Client client = where.newClient();
try {
@@ -96,7 +96,7 @@ public class BitbucketProjectImporter extends ProjectImporter<ImportServer, Proj
}
@Override
- public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {
+ public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, TaskLogger logger) {
return new ProjectImportOption();
}
diff --git a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportUtils.java b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportUtils.java
index 52d17f68b5..0810d5cecc 100644
--- a/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportUtils.java
+++ b/server-plugin/server-plugin-import-bitbucketcloud/src/main/java/io/onedev/server/plugin/imports/bitbucketcloud/ImportUtils.java
@@ -11,9 +11,9 @@ import org.apache.http.client.utils.URIBuilder;
import com.fasterxml.jackson.databind.JsonNode;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
-import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
@@ -21,7 +21,7 @@ public class ImportUtils {
static final int PER_PAGE = 50;
- static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {
+ static List<JsonNode> list(Client client, String apiEndpoint, TaskLogger logger) {
List<JsonNode> result = new ArrayList<>();
list(client, apiEndpoint, new PageDataConsumer() {
@@ -35,7 +35,7 @@ public class ImportUtils {
}
static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer,
- SimpleLogger logger) {
+ TaskLogger logger) {
URI uri;
try {
uri = new URIBuilder(apiEndpoint)
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.java
index d8051a9f14..135dc8c54a 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaIssueImporter.java
@@ -6,10 +6,10 @@ import java.util.Optional;
import com.google.common.collect.Lists;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.util.WicketUtils;
public class GiteaIssueImporter extends IssueImporter<ImportServer, IssueImportSource, IssueImportOption> {
@@ -22,19 +22,19 @@ public class GiteaIssueImporter extends IssueImporter<ImportServer, IssueImportS
}
@Override
- public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public IssueImportSource getWhat(ImportServer where, TaskLogger logger) {
WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);
return new IssueImportSource();
}
@Override
- public IssueImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {
+ public IssueImportOption getHow(ImportServer where, IssueImportSource what, TaskLogger logger) {
return ImportUtils.buildIssueImportOption(where, Lists.newArrayList(what.getRepository()), logger);
}
@Override
public String doImport(ImportServer where, IssueImportSource what, IssueImportOption how,
- Project project, boolean dryRun, SimpleLogger logger) {
+ Project project, boolean dryRun, TaskLogger logger) {
logger.log("Importing issues from repository " + what.getRepository() + "...");
Map<String, Optional<User>> users = new HashMap<>();
return ImportUtils.importIssues(where, what.getRepository(), project, false, how, users, dryRun, logger)
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java
index 2760374087..5cdbcffa52 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/GiteaProjectImporter.java
@@ -15,6 +15,7 @@ import org.joda.time.format.ISODateTimeFormat;
import com.fasterxml.jackson.databind.JsonNode;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -24,7 +25,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.JerseyUtils;
-import io.onedev.server.util.SimpleLogger;
public class GiteaProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {
@@ -36,7 +36,7 @@ public class GiteaProjectImporter extends ProjectImporter<ImportServer, ProjectI
}
@Override
- public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public ProjectImportSource getWhat(ImportServer where, TaskLogger logger) {
ProjectImportSource importSource = new ProjectImportSource();
Client client = where.newClient();
try {
@@ -56,7 +56,7 @@ public class GiteaProjectImporter extends ProjectImporter<ImportServer, ProjectI
}
@Override
- public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {
+ public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, TaskLogger logger) {
ProjectImportOption importOption = new ProjectImportOption();
List<String> repos = what.getProjectMappings().stream().map(it->it.getGiteaRepo()).collect(Collectors.toList());
importOption.setIssueImportOption(ImportUtils.buildIssueImportOption(where, repos, logger));
@@ -65,7 +65,7 @@ public class GiteaProjectImporter extends ProjectImporter<ImportServer, ProjectI
@Override
public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Collection<Long> projectIds = new ArrayList<>();
Client client = where.newClient();
try {
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java
index 6040ea75c1..37920a6ecb 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/ImportUtils.java
@@ -27,6 +27,7 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -47,7 +48,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
@@ -55,7 +55,7 @@ public class ImportUtils {
static final int PER_PAGE = 50;
- static IssueImportOption buildIssueImportOption(ImportServer server, Collection<String> repositories, SimpleLogger logger) {
+ static IssueImportOption buildIssueImportOption(ImportServer server, Collection<String> repositories, TaskLogger logger) {
IssueImportOption importOption = new IssueImportOption();
Client client = server.newClient();
try {
@@ -85,7 +85,7 @@ public class ImportUtils {
}
@Nullable
- static User getUser(Map<String, Optional<User>> users, JsonNode userNode, SimpleLogger logger) {
+ static User getUser(Map<String, Optional<User>> users, JsonNode userNode, TaskLogger logger) {
String login = userNode.get("login").asText();
Optional<User> userOpt = users.get(login);
if (userOpt == null) {
@@ -103,7 +103,7 @@ public class ImportUtils {
static ImportResult importIssues(ImportServer server, String giteaRepo, Project oneDevProject,
boolean useExistingIssueNumbers, IssueImportOption importOption, Map<String, Optional<User>> users,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Client client = server.newClient();
try {
Set<String> nonExistentMilestones = new HashSet<>();
@@ -356,7 +356,7 @@ public class ImportUtils {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
- static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {
+ static List<JsonNode> list(Client client, String apiEndpoint, TaskLogger logger) {
List<JsonNode> result = new ArrayList<>();
list(client, apiEndpoint, new PageDataConsumer() {
@@ -370,7 +370,7 @@ public class ImportUtils {
}
static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer,
- SimpleLogger logger) {
+ TaskLogger logger) {
URI uri;
try {
uri = new URIBuilder(apiEndpoint)
diff --git a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.java b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.java
index 0083aeb4c3..1a55cc8cc2 100644
--- a/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.java
+++ b/server-plugin/server-plugin-import-gitea/src/main/java/io/onedev/server/plugin/imports/gitea/IssueImportSource.java
@@ -13,8 +13,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.util.WicketUtils;
@@ -48,10 +47,10 @@ public class IssueImportSource implements Serializable {
Client client = server.newClient();
try {
String apiEndpoint = server.getApiEndpoint("/user/repos");
- for (JsonNode repoNode: ImportUtils.list(client, apiEndpoint, new SimpleLogger() {
+ for (JsonNode repoNode: ImportUtils.list(client, apiEndpoint, new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
logger.info(message);
}
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java
index 76f332c29d..6506e3b492 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubIssueImporter.java
@@ -10,10 +10,10 @@ import java.util.Optional;
import com.google.common.collect.Lists;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.util.WicketUtils;
public class GitHubIssueImporter extends IssueImporter<ImportServer, IssueImportSource, IssueImportOption> {
@@ -27,7 +27,7 @@ public class GitHubIssueImporter extends IssueImporter<ImportServer, IssueImport
@Override
public String doImport(ImportServer where, IssueImportSource what, IssueImportOption how, Project project,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
logger.log("Importing issues from repository " + what.getRepository() + "...");
Map<String, Optional<User>> users = new HashMap<>();
return importIssues(where, what.getRepository(), project, false, how, users, dryRun, logger)
@@ -35,13 +35,13 @@ public class GitHubIssueImporter extends IssueImporter<ImportServer, IssueImport
}
@Override
- public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public IssueImportSource getWhat(ImportServer where, TaskLogger logger) {
WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);
return new IssueImportSource();
}
@Override
- public IssueImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {
+ public IssueImportOption getHow(ImportServer where, IssueImportSource what, TaskLogger logger) {
return buildImportOption(where, Lists.newArrayList(what.getRepository()), logger);
}
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
index 513fc5c05d..ec5b7713a9 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/GitHubProjectImporter.java
@@ -20,6 +20,7 @@ import org.joda.time.format.ISODateTimeFormat;
import com.fasterxml.jackson.databind.JsonNode;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -28,7 +29,6 @@ import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.SimpleLogger;
public class GitHubProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {
@@ -41,7 +41,7 @@ public class GitHubProjectImporter extends ProjectImporter<ImportServer, Project
@Override
public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Collection<Long> projectIds = new ArrayList<>();
Client client = where.newClient();
try {
@@ -114,7 +114,7 @@ public class GitHubProjectImporter extends ProjectImporter<ImportServer, Project
}
@Override
- public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public ProjectImportSource getWhat(ImportServer where, TaskLogger logger) {
ProjectImportSource importSource = new ProjectImportSource();
Client client = where.newClient();
try {
@@ -134,7 +134,7 @@ public class GitHubProjectImporter extends ProjectImporter<ImportServer, Project
}
@Override
- public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {
+ public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, TaskLogger logger) {
ProjectImportOption importOption = new ProjectImportOption();
List<String> gitHubRepos = what.getProjectMappings().stream()
.map(it->it.getGitHubRepo()).collect(Collectors.toList());
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java
index ce226ecd6c..c768cd6ba2 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/ImportUtils.java
@@ -28,6 +28,7 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -46,7 +47,6 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
@@ -54,7 +54,7 @@ public class ImportUtils {
static final int PER_PAGE = 50;
- static IssueImportOption buildImportOption(ImportServer server, Collection<String> gitHubRepos, SimpleLogger logger) {
+ static IssueImportOption buildImportOption(ImportServer server, Collection<String> gitHubRepos, TaskLogger logger) {
IssueImportOption importOption = new IssueImportOption();
Client client = server.newClient();
try {
@@ -78,7 +78,7 @@ public class ImportUtils {
@Nullable
static User getUser(Client client, ImportServer importSource,
- Map<String, Optional<User>> users, String login, SimpleLogger logger) {
+ Map<String, Optional<User>> users, String login, TaskLogger logger) {
Optional<User> userOpt = users.get(login);
if (userOpt == null) {
String apiEndpoint = importSource.getApiEndpoint("/users/" + login);
@@ -94,7 +94,7 @@ public class ImportUtils {
static ImportResult importIssues(ImportServer server, String gitHubRepo, Project oneDevProject,
boolean useExistingIssueNumbers, IssueImportOption importOption, Map<String, Optional<User>> users,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Client client = server.newClient();
try {
Set<String> nonExistentMilestones = new HashSet<>();
@@ -323,7 +323,7 @@ public class ImportUtils {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
- static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {
+ static List<JsonNode> list(Client client, String apiEndpoint, TaskLogger logger) {
List<JsonNode> result = new ArrayList<>();
list(client, apiEndpoint, new PageDataConsumer() {
@@ -337,7 +337,7 @@ public class ImportUtils {
}
static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer,
- SimpleLogger logger) {
+ TaskLogger logger) {
URI uri;
try {
uri = new URIBuilder(apiEndpoint)
@@ -364,7 +364,7 @@ public class ImportUtils {
}
}
- static JsonNode get(Client client, String apiEndpoint, SimpleLogger logger) {
+ static JsonNode get(Client client, String apiEndpoint, TaskLogger logger) {
WebTarget target = client.target(apiEndpoint);
Invocation.Builder builder = target.request();
while (true) {
diff --git a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.java b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.java
index 928e49fb33..88144a905d 100644
--- a/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.java
+++ b/server-plugin/server-plugin-import-github/src/main/java/io/onedev/server/plugin/imports/github/IssueImportSource.java
@@ -15,8 +15,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.util.WicketUtils;
@@ -52,10 +51,10 @@ public class IssueImportSource implements Serializable {
Client client = server.newClient();
try {
String apiEndpoint = server.getApiEndpoint("/user/repos");
- SimpleLogger logger = new SimpleLogger() {
+ TaskLogger logger = new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
IssueImportSource.logger.info(message);
}
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java
index f6e9e420fe..e85235dbb7 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabIssueImporter.java
@@ -9,10 +9,10 @@ import java.util.Optional;
import com.google.common.collect.Lists;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.util.WicketUtils;
public class GitLabIssueImporter extends IssueImporter<ImportServer, IssueImportSource, IssueImportOption> {
@@ -26,7 +26,7 @@ public class GitLabIssueImporter extends IssueImporter<ImportServer, IssueImport
@Override
public String doImport(ImportServer where, IssueImportSource what, IssueImportOption how, Project project,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
logger.log("Importing issues from project " + what.getProject() + "...");
Map<String, Optional<User>> users = new HashMap<>();
return importIssues(where, what.getProject(), project, false, how, users, dryRun, logger)
@@ -34,13 +34,13 @@ public class GitLabIssueImporter extends IssueImporter<ImportServer, IssueImport
}
@Override
- public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public IssueImportSource getWhat(ImportServer where, TaskLogger logger) {
WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);
return new IssueImportSource();
}
@Override
- public IssueImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {
+ public IssueImportOption getHow(ImportServer where, IssueImportSource what, TaskLogger logger) {
return ImportUtils.buildImportOption(where, Lists.newArrayList(what.getProject()), logger);
}
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java
index eaa4c4e437..26be1d7326 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/GitLabProjectImporter.java
@@ -18,6 +18,7 @@ import org.joda.time.format.ISODateTimeFormat;
import com.fasterxml.jackson.databind.JsonNode;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
@@ -27,7 +28,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.JerseyUtils;
-import io.onedev.server.util.SimpleLogger;
public class GitLabProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ProjectImportOption> {
@@ -38,7 +38,7 @@ public class GitLabProjectImporter extends ProjectImporter<ImportServer, Project
return NAME;
}
- private List<Milestone> getMilestones(ImportServer server, String groupId, SimpleLogger logger) {
+ private List<Milestone> getMilestones(ImportServer server, String groupId, TaskLogger logger) {
Client client = server.newClient();
try {
List<Milestone> milestones = new ArrayList<>();
@@ -70,7 +70,7 @@ public class GitLabProjectImporter extends ProjectImporter<ImportServer, Project
@Override
public String doImport(ImportServer where, ProjectImportSource what, ProjectImportOption how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Collection<Long> projectIds = new ArrayList<>();
Client client = where.newClient();
try {
@@ -141,7 +141,7 @@ public class GitLabProjectImporter extends ProjectImporter<ImportServer, Project
}
@Override
- public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public ProjectImportSource getWhat(ImportServer where, TaskLogger logger) {
ProjectImportSource importSource = new ProjectImportSource();
Client client = where.newClient();
try {
@@ -160,7 +160,7 @@ public class GitLabProjectImporter extends ProjectImporter<ImportServer, Project
}
@Override
- public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {
+ public ProjectImportOption getHow(ImportServer where, ProjectImportSource what, TaskLogger logger) {
List<String> gitLabProjects = what.getProjectMappings().stream()
.map(it->it.getGitLabProject()).collect(Collectors.toList());
ProjectImportOption importOption = new ProjectImportOption();
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java
index 83893e3b1a..9ca04d2877 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/ImportUtils.java
@@ -32,6 +32,7 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -53,7 +54,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
@@ -63,7 +63,7 @@ public class ImportUtils {
private static final Pattern PATTERN_ATTACHMENT = Pattern.compile("\\[(.+?)\\]\\s*\\((/uploads/.+?)\\)");
- static IssueImportOption buildImportOption(ImportServer server, Collection<String> gitLabProjects, SimpleLogger logger) {
+ static IssueImportOption buildImportOption(ImportServer server, Collection<String> gitLabProjects, TaskLogger logger) {
IssueImportOption importOption = new IssueImportOption();
Client client = server.newClient();
try {
@@ -87,7 +87,7 @@ public class ImportUtils {
@Nullable
static User getUser(Client client, ImportServer importSource, Map<String, Optional<User>> users,
- String userId, SimpleLogger logger) {
+ String userId, TaskLogger logger) {
Optional<User> userOpt = users.get(userId);
if (userOpt == null) {
String apiEndpoint = importSource.getApiEndpoint("/users/" + userId);
@@ -108,7 +108,7 @@ public class ImportUtils {
static ImportResult importIssues(ImportServer server, String gitLabProject, Project oneDevProject,
boolean useExistingIssueNumbers, IssueImportOption importOption, Map<String, Optional<User>> users,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Client client = server.newClient();
try {
Set<String> nonExistentMilestones = new HashSet<>();
@@ -450,7 +450,7 @@ public class ImportUtils {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
- static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {
+ static List<JsonNode> list(Client client, String apiEndpoint, TaskLogger logger) {
List<JsonNode> result = new ArrayList<>();
list(client, apiEndpoint, new PageDataConsumer() {
@@ -464,7 +464,7 @@ public class ImportUtils {
}
static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer,
- SimpleLogger logger) {
+ TaskLogger logger) {
URI uri;
try {
uri = new URIBuilder(apiEndpoint)
diff --git a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.java b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.java
index fe55d9eebf..3f2a6bbee7 100644
--- a/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.java
+++ b/server-plugin/server-plugin-import-gitlab/src/main/java/io/onedev/server/plugin/imports/gitlab/IssueImportSource.java
@@ -14,8 +14,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.util.WicketUtils;
@@ -49,10 +48,10 @@ public class IssueImportSource implements Serializable {
Client client = server.newClient();
try {
String apiEndpoint = server.getApiEndpoint("/projects?membership=true");
- Collection<JsonNode> projectNodes = ImportUtils.list(client, apiEndpoint, new SimpleLogger() {
+ Collection<JsonNode> projectNodes = ImportUtils.list(client, apiEndpoint, new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
logger.info(message);
}
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java
index ea4b212a92..9cd5690e8b 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/ImportUtils.java
@@ -36,6 +36,7 @@ import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -55,7 +56,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
@@ -68,7 +68,7 @@ public class ImportUtils {
}
@Nullable
- static User getUser(Map<String, Optional<User>> users, JsonNode userNode, SimpleLogger logger) {
+ static User getUser(Map<String, Optional<User>> users, JsonNode userNode, TaskLogger logger) {
String accountId = userNode.get("accountId").asText();
Optional<User> userOpt = users.get(accountId);
if (userOpt == null) {
@@ -235,7 +235,7 @@ public class ImportUtils {
static ImportResult importIssues(ImportServer server, JsonNode jiraProject, Project oneDevProject,
boolean useExistingIssueNumbers, ImportOption importOption,
- Map<String, Optional<User>> users, boolean dryRun, SimpleLogger logger) {
+ Map<String, Optional<User>> users, boolean dryRun, TaskLogger logger) {
Client client = server.newClient();
try {
Set<String> unmappedIssueStatuses = new HashSet<>();
@@ -685,7 +685,7 @@ public class ImportUtils {
}
}
- static ImportOption buildImportOption(ImportServer server, Collection<String> projectNames, SimpleLogger logger) {
+ static ImportOption buildImportOption(ImportServer server, Collection<String> projectNames, TaskLogger logger) {
ImportOption importOption = new ImportOption();
Map<String, JsonNode> projectNodes = getProjectNodes(server, logger);
@@ -739,7 +739,7 @@ public class ImportUtils {
return importOption;
}
- static Map<String, JsonNode> getProjectNodes(ImportServer where, SimpleLogger logger) {
+ static Map<String, JsonNode> getProjectNodes(ImportServer where, TaskLogger logger) {
Map<String, JsonNode> projectNodes = new LinkedHashMap<>();
Client client = where.newClient();
@@ -752,7 +752,7 @@ public class ImportUtils {
return projectNodes;
}
- static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {
+ static List<JsonNode> list(Client client, String apiEndpoint, TaskLogger logger) {
List<JsonNode> result = new ArrayList<>();
list(client, apiEndpoint, new PageDataConsumer() {
@@ -766,7 +766,7 @@ public class ImportUtils {
}
static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer,
- SimpleLogger logger) {
+ TaskLogger logger) {
URI uri;
try {
uri = new URIBuilder(apiEndpoint)
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueImportSource.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueImportSource.java
index 613c13c969..cab07b2f5e 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueImportSource.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/IssueImportSource.java
@@ -13,8 +13,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
-import io.onedev.server.util.SimpleLogger;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.util.WicketUtils;
@@ -48,10 +47,10 @@ public class IssueImportSource implements Serializable {
Client client = server.newClient();
try {
String apiEndpoint = server.getApiEndpoint("/project/search");
- for (JsonNode projectNode: ImportUtils.list(client, apiEndpoint, new SimpleLogger() {
+ for (JsonNode projectNode: ImportUtils.list(client, apiEndpoint, new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
logger.info(message);
}
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraIssueImporter.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraIssueImporter.java
index 0813a1a8a8..396f8f5d48 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraIssueImporter.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraIssueImporter.java
@@ -10,10 +10,10 @@ import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.collect.Lists;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.util.WicketUtils;
public class JiraIssueImporter extends IssueImporter<ImportServer, IssueImportSource, ImportOption> {
@@ -26,19 +26,19 @@ public class JiraIssueImporter extends IssueImporter<ImportServer, IssueImportSo
}
@Override
- public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public IssueImportSource getWhat(ImportServer where, TaskLogger logger) {
WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);
return new IssueImportSource();
}
@Override
- public ImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {
+ public ImportOption getHow(ImportServer where, IssueImportSource what, TaskLogger logger) {
return ImportUtils.buildImportOption(where, Lists.newArrayList(what.getProject()), logger);
}
@Override
public String doImport(ImportServer where, IssueImportSource what, ImportOption how,
- Project project, boolean dryRun, SimpleLogger logger) {
+ Project project, boolean dryRun, TaskLogger logger) {
Map<String, JsonNode> projectNodes = ImportUtils.getProjectNodes(where, logger);
Client client = where.newClient();
diff --git a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java
index 0d7b7c1cd7..3e4960fb0c 100644
--- a/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java
+++ b/server-plugin/server-plugin-import-jiracloud/src/main/java/io/onedev/server/plugin/imports/jiracloud/JiraProjectImporter.java
@@ -13,6 +13,7 @@ import javax.ws.rs.client.Client;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.imports.ProjectImporter;
@@ -20,7 +21,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.storage.StorageManager;
import io.onedev.server.util.JerseyUtils;
-import io.onedev.server.util.SimpleLogger;
public class JiraProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ImportOption> {
@@ -32,7 +32,7 @@ public class JiraProjectImporter extends ProjectImporter<ImportServer, ProjectIm
}
@Override
- public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public ProjectImportSource getWhat(ImportServer where, TaskLogger logger) {
ProjectImportSource importSource = new ProjectImportSource();
for (String projectName: ImportUtils.getProjectNodes(where, logger).keySet()) {
ProjectMapping mapping = new ProjectMapping();
@@ -44,7 +44,7 @@ public class JiraProjectImporter extends ProjectImporter<ImportServer, ProjectIm
}
@Override
- public ImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {
+ public ImportOption getHow(ImportServer where, ProjectImportSource what, TaskLogger logger) {
List<String> jiraProjects = what.getProjectMappings().stream()
.map(it->it.getJiraProject()).collect(Collectors.toList());
return ImportUtils.buildImportOption(where, jiraProjects, logger);
@@ -52,7 +52,7 @@ public class JiraProjectImporter extends ProjectImporter<ImportServer, ProjectIm
@Override
public String doImport(ImportServer where, ProjectImportSource what, ImportOption how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Collection<Long> projectIds = new ArrayList<>();
Map<String, JsonNode> projectNodes = ImportUtils.getProjectNodes(where, logger);
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
index 71b01a39ac..5c767b7acc 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportServer.java
@@ -21,9 +21,8 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.buildspec.job.log.StyleBuilder;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.util.JerseyUtils;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.util.validation.Validatable;
import io.onedev.server.util.validation.annotation.ClassValidating;
import io.onedev.server.web.editable.annotation.Editable;
@@ -142,10 +141,10 @@ public class ImportServer implements Serializable, Validatable {
Client client = newClient();
try {
- SimpleLogger logger = new SimpleLogger() {
+ TaskLogger logger = new TaskLogger() {
@Override
- public void log(String message, StyleBuilder styleBuilder) {
+ public void log(String message, String taskId) {
ImportServer.logger.info(message);
}
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
index 5d05f9e7c6..345bf0a9cc 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/ImportUtils.java
@@ -29,6 +29,7 @@ import org.unbescape.html.HtmlEscape;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.IssueManager;
import io.onedev.server.entitymanager.SettingManager;
@@ -58,7 +59,6 @@ import io.onedev.server.util.DateUtils;
import io.onedev.server.util.JerseyUtils;
import io.onedev.server.util.JerseyUtils.PageDataConsumer;
import io.onedev.server.util.Pair;
-import io.onedev.server.util.SimpleLogger;
public class ImportUtils {
@@ -66,7 +66,7 @@ public class ImportUtils {
static final int PER_PAGE = 50;
- static ImportOption buildImportOption(ImportServer server, Collection<JsonNode> projectNodes, SimpleLogger logger) {
+ static ImportOption buildImportOption(ImportServer server, Collection<JsonNode> projectNodes, TaskLogger logger) {
ImportOption importOption = new ImportOption();
Client client = server.newClient();
try {
@@ -121,7 +121,7 @@ public class ImportUtils {
static ImportResult importIssues(ImportServer server, String youTrackProjectId,
Project oneDevProject, boolean useExistingIssueNumbers, ImportOption importOption,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Client client = server.newClient();
try {
String apiEndpoint = server.getApiEndpoint("/admin/projects/" + youTrackProjectId + "?fields=shortName");
@@ -814,7 +814,7 @@ public class ImportUtils {
return OneDev.getInstance(SettingManager.class).getIssueSetting();
}
- static List<JsonNode> list(Client client, String apiEndpoint, SimpleLogger logger) {
+ static List<JsonNode> list(Client client, String apiEndpoint, TaskLogger logger) {
List<JsonNode> result = new ArrayList<>();
list(client, apiEndpoint, new PageDataConsumer() {
@@ -827,7 +827,7 @@ public class ImportUtils {
return result;
}
- static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer, SimpleLogger logger) {
+ static void list(Client client, String apiEndpoint, PageDataConsumer pageDataConsumer, TaskLogger logger) {
URI uri;
try {
uri = new URIBuilder(apiEndpoint)
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java
index 7c6367ce86..42cde887f9 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackIssueImporter.java
@@ -12,9 +12,9 @@ import javax.ws.rs.client.Client;
import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.model.Project;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.util.WicketUtils;
public class YouTrackIssueImporter extends IssueImporter<ImportServer, IssueImportSource, ImportOption> {
@@ -28,7 +28,7 @@ public class YouTrackIssueImporter extends IssueImporter<ImportServer, IssueImpo
@Override
public String doImport(ImportServer where, IssueImportSource what, ImportOption how, Project project,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
logger.log("Importing issues from '" + what.getProject() + "'...");
Client client = where.newClient();
try {
@@ -47,13 +47,13 @@ public class YouTrackIssueImporter extends IssueImporter<ImportServer, IssueImpo
}
@Override
- public IssueImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public IssueImportSource getWhat(ImportServer where, TaskLogger logger) {
WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);
return new IssueImportSource();
}
@Override
- public ImportOption getHow(ImportServer where, IssueImportSource what, SimpleLogger logger) {
+ public ImportOption getHow(ImportServer where, IssueImportSource what, TaskLogger logger) {
Client client = where.newClient();
try {
String apiEndpoint = where.getApiEndpoint("/admin/projects?fields=id,name,customFields(field(name),bundle(values(name)))");
diff --git a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java
index 5d29f7bf0f..7023680011 100644
--- a/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java
+++ b/server-plugin/server-plugin-import-youtrack/src/main/java/io/onedev/server/plugin/imports/youtrack/YouTrackProjectImporter.java
@@ -16,12 +16,12 @@ import com.fasterxml.jackson.databind.JsonNode;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
import io.onedev.server.imports.ProjectImporter;
import io.onedev.server.model.Project;
import io.onedev.server.storage.StorageManager;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.util.WicketUtils;
public class YouTrackProjectImporter extends ProjectImporter<ImportServer, ProjectImportSource, ImportOption> {
@@ -35,7 +35,7 @@ public class YouTrackProjectImporter extends ProjectImporter<ImportServer, Proje
@Override
public String doImport(ImportServer where, ProjectImportSource what, ImportOption how,
- boolean dryRun, SimpleLogger logger) {
+ boolean dryRun, TaskLogger logger) {
Map<String, String> youTrackProjectIds = new HashMap<>();
Map<String, String> youTrackProjectDescriptions = new HashMap<>();
Collection<Long> projectIds = new ArrayList<>();
@@ -89,13 +89,13 @@ public class YouTrackProjectImporter extends ProjectImporter<ImportServer, Proje
}
@Override
- public ProjectImportSource getWhat(ImportServer where, SimpleLogger logger) {
+ public ProjectImportSource getWhat(ImportServer where, TaskLogger logger) {
WicketUtils.getPage().setMetaData(ImportServer.META_DATA_KEY, where);
return new ProjectImportSource();
}
@Override
- public ImportOption getHow(ImportServer where, ProjectImportSource what, SimpleLogger logger) {
+ public ImportOption getHow(ImportServer where, ProjectImportSource what, TaskLogger logger) {
Client client = where.newClient();
try {
List<JsonNode> projectNodes = new ArrayList<>();
diff --git a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
index d985bad522..c2dd177d86 100644
--- a/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
+++ b/server-plugin/server-plugin-report-checkstyle/src/main/java/io/onedev/server/plugin/report/checkstyle/PublishCheckstyleReportStep.java
@@ -19,6 +19,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
@@ -26,7 +27,6 @@ import io.onedev.server.code.CodeProblem.Severity;
import io.onedev.server.model.Build;
import io.onedev.server.model.CheckstyleMetric;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -63,7 +63,7 @@ public class PublishCheckstyleReportStep extends PublishReportStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
CheckstyleReportData reportData = LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<CheckstyleReportData>() {
diff --git a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
index 81d2e7cef3..a9e469d7a1 100644
--- a/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
+++ b/server-plugin/server-plugin-report-clover/src/main/java/io/onedev/server/plugin/report/clover/PublishCloverReportStep.java
@@ -20,6 +20,7 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
@@ -27,7 +28,6 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.CloverMetric;
import io.onedev.server.persistence.dao.Dao;
import io.onedev.server.util.Coverage;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -64,7 +64,7 @@ public class PublishCloverReportStep extends PublishReportStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
CloverReportData reportData = LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<CloverReportData>() {
diff --git a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java
index d667435313..b541f13856 100644
--- a/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java
+++ b/server-plugin/server-plugin-report-jest/src/main/java/io/onedev/server/plugin/report/jest/PublishJestTestReportStep.java
@@ -16,13 +16,13 @@ import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.ExceptionUtils;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
import io.onedev.server.model.Build;
import io.onedev.server.model.JestTestMetric;
import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
import io.onedev.server.web.editable.annotation.Patterns;
@@ -55,7 +55,7 @@ public class PublishJestTestReportStep extends PublishReportStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
JestTestReportData report = LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<JestTestReportData>() {
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
index cec8632dd1..129de61571 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishMarkdownReportStep.java
@@ -11,10 +11,10 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
import io.onedev.server.model.Build;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -46,7 +46,7 @@ public class PublishMarkdownReportStep extends PublishReportStep {
}
@Override
- public Map<String, byte[]> run(Build build, File filesDir, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File filesDir, TaskLogger logger) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
LockUtils.write(build.getReportCategoryLockKey(DIR), new Callable<Void>() {
diff --git a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
index 755e56e0de..db39a7b6a2 100644
--- a/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
+++ b/server-plugin/server-plugin-report-markdown/src/main/java/io/onedev/server/plugin/report/markdown/PublishPullRequestMarkdownReportStep.java
@@ -11,10 +11,10 @@ import org.hibernate.validator.constraints.NotEmpty;
import io.onedev.commons.codeassist.InputSuggestion;
import io.onedev.commons.utils.FileUtils;
import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.TaskLogger;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.step.PublishReportStep;
import io.onedev.server.model.Build;
-import io.onedev.server.util.SimpleLogger;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.Interpolative;
@@ -52,7 +52,7 @@ public class PublishPullRequestMarkdownReportStep extends PublishReportStep {
}
@Override
- public Map<String, byte[]> run(Build build, File workspace, SimpleLogger logger) {
+ public Map<String, byte[]> run(Build build, File workspace, TaskLogger logger) {
if (build.getRequest() != null) {
File reportDir = new File(build.getReportCategoryDir(DIR), getReportName());
diff --git a/server-product/jsw/agent/App.sh.in b/server-product/jsw/agent/App.sh.in
new file mode 100644
index 0000000000..765050df36
--- /dev/null
+++ b/server-product/jsw/agent/App.sh.in
@@ -0,0 +1,2882 @@
+#! /bin/sh
+
+#
+# Copyright (c) 1999, 2020 Tanuki Software, Ltd.
+# http://www.tanukisoftware.com
+# All rights reserved.
+#
+# This software is the proprietary information of Tanuki Software.
+# You shall use it only in accordance with the terms of the
+# license agreement you entered into with Tanuki Software.
+# http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+#
+# Java Service Wrapper sh script. Suitable for starting and stopping
+# wrapped Java applications on UNIX platforms.
+# Optimized for use with version 3.5.44-st of the Wrapper.
+#
+
+#-----------------------------------------------------------------------------
+# These settings can be modified to fit the needs of your application
+
+# IMPORTANT - Please always stop and uninstall an application before making
+# any changes to this file. Failure to do so could remove the
+# script's ability to control the application.
+
+# NOTE - After loading the variables below, the script will attempt to locate a
+# file with the same basename as this script and having a '.shconf' extension.
+# If such file exists, it will be executed giving the user a chance to
+# override the default settings. Having the customized configuration in a
+# separate '.shconf' file makes it easier to upgrade the Wrapper, as the
+# present script file can then be replaced with minimal changes (although at
+# least the 'INIT INFO' below needs to be updated).
+
+# Initialization block for the install_initd and remove_initd scripts used by
+# SUSE linux, CentOS and RHEL distributions. Also used by update-rc.d.
+# Note: From CentOS 6, make sure the BEGIN INIT INFO section is before any line
+# of code otherwise the service won't be displayed in the Service
+# Configuration GUI.
+### BEGIN INIT INFO
+# Provides: @app.name@
+# Required-Start: $remote_fs $syslog
+# Should-Start: $network $time
+# Should-Stop: $network $time
+# Required-Stop: $remote_fs $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: @app.long.name@
+# Description: @app.description@
+### END INIT INFO
+
+# Application name and long name: If these variables are not set (or left to
+# the default tokens), APP_NAME will default to the name of the script, then
+# APP_LONG_NAME will default to the value of APP_NAME.
+APP_NAME="@app.name@"
+APP_LONG_NAME="@app.long.name@"
+
+# If uncommented (and set to false), APP_NAME and APP_LONG_NAME will no longer
+# be passed to the wrapper. See documentation for details.
+#APP_NAME_PASS_TO_WRAPPER=false
+
+# Wrapper
+WRAPPER_CMD="../boot/wrapper"
+WRAPPER_CONF="../conf/wrapper.conf"
+
+# Priority at which to run the wrapper. See "man nice" for valid priorities.
+# nice is only used if a priority is specified.
+PRIORITY=
+
+# Location of the pid file.
+PIDDIR="../status"
+
+# PIDFILE_CHECK_PID tells the script to double check whether the pid in the pid
+# file actually exists and belongs to this application. When not set, only
+# check the pid, but not what it is. This is only needed when multiple
+# applications need to share the same pid file.
+PIDFILE_CHECK_PID=true
+
+# FIXED_COMMAND tells the script to use a hard coded action rather than
+# expecting the first parameter of the command line to be the command.
+# By default the command will be expected to be the first parameter.
+#FIXED_COMMAND=console
+
+# PASS_THROUGH controls how the script arguments should be passed to the
+# Wrapper. Possible values are:
+# - commented or 'false': the arguments will be ignored (not passed).
+# - 'app_args' or 'true': the arguments will be passed through the Wrapper as
+# arguments for the Java Application.
+# - 'both': both Wrapper properties and Application arguments can be passed to
+# the Wrapper. The Wrapper properties come in first position. The
+# user can optionally add a '--' separator followed by application
+# arguments.
+# NOTE - If FIXED_COMMAND is set to true the above applies to all arguments,
+# otherwise it applies to arguments starting with the second.
+# NOTE - Passing arguments is only valid with the following commands:
+# - 'console'
+# - 'start', 'restart', 'condrestart' (if not installed as a daemon)
+#PASS_THROUGH=app_args
+
+# If uncommented, causes the Wrapper to be shutdown using an anchor file.
+# When launched with the 'start' command, it will also ignore all INT and
+# TERM signals.
+#IGNORE_SIGNALS=true
+
+# Wrapper will start the JVM asynchronously. Your application may have some
+# initialization tasks and it may be desirable to wait a few seconds
+# before returning. For example, to delay the invocation of following
+# startup scripts. Setting WAIT_AFTER_STARTUP to a positive number will
+# cause the start command to delay for the indicated period of time
+# (in seconds).
+WAIT_AFTER_STARTUP=0
+
+# If set, wait for the wrapper to report that the daemon has started
+WAIT_FOR_STARTED_STATUS=true
+WAIT_FOR_STARTED_TIMEOUT=120
+
+# If set, the status, start_msg and stop_msg commands will print out detailed
+# state information on the Wrapper and Java processes.
+#DETAIL_STATUS=true
+
+# If set, the 'pause' and 'resume' commands will be enabled. These make it
+# possible to pause the JVM or Java application without completely stopping
+# the Wrapper. See the wrapper.pausable and wrapper.pausable.stop_jvm
+# properties for more information.
+#PAUSABLE=true
+
+# Set the mode used to 'pause' or 'resume' the Wrapper. Possible values are
+# 'signals' which uses SIGUSR1 and SIGUSR2, and 'file' which uses the command
+# file to communicate these actions. The default value is 'signals'.
+# Be aware that depending on the mode, the properties wrapper.signal.mode.usr1,
+# wrapper.signal.mode.usr2, or wrapper.commandfile of the configuration file may
+# be overriden.
+#PAUSABLE_MODE=signals
+
+# If specified, the Wrapper will be run as the specified user.
+# IMPORTANT - Make sure that the user has the required privileges to write
+# the PID file and wrapper.log files. Failure to be able to write the log
+# file will cause the Wrapper to exit without any way to write out an error
+# message.
+# NOTE - This will set the user which is used to run the Wrapper as well as
+# the JVM and is not useful in situations where a privileged resource or
+# port needs to be allocated prior to the user being changed.
+#RUN_AS_USER=
+
+# Set the full path to the 'su' command (substitute user).
+# NOTE - In case 'su' is not in the PATH, you can set the absolute path here,
+# for example:
+# SU_BIN=/bin/su
+# NOTE - For Red Hat, the script will use '/sbin/runuser' if it is present and
+# ignore the value of SU_BIN.
+SU_BIN=su
+
+# Set option(s) for 'su' or 'runuser'.
+# In case the user set in RUN_AS_USER has no bash set, the 'su' command will fail.
+# The workaround for GNU/Linux system is to specify which bash to use with
+# the '-s' option.
+#SU_OPTS="-s /bin/bash"
+
+# By default we show a detailed usage block. Uncomment to show brief usage.
+#BRIEF_USAGE=true
+
+# Set which service management tool to use.
+# Possible values are:
+# for linux...: auto, systemd, upstart, initd
+# for aix.....: auto, src, initd
+# When set to 'auto', this script file will try to detect in the order of the
+# list for each platform which service management tool to use to install the Wrapper.
+SERVICE_MANAGEMENT_TOOL=auto
+
+# Specify how the Wrapper daemon and its child processes should be killed
+# when using systemd.
+# The default is 'control-group' which tells systemd to kill all child
+# processes (including detached ones) in the control group of the daemon
+# when it stops.
+# Alternatively, 'process' can be specified to prevent systemd from
+# killing the child processes leaving this responsibility to the Wrapper.
+# In this case child processes marked as 'detached' will not be killed on shutdown.
+# NOTE - the daemon must be reinstalled for any changes on this property to take effect.
+SYSTEMD_KILLMODE=control-group
+
+# When installing on Mac OSX platforms, the following domain will be used to
+# prefix the plist file name.
+PLIST_DOMAIN=org.tanukisoftware.wrapper
+
+# When installing on Mac OSX platforms, this parameter controls whether the daemon
+# is to be kept continuously running or to let demand and conditions control the
+# invocation.
+MACOSX_KEEP_RUNNING="false"
+
+# The following two lines are used by the chkconfig command. Change as is
+# appropriate for your application. They should remain commented.
+# chkconfig: 2345 20 80
+# description: @app.long.name@
+
+# Set run level to use when installing the application to start and stop on
+# system startup and shutdown. It is important that the application always
+# be uninstalled before making any changes to the run levels.
+# It is also possible to specify different run levels based on the individual
+# platform. When doing so this script will look for defined run levels in
+# the following order:
+# 1) "RUN_LEVEL_S_$DIST_OS" or "RUN_LEVEL_K_$DIST_OS", where "$DIST_OS" is
+# the value of DIST_OS. "RUN_LEVEL_S_solaris=20" for example.
+# 2) RUN_LEVEL_S or RUN_LEVEL_K, to specify specify start or stop run levels.
+# 3) RUN_LEVEL, to specify a general run level.
+RUN_LEVEL=20
+
+# List of files to source prior to executing any commands. Use ';' as delimiter.
+# For example:
+# FILES_TO_SOURCE="/home/user/.bashrc;anotherfile;../file3"
+FILES_TO_SOURCE=
+
+# Do not modify anything beyond this point
+#-----------------------------------------------------------------------------
+
+checkIsRoot() {
+ if [ `id | sed 's/^uid=//;s/(.*$//'` != "0" ] ; then
+ IS_ROOT=false
+ else
+ IS_ROOT=true
+ fi
+}
+
+gettext() {
+ "$WRAPPER_CMD" --translate "$1" "$WRAPPER_CONF" 2>/dev/null
+ if [ $? != 0 ] ; then
+ echo "$1"
+ fi
+}
+
+##
+# Resolves the location of a system command.
+#
+# $1: the name of the variable to set (without the $)
+# $2: the name of the command
+# $3: an ordered and semicolon-separated list of paths where the command should
+# be searched. The list should contain an empty value for the command to be
+# searched using the PATH environment variable.
+# $4: 1 to be strict (the script will stop with an error), 0 otherwise.
+resolveLocation() {
+ eval "CMD_TEMP=\$$1"
+ if [ "X$CMD_TEMP" = "X" ] ; then
+ found=0
+
+ OIFS=$IFS
+ IFS=';'
+ for CMD_PATH in $3
+ do
+ if [ -z "$CMD_PATH" ] ; then
+ # empty path
+ CMD_TEMP="$2"
+ ret=`command -v $CMD_TEMP 2>/dev/null`
+ if [ $? -eq 0 ] ; then
+ found=1
+ break
+ fi
+ else
+ CMD_TEMP="${CMD_PATH}/$2"
+ if [ -x "$CMD_TEMP" ] ; then
+ found=1
+ break
+ fi
+ fi
+ done
+ IFS=$OIFS
+
+ if [ $found -eq 1 ] ; then
+ eval "$1=$CMD_TEMP"
+ elif [ $4 -eq 1 ] ; then
+ eval echo `gettext 'Unable to locate "$2".'`
+ eval echo `gettext 'Please report this message along with the location of the command on your system.'`
+ exit 1
+ else
+ # return the error
+ return 1
+ fi
+ fi
+ return 0
+}
+
+resolveIdLocation() {
+ # On Solaris, the version in /usr/xpg4/bin should be used in priority.
+ resolveLocation ID_BIN id "/usr/xpg4/bin/id;;/usr/bin/id" 1
+}
+
+resolveCurrentUser() {
+ if [ "X$CURRENT_USER" = "X" ] ; then
+ resolveIdLocation
+ CURRENT_USER=`$ID_BIN -u -n 2>/dev/null`
+ fi
+}
+
+# check if we are running under Cygwin terminal.
+# Note: on some OS's (for example Solaris, MacOS), -o is not a valid parameter
+# and it shows an error message. We redirect stderr to null so the error message
+# doesn't show up.
+CYGWIN=`uname -o 2>/dev/null`
+if [ "$CYGWIN" = "Cygwin" ]
+then
+ eval echo `gettext 'This script is not compatible with Cygwin. Please use the Wrapper batch files to control the Wrapper.'`
+ exit 1
+fi
+
+# check if there is a parameter "sysd"
+SYSD=
+if [ $# -gt 1 ] ; then
+ if [ $2 = "sysd" ] ; then
+ SYSD=1
+ fi
+fi
+
+# Required for HP-UX Startup
+if [ `uname -s` = "HP-UX" -o `uname -s` = "HP-UX64" ] ; then
+ PATH=$PATH:/usr/bin
+fi
+
+# Get the fully qualified path to the script
+case $0 in
+ /*)
+ SCRIPT="$0"
+ ;;
+ *)
+ PWD=`pwd`
+ if [ $? -ne 0 ] ; then
+ # On some systems pwd may fail if one of the parent folder has insufficient permissions.
+ # Is there a way to access the current location which would allow to print the permissions
+ # for each folder like we do below?
+ exit 1
+ fi
+ SCRIPT="$PWD/$0"
+ ;;
+esac
+
+# Resolve the true real path without any sym links.
+CHANGED=true
+while [ "X$CHANGED" != "X" ]
+do
+ # Change spaces to ":" so the tokens can be parsed.
+ SAFESCRIPT=`echo $SCRIPT | sed -e 's; ;:;g'`
+ # Get the real path to this script, resolving any symbolic links
+ TOKENS=`echo $SAFESCRIPT | sed -e 's;/; ;g'`
+ REALPATH=
+ for C in $TOKENS; do
+ # Change any ":" in the token back to a space.
+ C=`echo $C | sed -e 's;:; ;g'`
+ REALPATH="$REALPATH/$C"
+ # If REALPATH is a sym link, resolve it. Loop for nested links.
+ while [ -h "$REALPATH" ] ; do
+ LS="`ls -ld "$REALPATH"`"
+ LINK="`expr "$LS" : '.*-> \(.*\)$'`"
+ if expr "$LINK" : '/.*' > /dev/null; then
+ # LINK is absolute.
+ REALPATH="$LINK"
+ else
+ # LINK is relative.
+ REALPATH="`dirname "$REALPATH"`""/$LINK"
+ fi
+ done
+ done
+
+ if [ "$REALPATH" = "$SCRIPT" ]
+ then
+ CHANGED=""
+ else
+ SCRIPT="$REALPATH"
+ fi
+done
+
+# Try to source a file with the same filename as the script and with the '.shconf' extension.
+case $REALPATH in
+ *.sh)
+ SHCONF_FILE=`echo $REALPATH | rev | cut -d "." -f2- | rev`
+ ;;
+ *)
+ SHCONF_FILE="$REALPATH"
+ ;;
+esac
+
+SHCONF_FILE="${SHCONF_FILE}.shconf"
+
+if [ -f "$SHCONF_FILE" ] ; then
+ if [ ! -x "$SHCONF_FILE" ] ; then
+ # We should stop here because the configuration expected in the shconf file will not be loaded.
+ eval echo `gettext 'Found $SHCONF_FILE but could not execute it. Please make sure that the file has execute permissions.'`
+ exit 1
+ fi
+ . "$SHCONF_FILE"
+fi
+
+if [ -n "$FIXED_COMMAND" ] ; then
+ COMMAND="$FIXED_COMMAND"
+ FIRST_ARG=$1
+else
+ COMMAND="$1"
+ FIRST_ARG=$2
+fi
+
+if [ "X${PASS_THROUGH}" = "Xtrue" -o "X${PASS_THROUGH}" = "Xapp_args" ] ; then
+ PASS_THROUGH=app_args
+elif [ "X${PASS_THROUGH}" != "Xboth" ] ; then
+ PASS_THROUGH=false
+fi
+
+# Get the location of the script.
+REALDIR=`dirname "$REALPATH"`
+
+if [ "X$RUN_AS_USER" != "X" ] ; then
+ CHECK_FOLDER_PERMISSIONS=0
+ if [ "$COMMAND" = "console" -o "$COMMAND" = "start" -o "$COMMAND" = "restart" -o "$COMMAND" = "condrestart" -o "$COMMAND" = "install" -o "$COMMAND" = "installstart" ] ; then
+ checkIsRoot
+ if [ "$IS_ROOT" = "true" ] ; then
+ if [ -f "/sbin/runuser" -a $COMMAND != "console" ] ; then
+ result=`/sbin/runuser - $RUN_AS_USER -c "cd \"${REALDIR}\"" $SU_OPTS 2>/dev/null`
+ else
+ result=`$SU_BIN - $RUN_AS_USER -c "cd \"${REALDIR}\"" $SU_OPTS 2>/dev/null`
+ fi
+ CHECK_FOLDER_PERMISSIONS=$?
+ fi
+ fi
+else
+ # Technically REALDIR should not be required for all commands, but in fact the script will fail below if the Wrapper binaries can't be accessed.
+ # It is thus better to show a message and print folder permissions now.
+ result=`cd "${REALDIR}" 2>/dev/null`
+ CHECK_FOLDER_PERMISSIONS=$?
+fi
+if [ $CHECK_FOLDER_PERMISSIONS -ne 0 ] ; then
+ if [ "X$RUN_AS_USER" != "X" ] ; then
+ CHECK_USER=$RUN_AS_USER
+ else
+ resolveCurrentUser
+ CHECK_USER=$CURRENT_USER
+ fi
+ # Unfortunately the following message will not be translated because currently the Wrapper fails to execute correctly when it can't access to the absolute path.
+ eval echo `gettext 'Failed to access the script using an absolute path. Insufficient permissions may prevent the user \"$CHECK_USER\" from traversing one of the folders. Please check the following permissions:'`
+
+ OIFS=$IFS
+ IFS='/'
+ for DIR in $REALDIR
+ do
+ INT_PATH="${INT_PATH}/$DIR"
+ if [ "$DIR" != "." -a "$DIR" != ".." ] ; then
+ ALL_PATHS="${ALL_PATHS} ${INT_PATH}"
+ result=`cd "${INT_PATH}" 2>/dev/null`
+ if [ $? -ne 0 ] ; then
+ # no access to this folder and so to the rest of the path.
+ break
+ fi
+ fi
+ done
+ IFS=$OIFS
+ ls -dal $ALL_PATHS
+ exit 1
+fi
+
+# Normalize the path
+REALDIR=`cd "${REALDIR}"; pwd`
+
+# If the PIDDIR is relative, set its value relative to the full REALPATH to avoid problems if
+# the working directory is later changed.
+FIRST_CHAR=`echo $PIDDIR | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+ PIDDIR=$REALDIR/$PIDDIR
+fi
+# Same test for WRAPPER_CMD
+FIRST_CHAR=`echo $WRAPPER_CMD | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+ WRAPPER_CMD=$REALDIR/$WRAPPER_CMD
+fi
+# Same test for WRAPPER_CONF
+FIRST_CHAR=`echo $WRAPPER_CONF | cut -c1,1`
+if [ "$FIRST_CHAR" != "/" ]
+then
+ WRAPPER_CONF=$REALDIR/$WRAPPER_CONF
+fi
+
+# Give default values to $APP_NAME and $APP_LONG_NAME
+DELIMITER="@"
+if [ "X$APP_NAME" = "X" -o "$APP_NAME" = "${DELIMITER}app.name${DELIMITER}" ] ; then
+ APP_NAME=`basename -- "$0"`
+fi
+if [ "X$APP_LONG_NAME" = "X" -o "$APP_LONG_NAME" = "${DELIMITER}app.long.name${DELIMITER}" ] ; then
+ APP_LONG_NAME=$APP_NAME
+fi
+
+# default location for the service file
+SYSTEMD_SERVICE_FILE="/etc/systemd/system/$APP_NAME.service"
+
+# Installation status
+SERVICE_NOT_INSTALLED=0
+SERVICE_INSTALLED_DEFAULT=1
+SERVICE_INSTALLED_SYSTEMD=2
+SERVICE_INSTALLED_UPSTART=4
+SERVICE_INSTALLED_SRC=8
+SERVICE_INSTALLED_SRC_PARTIAL=16 #incomplete installation with SRC (lssrc or lsitab failed to return a record)
+
+# Process ID
+ANCHORFILE="$PIDDIR/$APP_NAME.anchor"
+COMMANDFILE="$PIDDIR/$APP_NAME.command"
+STATUSFILE="$PIDDIR/$APP_NAME.status"
+JAVASTATUSFILE="$PIDDIR/$APP_NAME.java.status"
+PIDFILE="$PIDDIR/$APP_NAME.pid"
+LOCKDIR="/var/lock/subsys"
+LOCKFILE="$LOCKDIR/$APP_NAME"
+pid=""
+
+# Resolve the location of the 'ps' & 'tr' command
+resolveLocation PS_BIN ps "/usr/ucb;/usr/bin;/bin" 1
+resolveLocation TR_BIN tr "/usr/bin;/bin" 1
+
+# Resolve the os
+DIST_OS=`uname -s | $TR_BIN "[A-Z]" "[a-z]" | $TR_BIN -d ' '`
+case "$DIST_OS" in
+ 'sunos')
+ DIST_OS="solaris"
+ ;;
+ 'hp-ux' | 'hp-ux64')
+ # HP-UX needs the XPG4 version of ps (for -o args)
+ DIST_OS="hpux"
+ UNIX95=""
+ export UNIX95
+ ;;
+ 'darwin')
+ DIST_OS="macosx"
+ ;;
+ 'unix_sv')
+ DIST_OS="unixware"
+ ;;
+ 'os/390')
+ DIST_OS="zos"
+ ;;
+ 'linux')
+ DIST_OS="linux"
+ ;;
+esac
+
+# Compare Versions $1<$2=0, $1==$2=1, $1>$2=2
+compareVersions () {
+ if [ "$1" = "$2" ]
+ then
+ return 1
+ else
+ local i=1
+ while true
+ do
+ local v1=`echo "$1" | cut -d '.' -f $i`
+ local v2=`echo "$2" | cut -d '.' -f $i`
+ if [ "X$v1" = "X" ]
+ then
+ if [ "X$v2" = "X" ]
+ then
+ return 1
+ fi
+ v1="0"
+ elif [ "X$v2" = "X" ]
+ then
+ v2="0"
+ fi
+ if [ $v1 -lt $v2 ]
+ then
+ return 0
+ elif [ $v1 -gt $v2 ]
+ then
+ return 2
+ fi
+ i=`expr $i + 1`
+ done
+ fi
+}
+
+# Resolve the architecture
+if [ "$DIST_OS" = "macosx" ]
+then
+ OS_VER=`sw_vers | grep 'ProductVersion:' | grep -o '[0-9]*\.[0-9]*\.[0-9]*\|[0-9]*\.[0-9]*'`
+ DIST_ARCH="universal"
+ compareVersions "$OS_VER" "10.5.0"
+ if [ $? -lt 1 ]
+ then
+ DIST_BITS="32"
+ KEY_KEEP_ALIVE="OnDemand"
+ else
+ # Note: "OnDemand" has been deprecated and replaced from Mac OS X 10.5 by "KeepAlive"
+ KEY_KEEP_ALIVE="KeepAlive"
+
+ if [ "X`/usr/sbin/sysctl -n hw.cpu64bit_capable`" = "X1" ]
+ then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ fi
+ APP_PLIST_BASE=${PLIST_DOMAIN}.${APP_NAME}
+ APP_PLIST=${APP_PLIST_BASE}.plist
+elif [ "$DIST_OS" = "zos" ] ; then
+ # Z/Os is not supported in the Delta Pack, therefore we only provide a binary
+ # file named "wrapper". However this script will still check for a file named
+ # "wrapper-zos-390-32" and "wrapper-zos-390-64" in case the user edited the name.
+ DIST_ARCH="390"
+ DIST_BITS="64"
+else
+ if [ "$DIST_OS" = "linux" ]
+ then
+ DIST_ARCH=
+ else
+ DIST_ARCH=`uname -p 2>/dev/null | $TR_BIN "[A-Z]" "[a-z]" | $TR_BIN -d ' '`
+ fi
+ if [ "X$DIST_ARCH" = "X" ]
+ then
+ DIST_ARCH="unknown"
+ fi
+ if [ "$DIST_ARCH" = "unknown" ]
+ then
+ DIST_ARCH=`uname -m 2>/dev/null | $TR_BIN "[A-Z]" "[a-z]" | $TR_BIN -d ' '`
+ fi
+ case "$DIST_ARCH" in
+ 'athlon' | 'i386' | 'i486' | 'i586' | 'i686')
+ DIST_ARCH="x86"
+ if [ "${DIST_OS}" = "solaris" ] ; then
+ DIST_BITS=`isainfo -b`
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ 'amd64' | 'x86_64')
+ DIST_ARCH="x86"
+ DIST_BITS="64"
+ ;;
+ 'ia32')
+ DIST_ARCH="ia"
+ DIST_BITS="32"
+ ;;
+ 'ia64' | 'ia64n' | 'ia64w')
+ DIST_ARCH="ia"
+ DIST_BITS="64"
+ ;;
+ 'ip27')
+ DIST_ARCH="mips"
+ DIST_BITS="32"
+ ;;
+ 'ppc64le')
+ DIST_ARCH="ppcle"
+ DIST_BITS="64"
+ ;;
+ 'power' | 'powerpc' | 'power_pc' | 'ppc64')
+ if [ "${DIST_ARCH}" = "ppc64" ] ; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ DIST_ARCH="ppcbe"
+
+ if [ "${DIST_OS}" = "aix" ] ; then
+ DIST_ARCH="ppc"
+ if [ `getconf KERNEL_BITMODE` -eq 64 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ fi
+ ;;
+ 'pa_risc' | 'pa-risc')
+ DIST_ARCH="parisc"
+ if [ `getconf KERNEL_BITS` -eq 64 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ 'sun4u' | 'sparcv9' | 'sparc')
+ DIST_ARCH="sparc"
+ DIST_BITS=`isainfo -b`
+ ;;
+ '9000/800' | '9000/785')
+ DIST_ARCH="parisc"
+ if [ `getconf KERNEL_BITS` -eq 64 ]; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ s390* )
+ DIST_ARCH="390"
+ if [ `getconf LONG_BIT` -eq 64 ] ; then
+ DIST_BITS="64"
+ else
+ DIST_BITS="32"
+ fi
+ ;;
+ aarch64* | arm64*)
+ # 'aarch64_be', 'aarch64', 'arm64', etc.
+ # => only armhf is 64-bit
+ DIST_ARCH="armhf"
+ DIST_BITS="64"
+ ;;
+ armv*)
+ # 'armv8b', 'armv8l', 'armv7l', 'armv5tel', etc.
+ # => armv8 and above should be 64-bit, but it is more reliable to check the bits with getconf.
+ if [ `getconf LONG_BIT` -eq 64 ]; then
+ DIST_ARCH="armhf"
+ DIST_BITS="64"
+ else
+ # Note: The following command returns nothing on SUSE for Raspberry Pi 3 (aarch64).
+ # An alternative command would be 'dpkg --print-architecture', but dpkg may not exist.
+ if [ -z "`readelf -A /proc/self/exe | grep Tag_ABI_VFP_args`" ] ; then
+ DIST_ARCH="armel"
+ else
+ DIST_ARCH="armhf"
+ fi
+ DIST_BITS="32"
+ fi
+ ;;
+ esac
+fi
+
+# OSX always places Java in the same location so we can reliably set JAVA_HOME
+if [ "$DIST_OS" = "macosx" ]
+then
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x /usr/libexec/java_home ]; then
+ JAVA_HOME=`/usr/libexec/java_home`; export JAVA_HOME
+ else
+ JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
+ fi
+ fi
+fi
+
+# Test Echo
+ECHOTEST=`echo -n "x"`
+if [ "$ECHOTEST" = "x" ]
+then
+ ECHOOPT="-n "
+ ECHOOPTC=""
+else
+ ECHOOPT=""
+ ECHOOPTC="\c"
+fi
+
+outputFile() {
+ if [ -f "$1" ]
+ then
+ eval echo `gettext ' $1 Found but not executable.'`;
+ else
+ echo " $1"
+ fi
+}
+
+# Check if the first parameter is an existing executable file.
+detectWrapperBinary() {
+ if [ -f "$1" ] ; then
+ WRAPPER_TEST_CMD="$1"
+ if [ ! -x "$WRAPPER_TEST_CMD" ] ; then
+ chmod +x "$WRAPPER_TEST_CMD" 2>/dev/null
+ fi
+ if [ -x "$WRAPPER_TEST_CMD" ] ; then
+ WRAPPER_CMD="$WRAPPER_TEST_CMD"
+ else
+ outputFile "$WRAPPER_TEST_CMD"
+ WRAPPER_TEST_CMD=""
+ fi
+ fi
+}
+
+# Decide on the wrapper binary to use.
+# If the bits of the OS could be detected, we will try to look for the
+# binary with the correct bits value. If it doesn't exist, fall back
+# and look for the 32-bit binary. If that doesn't exist either then
+# look for the default.
+WRAPPER_TEST_CMD=""
+
+BIN_BITS=$DIST_BITS
+if [ ! "$BIN_BITS" = "32" ] ; then
+ # On a 64-bit platform, both Wrapper 32-Bit and 64-Bit can be used.
+ # Send a request to the Wrapper to know if the license has the 64-bit feature.
+ WRAPPER_CMD_ORIG=$WRAPPER_CMD
+ detectWrapperBinary "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$BIN_BITS"
+ if [ ! -z "$WRAPPER_TEST_CMD" ] ; then
+ if [ "$COMMAND" = "console" -o "$COMMAND" = "start" -o "$COMMAND" = "restart" -o "$COMMAND" = "condrestart" -o "$COMMAND" = "installstart" ] ; then
+ "$WRAPPER_CMD" --request_delta_binary_bits "$WRAPPER_CONF" 2>/dev/null
+ if [ $? = 32 ] ; then
+ # License is 32-Bit. Reset and search for 32-Bit Wrapper binaries.
+ WRAPPER_TEST_CMD=""
+ WRAPPER_CMD=$WRAPPER_CMD_ORIG
+ BIN_BITS=32
+ fi
+ fi
+ fi
+fi
+
+if [ -z "$WRAPPER_TEST_CMD" ] ; then
+ detectWrapperBinary "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+fi
+if [ -z "$WRAPPER_TEST_CMD" ] ; then
+ detectWrapperBinary "$WRAPPER_CMD"
+fi
+
+
+if [ -z "$WRAPPER_TEST_CMD" ] ; then
+ eval echo `gettext 'Unable to locate any of the following binaries:'`
+ outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-$BIN_BITS"
+ if [ ! "$BIN_BITS" = "32" ] ; then
+ outputFile "$WRAPPER_CMD-$DIST_OS-$DIST_ARCH-32"
+ fi
+ outputFile "$WRAPPER_CMD"
+
+ exit 1
+fi
+
+
+# Build the nice clause
+if [ "X$PRIORITY" = "X" ]
+then
+ CMDNICE=""
+else
+ CMDNICE="nice -$PRIORITY"
+fi
+
+# Build the anchor file clause.
+if [ "X$IGNORE_SIGNALS" = "X" ]
+then
+ ANCHORPROP=
+ IGNOREPROP=
+else
+ ANCHORPROP=wrapper.anchorfile=\"$ANCHORFILE\"
+ IGNOREPROP=wrapper.ignore_signals=TRUE
+fi
+
+# Build the status file clause.
+if [ "X$DETAIL_STATUS$WAIT_FOR_STARTED_STATUS" = "X" ]
+then
+ STATUSPROP=
+else
+ STATUSPROP="wrapper.statusfile=\"$STATUSFILE\" wrapper.java.statusfile=\"$JAVASTATUSFILE\""
+fi
+
+# Build the command file clause.
+if [ -n "$PAUSABLE" ]
+then
+ if [ "$PAUSABLE_MODE" = "file" ] ; then
+ COMMANDPROP="wrapper.commandfile=\"$COMMANDFILE\" wrapper.pausable=TRUE"
+ else
+ COMMANDPROP="wrapper.signal.mode.usr1=PAUSE wrapper.signal.mode.usr2=RESUME wrapper.pausable=TRUE"
+ fi
+else
+ COMMANDPROP=
+fi
+
+if [ ! -n "$WAIT_FOR_STARTED_STATUS" ]
+then
+ WAIT_FOR_STARTED_STATUS=true
+fi
+
+if [ $WAIT_FOR_STARTED_STATUS = true ] ; then
+ DETAIL_STATUS=true
+fi
+
+
+# Build the lock file clause. Only create a lock file if the lock directory exists on this platform.
+LOCKPROP=
+if [ -d $LOCKDIR ]
+then
+ if [ -w $LOCKDIR ]
+ then
+ LOCKPROP=wrapper.lockfile=\"$LOCKFILE\"
+ fi
+fi
+
+# Build app name clause
+if [ ! -n "$APP_NAME_PASS_TO_WRAPPER" ]
+then
+ APP_NAME_PASS_TO_WRAPPER=true
+fi
+if [ $APP_NAME_PASS_TO_WRAPPER = false ]
+then
+ APPNAMEPROP=
+else
+ APPNAMEPROP="wrapper.name=\"$APP_NAME\" wrapper.displayname=\"$APP_LONG_NAME\""
+fi
+
+# Decide on run levels.
+RUN_LEVEL_S_DIST_OS_TMP=`eval "echo \$\{RUN_LEVEL_S_${DIST_OS}\}"`
+RUN_LEVEL_S_DIST_OS=`eval "echo ${RUN_LEVEL_S_DIST_OS_TMP}"`
+if [ "X${RUN_LEVEL_S_DIST_OS}" != "X" ] ; then
+ APP_RUN_LEVEL_S=${RUN_LEVEL_S_DIST_OS}
+elif [ "X$RUN_LEVEL_S" != "X" ] ; then
+ APP_RUN_LEVEL_S=$RUN_LEVEL_S
+else
+ APP_RUN_LEVEL_S=$RUN_LEVEL
+fi
+APP_RUN_LEVEL_S_CHECK=`echo "$APP_RUN_LEVEL_S" | sed "s/[(0-9)*]/0/g"`
+if [ "X${APP_RUN_LEVEL_S_CHECK}" != "X00" ] ; then
+ eval echo `gettext 'Run level \"${APP_RUN_LEVEL_S}\" must be numeric and have a length of two \(00-99\).'`
+ exit 1;
+fi
+RUN_LEVEL_K_DIST_OS_TMP=`eval "echo \$\{RUN_LEVEL_K_${DIST_OS}\}"`
+RUN_LEVEL_K_DIST_OS=`eval "echo ${RUN_LEVEL_K_DIST_OS_TMP}"`
+if [ "X${RUN_LEVEL_K_DIST_OS}" != "X" ] ; then
+ APP_RUN_LEVEL_K=${RUN_LEVEL_K_DIST_OS}
+elif [ "X$RUN_LEVEL_K" != "X" ] ; then
+ APP_RUN_LEVEL_K=$RUN_LEVEL_K
+else
+ APP_RUN_LEVEL_K=$RUN_LEVEL
+fi
+APP_RUN_LEVEL_K_CHECK=`echo "$APP_RUN_LEVEL_K" | sed "s/[(0-9)*]/0/g"`
+if [ "X${APP_RUN_LEVEL_K_CHECK}" != "X00" ] ; then
+ eval echo `gettext 'Run level \"${APP_RUN_LEVEL_K}\" must be numeric and have a length of two \(00-99\).'`
+ exit 1;
+fi
+
+prepAdditionalParams() {
+ ADDITIONAL_PARA=""
+ if [ "X${PASS_THROUGH}" = "Xapp_args" -o "X${PASS_THROUGH}" = "Xboth" ] ; then
+ if [ "X${PASS_THROUGH}" = "Xapp_args" ] ; then
+ ADDITIONAL_PARA="--"
+ ARGS_ARE_APP_PARAMS=true
+ fi
+ while [ -n "$1" ] ; do
+ if [ ! -n "$ARGS_ARE_APP_PARAMS" ] ; then
+ if [ "$1" = "--" ] ; then
+ ARGS_ARE_APP_PARAMS=true
+ else
+ # Check that the arg matches the pattern of a property
+ case "$1" in
+ wrapper.*=*)
+ # Correct, nothing to do
+ ;;
+ *=*)
+ # The property name is not starting with 'wrapper.' so invalid.
+ COMMAND_PROP=${1%%=*}
+ eval echo `gettext "WARNING: Encountered an unknown configuration property \'${COMMAND_PROP}\'. When PASS_THROUGH is set to \'both\', any argument before \'--\' should target a valid Wrapper configuration property."`
+ ;;
+ *)
+ # Not a valid assignment.
+ eval echo `gettext "WARNING: Encountered an invalid configuration property assignment \'$1\'. When PASS_THROUGH is set to \'both\', any argument before \'--\' should be in the format '<property_name>=<value>'."`
+ ;;
+ esac
+ fi
+ fi
+ ADDITIONAL_PARA="$ADDITIONAL_PARA \"$1\""
+ shift
+ done
+ fi
+}
+
+resolveSysLocale() {
+ # First try to get the system encoding from /etc/default/locale.
+ # Note: For some reason, the system encoding stored in /etc/default/locale and the value returned by localectl may differ.
+ # When using 'localectl set-local', /etc/default/locale is always updated accordingly, but when manually editing /etc/default/locale,
+ # the output of the command sometimes doesn't get updated. When the values differ, SU uses the same locale as /etc/default/locale,
+ # so that's why we start trying to get the locale using this method.
+ if [ -f "/etc/default/locale" ] ; then
+ PASS_SYS_LANG=`grep 'LANG=' /etc/default/locale`
+ case "$PASS_SYS_LANG" in
+ LANG=*)
+ PASS_SYS_LANG="$PASS_SYS_LANG "
+ ;;
+ *)
+ PASS_SYS_LANG=""
+ ;;
+ esac
+ fi
+ if [ "X$PASS_SYS_LANG" = "X" ] ; then
+ # Try to get the system encoding using localectl.
+ LOCALECTL_BIN="localectl"
+ result=`command -v $LOCALECTL_BIN 2>/dev/null`
+ if [ $? -ne 0 ] ; then
+ LOCALECTL_BIN="/usr/bin/localectl"
+ if [ ! -x "$LOCALECTL_BIN" ] ; then
+ # Keep the warning for debugging, but don't actually show it because it may be normal for some OS to not have the command.
+ # echo " WARNING: Could not locate localectl used to get the system locale. The encoding may not be correct when running as $RUN_AS_USER."
+ LOCALECTL_BIN=""
+ fi
+ fi
+ if [ "X$LOCALECTL_BIN" != "X" ] ; then
+ # The first line that localectl outputs should look like this: ' System Locale: n/a'
+ PASS_SYS_LANG=`$LOCALECTL_BIN | grep "System Locale" | awk '{print $3}' 2>/dev/null`
+ case "$PASS_SYS_LANG" in
+ *n/a*)
+ # No system locale set. Skip.
+ PASS_SYS_LANG=""
+ ;;
+ LANG=*)
+ PASS_SYS_LANG="$PASS_SYS_LANG "
+ ;;
+ *)
+ # echo " WARNING: Failed to parse the output of localectl. The encoding may not be correct when running as $RUN_AS_USER.'"
+ PASS_SYS_LANG=""
+ ;;
+ esac
+ fi
+ fi
+}
+
+resolveSuLocale() {
+ if [ "X$PASS_SU_LANG" = "X" -a "X$RUN_AS_USER" != "X" ] ; then
+ PASS_SU_LANG=`$SU_BIN - $RUN_AS_USER -c "locale" $SU_OPTS | grep "LANG=" 2>/dev/null`
+ if [ "X$PASS_SU_LANG" != "X" ] ; then
+ PASS_SU_LANG="$PASS_SU_LANG "
+ fi
+ fi
+}
+
+checkUser() {
+ # $1 touchLock flag
+ # $2.. [command] args
+
+ # Check the configured user. If necessary rerun this script as the desired user.
+ if [ "X$RUN_AS_USER" != "X" ]
+ then
+ resolveCurrentUser
+ if [ "$CURRENT_USER" = "$RUN_AS_USER" ]
+ then
+ # Already running as the configured user. Avoid password prompts by not calling su.
+ RUN_AS_USER=""
+ fi
+ fi
+ if [ "X$RUN_AS_USER" != "X" ]
+ then
+ if [ "`$ID_BIN -u -n "$RUN_AS_USER" 2>/dev/null`" != "$RUN_AS_USER" ]
+ then
+ eval echo `gettext 'User $RUN_AS_USER does not exist.'`
+ exit 1
+ fi
+
+ # If LOCKPROP and $RUN_AS_USER are defined then the new user will most likely not be
+ # able to create the lock file. The Wrapper will be able to update this file once it
+ # is created but will not be able to delete it on shutdown. If $1 is set then
+ # the lock file should be created for the current command
+ if [ "X$LOCKPROP" != "X" ]
+ then
+ if [ "X$1" != "X" ]
+ then
+ # Resolve the primary group
+ RUN_AS_GROUP=`groups $RUN_AS_USER | awk '{print $3}' | tail -1`
+ if [ "X$RUN_AS_GROUP" = "X" ]
+ then
+ RUN_AS_GROUP=$RUN_AS_USER
+ fi
+ touch $LOCKFILE
+ chown $RUN_AS_USER:$RUN_AS_GROUP $LOCKFILE
+ fi
+ fi
+
+ # Still want to change users, recurse. This means that the user will only be
+ # prompted for a password once. Variables shifted by 1
+ shift
+
+ # Wrap the parameters so they can be passed.
+ ADDITIONAL_PARA=""
+ while [ -n "$1" ] ; do
+ if [ "$1" = 'installstart' ] ; then
+ # At this point the service is already installed. When we will fork the process we only need to start the service.
+ ADDITIONAL_PARA="$ADDITIONAL_PARA \"start\""
+ else
+ ADDITIONAL_PARA="$ADDITIONAL_PARA \"$1\""
+ fi
+ shift
+ done
+
+ # runuser doesn't transmit signals (such as ctrl+c) to the Wrapper. This causes problem when running as a console.
+ # When the Wrapper is launched as a service on RedHat, runuser should be used in preference to su.
+ resolveSysLocale
+ if [ -f "/sbin/runuser" -a $COMMAND != "console" ] ; then
+ # Unlike su, runuser doesn't use the default system locale. Force passing it for consistency.
+ if [ "X$PASS_SYS_LANG" = "X" ] ; then
+ # Fallback to the same locale as when using SU (which should be the system encoding).
+ resolveSuLocale
+ PASS_SYS_LANG=$PASS_SU_LANG
+ fi
+ /sbin/runuser - $RUN_AS_USER -c "$PASS_SYS_LANG\"$REALPATH\" $ADDITIONAL_PARA" $SU_OPTS
+ else
+ # Normally SU should use the default system locale, but make sure it is the case.
+ resolveSuLocale
+ if [ "X$PASS_SU_LANG" != "X" -a "$PASS_SU_LANG" != "$PASS_SYS_LANG" ] ; then
+ PASS_SU_LANG=$PASS_SYS_LANG
+ else
+ PASS_SU_LANG=""
+ fi
+ $SU_BIN - $RUN_AS_USER -c "$PASS_SU_LANG\"$REALPATH\" $ADDITIONAL_PARA" $SU_OPTS
+ fi
+ RUN_AS_USER_EXITCODE=$?
+
+ # we check if the previous command has failed
+ if [ $RUN_AS_USER_EXITCODE -ne 0 ]
+ then
+ if [ $RUN_AS_USER_EXITCODE -eq 1 ]
+ then
+ checkForkCommand
+ else
+ eval echo `gettext 'Error executing the requested command with user \"$RUN_AS_USER\" \(error code $RUN_AS_USER_EXITCODE\).'`
+ echo ""
+ fi
+ fi
+
+ # Now that we are the original user again, we may need to clean up the lock file.
+ if [ "X$LOCKPROP" != "X" ]
+ then
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ # Wrapper is not running so make sure the lock file is deleted.
+ if [ -f "$LOCKFILE" ]
+ then
+ rm "$LOCKFILE"
+ fi
+ fi
+ fi
+
+ exit $RUN_AS_USER_EXITCODE
+ fi
+}
+
+# Try to fork by executing a simple command.
+# With this function, we want to make sure we are able to fork.
+checkForkCommand() {
+
+ if [ -f "/sbin/runuser" -a $COMMAND != "console" ] ; then
+ /sbin/runuser - $RUN_AS_USER -c "ls \"$REALPATH\"" $SU_OPTS > /dev/null 2>&1 &
+ else
+ $SU_BIN - $RUN_AS_USER -c "ls \"$REALPATH\"" $SU_OPTS > /dev/null 2>&1 &
+ fi
+ CHECK_EXITCODE=$?
+
+ if [ $CHECK_EXITCODE -ne 0 ]
+ then
+ # clearly a problem with forking
+ eval echo `gettext 'Error: unable to create fork process.'`
+ eval echo `gettext 'Advice:'`
+ eval echo `gettext 'One possible cause of failure is when the user \(\"$RUN_AS_USER\"\) has no shell.'`
+ eval echo `gettext 'In this case, two solutions are available by editing the script file:'`
+ eval echo `gettext '1. Use \"SU_OPTS\" to set the shell for the user.'`
+ eval echo `gettext '2. Use a OS service management tool (only available on some platforms).'`
+ echo ""
+ fi
+}
+
+getpid() {
+ pid=""
+ if [ -f "$PIDFILE" ]
+ then
+ if [ -r "$PIDFILE" ]
+ then
+ pid=`cat "$PIDFILE"`
+ if [ "X$pid" != "X" ]
+ then
+ if [ "X$PIDFILE_CHECK_PID" != "X" ]
+ then
+ # It is possible that 'a' process with the pid exists but that it is not the
+ # correct process. This can happen in a number of cases, but the most
+ # common is during system startup after an unclean shutdown.
+ # The ps statement below looks for the specific wrapper command running as
+ # the pid. If it is not found then the pid file is considered to be stale.
+ case "$DIST_OS" in
+ 'freebsd')
+ pidtest=`$PS_BIN -p $pid -o args | tail -1`
+ if [ "X$pidtest" = "XCOMMAND" ]
+ then
+ pidtest=""
+ fi
+ ;;
+ 'macosx')
+ pidtest=`$PS_BIN -ww -p $pid -o command | grep -F "$WRAPPER_CMD" | tail -1`
+ ;;
+ 'solaris')
+ if [ -f "/usr/bin/pargs" ]
+ then
+ pidtest=`pargs $pid | fgrep "$WRAPPER_CMD" | tail -1`
+ else
+ case "$PS_BIN" in
+ '/usr/ucb/ps')
+ pidtest=`$PS_BIN -auxww $pid | fgrep "$WRAPPER_CMD" | tail -1`
+ ;;
+ '/usr/bin/ps')
+ TRUNCATED_CMD=`$PS_BIN -o comm -p $pid | tail -1`
+ COUNT=`echo $TRUNCATED_CMD | wc -m`
+ COUNT=`echo ${COUNT}`
+ COUNT=`expr $COUNT - 1`
+ TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
+ pidtest=`$PS_BIN -o comm -p $pid | fgrep "$TRUNCATED_CMD" | tail -1`
+ ;;
+ '/bin/ps')
+ TRUNCATED_CMD=`$PS_BIN -o comm -p $pid | tail -1`
+ COUNT=`echo $TRUNCATED_CMD | wc -m`
+ COUNT=`echo ${COUNT}`
+ COUNT=`expr $COUNT - 1`
+ TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
+ pidtest=`$PS_BIN -o comm -p $pid | fgrep "$TRUNCATED_CMD" | tail -1`
+ ;;
+ *)
+ echo "Unsupported ps command $PS_BIN"
+ exit 1
+ ;;
+ esac
+ fi
+ ;;
+ 'hpux')
+ pidtest=`$PS_BIN -p $pid -x -o args | grep -F "$WRAPPER_CMD" | tail -1`
+ ;;
+ 'zos')
+ TRUNCATED_CMD=`$PS_BIN -p $pid -o args | tail -1`
+ COUNT=`echo $TRUNCATED_CMD | wc -m`
+ COUNT=`echo ${COUNT}`
+ COUNT=`expr $COUNT - 1`
+ TRUNCATED_CMD=`echo $WRAPPER_CMD | cut -c1-$COUNT`
+ pidtest=`$PS_BIN -p $pid -o args | grep -F "$TRUNCATED_CMD" | tail -1`
+ ;;
+ *)
+ pidtest=`$PS_BIN -p $pid -o args | grep -F "$WRAPPER_CMD" | tail -1`
+ ;;
+ esac
+ else
+ # Check to see whether the pid exists as a running process, but in this mode, don't check what that pid is.
+ case "$DIST_OS" in
+ 'solaris')
+ case "$PS_BIN" in
+ '/usr/ucb/ps')
+ pidtest=`$PS_BIN $pid | grep "$pid" | awk '{print $1}' | tail -1`
+ ;;
+ '/usr/bin/ps')
+ pidtest=`$PS_BIN -p $pid -o pid | grep "$pid" | tail -1`
+ ;;
+ '/bin/ps')
+ pidtest=`$PS_BIN -p $pid -o pid | grep "$pid" | tail -1`
+ ;;
+ *)
+ echo "Unsupported ps command $PS_BIN"
+ exit 1
+ ;;
+ esac
+ ;;
+ *)
+ pidtest=`$PS_BIN -p $pid -o pid | grep "$pid" | tail -1`
+ ;;
+ esac
+ fi
+
+ if [ "X$pidtest" = "X" ]
+ then
+ # This is a stale pid file.
+ rm -f "$PIDFILE"
+ eval echo `gettext 'Removed stale pid file: $PIDFILE'`
+ pid=""
+ fi
+ fi
+ else
+ eval echo `gettext 'Cannot read $PIDFILE.'`
+ exit 1
+ fi
+ fi
+}
+
+getstatus() {
+ STATUS=
+ if [ -f "$STATUSFILE" ]
+ then
+ if [ -r "$STATUSFILE" ]
+ then
+ STATUS=`cat "$STATUSFILE"`
+ fi
+ fi
+ if [ "X$STATUS" = "X" ]
+ then
+ STATUS="Unknown"
+ fi
+
+ JAVASTATUS=
+ if [ -f "$JAVASTATUSFILE" ]
+ then
+ if [ -r "$JAVASTATUSFILE" ]
+ then
+ JAVASTATUS=`cat "$JAVASTATUSFILE"`
+ fi
+ fi
+ if [ "X$JAVASTATUS" = "X" ]
+ then
+ JAVASTATUS="Unknown"
+ fi
+}
+
+testpid() {
+ case "$DIST_OS" in
+ 'solaris')
+ case "$PS_BIN" in
+ '/usr/ucb/ps')
+ pid=`$PS_BIN $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+ ;;
+ '/usr/bin/ps')
+ pid=`$PS_BIN -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+ ;;
+ '/bin/ps')
+ pid=`$PS_BIN -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1`
+ ;;
+ *)
+ echo "Unsupported ps command $PS_BIN"
+ exit 1
+ ;;
+ esac
+ ;;
+ *)
+ pid=`$PS_BIN -p $pid | grep $pid | grep -v grep | awk '{print $1}' | tail -1` 2>/dev/null
+ ;;
+ esac
+ if [ "X$pid" = "X" ]
+ then
+ pid=""
+ fi
+}
+
+launchdtrap() {
+ stopit
+ exit
+}
+
+waitForWrapperStop() {
+ getpid
+ while [ "X$pid" != "X" ] ; do
+ sleep 1
+ getpid
+ done
+}
+
+launchinternal() {
+ getpid
+ trap launchdtrap TERM
+ if [ "X$pid" = "X" ]
+ then
+ # The string passed to eval must handles spaces in paths correctly.
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $APPNAMEPROP $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.44 $ADDITIONAL_PARA"
+ eval $COMMAND_LINE
+ else
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+ # launchd expects that this script stay up and running so we need to do our own monitoring of the Wrapper process.
+ if [ $WAIT_FOR_STARTED_STATUS = true ]
+ then
+ waitForWrapperStop
+ fi
+}
+
+console() {
+ eval echo `gettext 'Running $APP_LONG_NAME...'`
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ trap '' 3
+
+ prepAdditionalParams "$@"
+
+ # The string passed to eval must handles spaces in paths correctly.
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" $APPNAMEPROP $ANCHORPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.44 $ADDITIONAL_PARA"
+ eval $COMMAND_LINE
+ COMMAND_EXIT_CODE=$?
+ if [ $COMMAND_EXIT_CODE -ne 0 ] ; then
+ exit $COMMAND_EXIT_CODE
+ fi
+ else
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+}
+
+waitforjavastartup() {
+ getstatus
+ eval echo $ECHOOPT `gettext 'Waiting for $APP_LONG_NAME...$ECHOOPTC'`
+
+ # Wait until the timeout or we have something besides Unknown.
+ counter=15
+ while [ "$JAVASTATUS" = "Unknown" -a $counter -gt 0 -a -n "$JAVASTATUS" ] ; do
+ echo $ECHOOPT".$ECHOOPTC"
+ sleep 1
+ getstatus
+ counter=`expr $counter - 1`
+ done
+
+ if [ -n "$WAIT_FOR_STARTED_TIMEOUT" ] ; then
+ counter=$WAIT_FOR_STARTED_TIMEOUT
+ else
+ counter=120
+ fi
+ while [ "$JAVASTATUS" != "STARTED" -a "$JAVASTATUS" != "Unknown" -a $counter -gt 0 -a -n "$JAVASTATUS" ] ; do
+ echo $ECHOOPT".$ECHOOPTC"
+ sleep 1
+ getstatus
+ counter=`expr $counter - 1`
+ done
+ echo ""
+}
+
+startwait() {
+ if [ $WAIT_FOR_STARTED_STATUS = true ]
+ then
+ waitforjavastartup
+ fi
+ # Sleep for a few seconds to allow for intialization if required
+ # then test to make sure we're still running.
+ #
+ i=0
+ while [ $i -lt $WAIT_AFTER_STARTUP ]
+ do
+ sleep 1
+ echo $ECHOOPT".$ECHOOPTC"
+ i=`expr $i + 1`
+ done
+ if [ $WAIT_AFTER_STARTUP -gt 0 -o $WAIT_FOR_STARTED_STATUS = true ]
+ then
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext ' WARNING: $APP_LONG_NAME may have failed to start.'`
+ exit 1
+ else
+ eval echo `gettext ' running: PID:$pid'`
+ fi
+ else
+ echo ""
+ fi
+}
+
+mustBeRootOrExit() {
+ checkIsRoot
+ if [ "$IS_ROOT" != "true" ] ; then
+ eval echo `gettext 'Must be root to perform this action.'`
+ exit 1
+ fi
+}
+
+mustBeStoppedOrExit() {
+ getpid
+ if [ "X$pid" != "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME is already running.'`
+ exit 1
+ fi
+}
+
+# Detect if the Wrapper is running
+# Returns 0 if the process is running, otherwise returns 1.
+checkRunning() {
+ getpid
+ if [ "X$pid" = "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME is not running.'`
+ if [ "X$1" = "X1" ] ; then
+ exit 1
+ fi
+ return 1
+ fi
+ return 0
+}
+
+
+macosxStart() {
+ mustBeRootOrExit
+ mustBeStoppedOrExit
+
+ eval echo `gettext 'Starting $APP_LONG_NAME with launchd...'`
+
+ # If the daemon was just installed, it may not be loaded.
+ LOADED_PLIST=`launchctl list | grep ${APP_PLIST_BASE}`
+ if [ "X${LOADED_PLIST}" = "X" ] ; then
+ launchctl load /Library/LaunchDaemons/${APP_PLIST}
+ fi
+ # If launchd is set to run the daemon already at Load, we don't need to call start
+ getpid
+ if [ "X$pid" = "X" ] ; then
+ launchctl start ${APP_PLIST_BASE}
+ fi
+
+ startwait
+}
+
+macosxStop() {
+ mustBeRootOrExit
+ # The daemon must be running.
+ checkRunning "1"
+
+ eval echo `gettext 'Stopping $APP_LONG_NAME...'`
+
+ if [ "$MACOSX_KEEP_RUNNING" = "true" ] ; then
+ echo ""
+ eval echo `gettext 'Daemon is set to be kept continuously running and it will be automatically restarted.'`
+ eval echo `gettext 'To stop the daemon you need to uninstall it.'`
+ eval echo `gettext 'If you want to use the \"stop\" argument, you need to find MACOSX_KEEP_RUNNING'`
+ eval echo `gettext 'at the beginning of the script file and set it to \"false\".'`
+ echo ""
+ fi
+ launchctl stop ${APP_PLIST_BASE}
+}
+
+macosxRestart() {
+ mustBeRootOrExit
+ checkRunning $1
+
+ eval echo `gettext 'Restarting $APP_LONG_NAME...'`
+
+ if [ "$MACOSX_KEEP_RUNNING" = "true" ] ; then
+ # by stopping it, launchd will automatically restart it
+ launchctl stop ${APP_PLIST_BASE}
+ else
+ launchctl unload "/Library/LaunchDaemons/${APP_PLIST}"
+ sleep 1
+ launchctl load "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+
+ startwait
+}
+
+# Detect if upstart is installed
+# Returns 0 if upstart is found, otherwise returns 1.
+upstartDetection() {
+ if [ ! -d "/etc/init" ] ; then
+ return 1
+ fi
+
+ INITCTL_BIN="initctl"
+ result=`command -v $INITCTL_BIN 2>/dev/null`
+ if [ $? -ne 0 ] ; then
+ INITCTL_BIN="/sbin/initctl"
+ if [ ! -x "$INITCTL_BIN" ] ; then
+ return 1
+ fi
+ fi
+
+ result=`$INITCTL_BIN version 2>/dev/null`
+ if [ $? -eq 0 ] ; then
+ # if the word "upstart" is in the result, then we assume upstart is installed.
+ result=`echo $result | grep upstart`
+ if [ $? -eq 0 ] ; then
+ return 0
+ fi
+ fi
+
+ # The command /sbin/initctl may fail if the user doesn't have enough privilege
+ # but that doesn't mean upstart is not present.
+ # In this case we can assume upstart exists if the service was previously
+ # installed by the root user.
+ if [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ return 0
+ fi
+
+ return 1
+}
+
+upstartInstall() {
+ # Always verify that upstart exists.
+ upstartDetection
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Unable to install the $APP_LONG_NAME daemon because upstart does not exist.'`
+ return 1
+ fi
+
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon with upstart...'`
+ if [ -f "${REALDIR}/${APP_NAME}.install" ] ; then
+ eval echo `gettext ' Custom upstart conf file ${APP_NAME}.install found.'`
+ cp "${REALDIR}/${APP_NAME}.install" "/etc/init/${APP_NAME}.conf"
+ else
+ eval echo `gettext ' Creating default upstart conf file...'`
+ echo "# ${APP_NAME} - ${APP_LONG_NAME}" > "/etc/init/${APP_NAME}.conf"
+ echo "description \"${APP_LONG_NAME}\"" >> "/etc/init/${APP_NAME}.conf"
+ echo "author \"Tanuki Software Ltd. <[email protected]>\"" >> "/etc/init/${APP_NAME}.conf"
+ echo "start on runlevel [2345]" >> "/etc/init/${APP_NAME}.conf"
+ echo "stop on runlevel [!2345]" >> "/etc/init/${APP_NAME}.conf"
+ echo "env LANG=${LANG}" >> "/etc/init/${APP_NAME}.conf"
+ echo "exec \"${REALPATH}\" upstartinternal" >> "/etc/init/${APP_NAME}.conf"
+ fi
+}
+
+upstartStart() {
+ mustBeRootOrExit
+ mustBeStoppedOrExit
+
+ eval echo `gettext 'Starting $APP_LONG_NAME with upstart...'`
+
+ /sbin/start ${APP_NAME}
+
+ startwait
+}
+
+upstartStop() {
+ mustBeRootOrExit
+ # The daemon must be running.
+ checkRunning "1"
+
+ eval echo `gettext 'Stopping $APP_LONG_NAME...'`
+
+ /sbin/stop ${APP_NAME}
+}
+
+upstartRestart() {
+ mustBeRootOrExit
+ checkRunning $1
+
+ if [ "X$pid" = "X" ] ; then
+ # Don't use /sbin/restart because it requires the daemon to be running.
+ # We want to match with other systems behaviour which is to restart the
+ # daemon even if it was not running.
+ upstartStart
+ else
+ # The daemon was running
+ eval echo `gettext 'Restarting $APP_LONG_NAME...'`
+
+ /sbin/restart ${APP_NAME}
+
+ startwait
+ fi
+}
+
+upstartRemove() {
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon from upstart...'`
+ rm "/etc/init/${APP_NAME}.conf"
+}
+
+# Method to check if systemd is running.
+# Returns 0 if systemd is found, otherwise returns 1.
+systemdDetection() {
+ if [ ! -d "/etc/systemd" ] ; then
+ return 1
+ fi
+
+ resolveLocation PIDOF_BIN pidof ";/bin;/usr/sbin" 1
+ result=`$PIDOF_BIN systemd`
+ return $?
+}
+
+systemdInstall() {
+ # Always verify that systemd exists.
+ systemdDetection
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Unable to install the $APP_LONG_NAME daemon because systemd does not exist.'`
+ return 1
+ fi
+
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon with systemd...'`
+ if [ -f "${REALDIR}/${APP_NAME}.service" ] ; then
+ eval echo `gettext ' Custom service file ${APP_NAME}.service found.'`
+ cp "${REALDIR}/${APP_NAME}.service" "${SYSTEMD_SERVICE_FILE}"
+ else
+ eval echo `gettext ' Creating default service file...'`
+ echo "[Unit]" > "${SYSTEMD_SERVICE_FILE}"
+ echo "Description=${APP_LONG_NAME}" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "After=syslog.target" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "[Service]" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "Type=forking" >> "${SYSTEMD_SERVICE_FILE}"
+ case "${REALPATH}" in
+ *\ *)
+ # REALPATH contains space
+ echo 'ExecStart=/usr/bin/env "'${REALPATH}'" start sysd' >> "${SYSTEMD_SERVICE_FILE}"
+ echo 'ExecStop=/usr/bin/env "'${REALPATH}'" stop sysd' >> "${SYSTEMD_SERVICE_FILE}"
+ ;;
+ *)
+ echo "ExecStart=${REALPATH} start sysd" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "ExecStop=${REALPATH} stop sysd" >> "${SYSTEMD_SERVICE_FILE}"
+ ;;
+ esac
+ if [ "X${RUN_AS_USER}" != "X" ] ; then
+ echo "User=${RUN_AS_USER}" >> "${SYSTEMD_SERVICE_FILE}"
+ fi
+ if [ "X${SYSTEMD_KILLMODE}" != "X" ] ; then
+ echo "KillMode=${SYSTEMD_KILLMODE}" >> "${SYSTEMD_SERVICE_FILE}"
+ fi
+ if [ $SYSTEMD_KILLMODE != "process" -a $SYSTEMD_KILLMODE != "none" ] ; then
+ # Set an environment variable to show a warning if a detached process is launched by the WrapperManager.
+ echo "Environment=SYSTEMD_KILLMODE_WARNING=true" >> "${SYSTEMD_SERVICE_FILE}"
+ fi
+ echo "" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "[Install]" >> "${SYSTEMD_SERVICE_FILE}"
+ echo "WantedBy=multi-user.target" >> "${SYSTEMD_SERVICE_FILE}"
+ fi
+ systemctl daemon-reload
+ systemctl enable "${APP_NAME}"
+}
+
+systemdStart() {
+ # Don't do mustBeRootOrExit because systemd will ask for the password when not root
+ mustBeStoppedOrExit
+
+ result=`systemctl -p KillMode show $APP_NAME`
+ if [ $result != "KillMode=$SYSTEMD_KILLMODE" ] ; then
+ eval echo `gettext "SYSTEMD_KILLMODE is set to \'${SYSTEMD_KILLMODE}\' on the top of the script, but the daemon is running with $result."`
+ eval echo `gettext 'The daemon must be reinstalled for the value of SYSTEMD_KILLMODE to take effect.'`
+ exit 1
+ fi
+
+ eval echo `gettext 'Starting $APP_LONG_NAME with systemd...'`
+
+ systemctl start $APP_NAME
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Failed to start $APP_LONG_NAME.'`
+ exit 1
+ fi
+
+ startwait
+}
+
+systemdStop() {
+ # Don't do mustBeRootOrExit because systemd will ask for the password when not root
+ # The daemon must be running.
+ checkRunning "1"
+
+ eval echo `gettext 'Stopping $APP_LONG_NAME...'`
+
+ systemctl stop $APP_NAME
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Failed to stop $APP_LONG_NAME.'`
+ exit 1
+ fi
+}
+
+systemdRestart() {
+ # Don't do mustBeRootOrExit because systemd will ask for the password when not root
+ checkRunning $1
+
+ eval echo `gettext 'Restarting $APP_LONG_NAME...'`
+
+ systemctl restart $APP_NAME
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Failed to restart service $APP_NAME'`
+ exit 1
+ fi
+
+ startwait
+}
+
+systemdRemove() {
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon from systemd...'`
+ systemctl disable $APP_NAME
+ rm "/etc/systemd/system/${APP_NAME}.service"
+ systemctl daemon-reload
+}
+
+# Method to check if SRC is running.
+# Returns 0 if SRC is found, otherwise returns 1.
+srcDetection() {
+ # $PS_BIN has already been resolved at startup
+ result=`$PS_BIN -A | grep srcmstr`
+ return $?
+}
+
+srcInstall() {
+ # Always verify that SRC exists.
+ srcDetection
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Unable to install the $APP_LONG_NAME daemon because SRC does not exist.'`
+ return 1
+ fi
+
+ if [ "X$RUN_AS_USER" = "X" ] ; then
+ USERID="0"
+ else
+ resolveIdLocation
+ USERID=`$ID_BIN -u "$RUN_AS_USER"`
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Failed to get user id for $RUN_AS_USER'`
+ exit 1
+ fi
+ fi
+
+ validateAppNameLength
+ /usr/bin/mkssys -s "$APP_NAME" -p "$REALPATH" -a "launchdinternal" -u "$USERID" -f 9 -n 15 -S
+ /usr/sbin/mkitab "$APP_NAME":2:once:"/usr/bin/startsrc -s \"${APP_NAME}\" >/dev/console 2>&1"
+}
+
+srcStart() {
+ mustBeRootOrExit
+ mustBeStoppedOrExit
+
+ eval echo `gettext 'Starting $APP_LONG_NAME with SRC...'`
+
+ startsrc -s "${APP_NAME}"
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Failed to start $APP_LONG_NAME.'`
+ exit 1
+ fi
+
+ startwait
+}
+
+srcStop() {
+ mustBeRootOrExit
+ # The daemon must be running.
+ checkRunning "1"
+
+ eval echo `gettext 'Stopping $APP_LONG_NAME...'`
+
+ stopsrc -s "${APP_NAME}"
+ if [ $? -ne 0 ] ; then
+ eval echo `gettext 'Failed to stop $APP_LONG_NAME.'`
+ exit 1
+ fi
+}
+
+srcRestart() {
+ mustBeRootOrExit
+ checkRunning $1
+
+ if [ "X$pid" != "X" ] ; then
+ # The daemon was running. Stop it first.
+ eval echo `gettext 'Restarting $APP_LONG_NAME...'`
+ srcStop
+ waitForWrapperStop
+ fi
+ srcStart
+}
+
+start() {
+ mustBeStoppedOrExit
+
+ eval echo `gettext 'Starting $APP_LONG_NAME...'`
+
+ prepAdditionalParams "$@"
+
+ # The string passed to eval must handles spaces in paths correctly.
+ COMMAND_LINE="$CMDNICE \"$WRAPPER_CMD\" \"$WRAPPER_CONF\" wrapper.syslog.ident=\"$APP_NAME\" wrapper.pidfile=\"$PIDFILE\" wrapper.daemonize=TRUE $APPNAMEPROP $ANCHORPROP $IGNOREPROP $STATUSPROP $COMMANDPROP $LOCKPROP wrapper.script.version=3.5.44 $ADDITIONAL_PARA"
+ eval $COMMAND_LINE
+
+ startwait
+}
+
+stopit() {
+ # $1 exit if down flag
+ checkRunning $1
+ if [ $? -eq 0 ] ; then
+ # The daemon should be running.
+ eval echo `gettext 'Stopping $APP_LONG_NAME...'`
+
+ if [ "X$IGNORE_SIGNALS" = "X" ]
+ then
+ # Running so try to stop it.
+ kill $pid
+ if [ $? -ne 0 ]
+ then
+ # An explanation for the failure should have been given
+ eval echo `gettext 'Unable to stop $APP_LONG_NAME.'`
+ exit 1
+ fi
+ else
+ rm -f "$ANCHORFILE"
+ if [ -f "$ANCHORFILE" ]
+ then
+ # An explanation for the failure should have been given
+ eval echo `gettext 'Unable to stop $APP_LONG_NAME.'`
+ exit 1
+ fi
+ fi
+
+ # We can not predict how long it will take for the wrapper to
+ # actually stop as it depends on settings in wrapper.conf.
+ # Loop until it does.
+ savepid=$pid
+ CNT=0
+ TOTCNT=0
+ while [ "X$pid" != "X" ]
+ do
+ # Show a waiting message every 5 seconds.
+ if [ "$CNT" -lt "5" ]
+ then
+ CNT=`expr $CNT + 1`
+ else
+ eval echo `gettext 'Waiting for $APP_LONG_NAME to exit...'`
+ CNT=0
+ fi
+ TOTCNT=`expr $TOTCNT + 1`
+
+ sleep 1
+
+ # Check if the process is still running.
+ testpid
+
+ if [ "X$pid" = "X" ]
+ then
+ # The process is gone, but it is possible that another instance restarted while we waited...
+ SAVE_PIDFILE_CHECK_PID=$PIDFILE_CHECK_PID
+ PIDFILE_CHECK_PID=""
+ getpid
+ PIDFILE_CHECK_PID=$SAVE_PIDFILE_CHECK_PID
+
+ if [ "X$pid" != "X" ]
+ then
+ # Another process is running.
+ if [ "$pid" = "$savepid" ]
+ then
+ # This should never happen, unless the PID was recycled?
+ eval echo `gettext 'Failed to stop $APP_LONG_NAME.'`
+ exit 1
+ else
+ eval echo `gettext 'The content of $PIDFILE has changed.'`
+ eval echo `gettext 'Another instance of the Wrapper might have started in the meantime.'`
+
+ # Exit now. Any further actions might compromise the running instance.
+ exit 1
+ fi
+ fi
+ fi
+ done
+
+ eval echo `gettext 'Stopped $APP_LONG_NAME.'`
+ fi
+}
+
+pause() {
+ getpid
+ if [ "X$pid" = "X" ] ; then
+ # The application is not running, print the status
+ status
+ else
+ if [ "$PAUSABLE_MODE" = "file" ] ; then
+ echo "PAUSE" >> $COMMANDFILE
+ if [ $? != 0 ] ; then
+ eval echo `gettext 'Failed to write in the command file to pause $APP_LONG_NAME.'`
+ exit 1
+ fi
+ else
+ # send a SIGUSR1 (use constants because numbers change depending on the platform)
+ kill -USR1 $pid 2>/dev/null
+ if [ $? != 0 ] ; then
+ kill -SIGUSR1 $pid
+ if [ $? != 0 ] ; then
+ eval echo `gettext 'Failed to send a signal to pause $APP_LONG_NAME.'`
+ exit 1
+ fi
+ fi
+ fi
+ eval echo `gettext 'Pausing $APP_LONG_NAME.'`
+ fi
+}
+
+resume() {
+ getpid
+ if [ "X$pid" = "X" ] ; then
+ # The application is not running, print the status
+ status
+ else
+ if [ "$PAUSABLE_MODE" = "file" ] ; then
+ echo "RESUME" >> $COMMANDFILE
+ if [ $? != 0 ] ; then
+ eval echo `gettext 'Failed to write in the command file to resume $APP_LONG_NAME.'`
+ exit 1
+ fi
+ else
+ # send a SIGUSR2 (use constants because numbers change depending on the platform)
+ kill -USR2 $pid 2>/dev/null
+ if [ $? != 0 ] ; then
+ kill -SIGUSR2 $pid
+ if [ $? != 0 ] ; then
+ eval echo `gettext 'Failed to send a signal to resume $APP_LONG_NAME.'`
+ exit 1
+ fi
+ fi
+ fi
+ eval echo `gettext 'Resuming $APP_LONG_NAME.'`
+ fi
+}
+
+checkInstalled() {
+ # Install status
+ installedStatus=$SERVICE_NOT_INSTALLED
+ installedWith=""
+
+ if [ "$DIST_OS" = "solaris" ] ; then
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ fi
+ elif [ "$DIST_OS" = "linux" ] ; then
+ if [ "X$1" != "Xstrict" -o \( -z "$USE_SYSTEMD" -a -z "$USE_UPSTART" \) ] ; then
+ if [ -f "/etc/init.d/$APP_NAME" -o -L "/etc/init.d/$APP_NAME" ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ installedWith="init.d"
+ fi
+ fi
+ if [ "X$1" != "Xstrict" -o -n "$USE_SYSTEMD" ] ; then
+ if [ -f "${SYSTEMD_SERVICE_FILE}" ] ; then
+ installedStatus=`expr $installedStatus + $SERVICE_INSTALLED_SYSTEMD`
+ installedWith="${installedWith}${installedWith:+, }systemd"
+ fi
+ fi
+ if [ "X$1" != "Xstrict" -o -n "$USE_UPSTART" ] ; then
+ if [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ installedStatus=`expr $installedStatus + $SERVICE_INSTALLED_UPSTART`
+ installedWith="${installedWith}${installedWith:+, }upstart"
+ fi
+ fi
+ elif [ "$DIST_OS" = "hpux" ] ; then
+ if [ -f "/sbin/init.d/$APP_NAME" -o -L "/sbin/init.d/$APP_NAME" ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ fi
+ elif [ "$DIST_OS" = "aix" ] ; then
+ if [ "X$1" != "Xstrict" -o -z "$USE_SRC" ] ; then
+ if [ -f "/etc/rc.d/init.d/$APP_NAME" -o -L "/etc/rc.d/init.d/$APP_NAME" ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ installedWith="init.d"
+ fi
+ fi
+ if [ "X$1" != "Xstrict" -o -n "$USE_SRC" ] ; then
+ validateAppNameLength
+ if [ "$IS_ROOT" = "true" ] ; then
+ # Check both lssrc & lsitab to make sure the installation is complete. lsitab requires root privileges.
+ # We will go through this case before installing or removing a service, so we can redo a clean installation
+ # or a clean removal if installedStatus=5
+ if [ -n "`/usr/sbin/lsitab $APP_NAME`" -a -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ installedStatus=`expr $installedStatus + $SERVICE_INSTALLED_SRC`
+ installedWith="${installedWith}${installedWith:+, }SRC"
+ elif [ -n "`/usr/sbin/lsitab $APP_NAME`" -o -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ installedStatus=`expr $installedStatus + $SERVICE_INSTALLED_SRC_PARTIAL`
+ installedWith="${installedWith}${installedWith:+, }SRC"
+ fi
+ else
+ # Using lssrc is enough to test normal installations and doesn't require root privileges
+ if [ -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ installedStatus=`expr $installedStatus + $SERVICE_INSTALLED_SRC`
+ installedWith="${installedWith}${installedWith:+, }SRC"
+ fi
+ fi
+ fi
+ elif [ "$DIST_OS" = "freebsd" ] ; then
+ if [ -f "/etc/rc.d/$APP_NAME" -o -L "/etc/rc.d/$APP_NAME" ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ fi
+ elif [ "$DIST_OS" = "macosx" ] ; then
+ if [ -f "/Library/LaunchDaemons/${APP_PLIST}" -o -L "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ fi
+ elif [ "$DIST_OS" = "zos" ] ; then
+ if [ -f /etc/rc.bak ] ; then
+ installedStatus=$SERVICE_INSTALLED_DEFAULT
+ fi
+ fi
+}
+
+status() {
+ checkInstalled
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext '$APP_LONG_NAME \(not installed\) is not running.'`
+ elif [ "X$installedWith" = "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME \(installed\) is not running.'`
+ else
+ eval echo `gettext '$APP_LONG_NAME \(installed with $installedWith\) is not running.'`
+ fi
+ exit 1
+ else
+ if [ "X$DETAIL_STATUS" = "X" ]
+ then
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext '$APP_LONG_NAME \(not installed\) is running: PID:$pid'`
+ elif [ "X$installedWith" = "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME \(installed\) is running: PID:$pid'`
+ else
+ eval echo `gettext '$APP_LONG_NAME \(installed with $installedWith\) is running: PID:$pid'`
+ fi
+ else
+ getstatus
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext '$APP_LONG_NAME \(not installed\) is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS'`
+ elif [ "X$installedWith" = "X" ] ; then
+ eval echo `gettext '$APP_LONG_NAME \(installed\) is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS'`
+ else
+ eval echo `gettext '$APP_LONG_NAME \(installed with $installedWith\) is running: PID:$pid, Wrapper:$STATUS, Java:$JAVASTATUS'`
+ fi
+ fi
+ exit 0
+ fi
+}
+
+# Make sure APP_NAME is less than 14 characters, otherwise in AIX, the commands
+# "lsitab" or "lssrc" will fail
+validateAppNameLength() {
+ if [ ${#APP_NAME} -gt 14 ] ; then
+ eval echo `gettext ' APP_NAME must be less than 14 characters long. Length of ${APP_NAME} is ${#APP_NAME}.'`
+ exit 1
+ fi
+}
+
+resolveInitdCommand() {
+ # NOTE: update-rc.d & chkconfig are the recommended interfaces for managing
+ # init scripts. insserv is a low level tool used by these interfaces.
+ # chkconfig was available on old versions Ubuntu, but update-rc.d is
+ # preferred. chkconfig is used on RHEL based Linux.
+
+ # update-rc.d is used on distros such as Debian/Ubuntu
+ resolveLocation INITD_COMMAND "update-rc.d" ";/usr/sbin" 0
+ if [ $? -eq 0 ] ; then
+ USE_UPDATE_RC=1
+ else
+ # chkconfig is used on distros such as RHEL or Amazon Linux
+ resolveLocation INITD_COMMAND chkconfig ";/sbin" 0
+ if [ $? -eq 0 ] ; then
+ USE_CHKCONFIG=1
+ else
+ # if neither chkconfig nor update-rc.d are present, try insserv
+ resolveLocation INITD_COMMAND insserv ";/sbin" 0
+ if [ $? -eq 0 ] ; then
+ USE_INSSERV=1
+ else
+ INITD_COMMAND=""
+ fi
+ fi
+ fi
+}
+
+installdaemon() {
+ mustBeRootOrExit
+
+ checkInstalled
+ APP_NAME_LOWER=`echo "$APP_NAME" | $TR_BIN "[A-Z]" "[a-z]"`
+ if [ "$DIST_OS" = "solaris" ] ; then
+ eval echo `gettext 'Detected Solaris:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon...'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ for i in `ls "/etc/rc3.d/K"??"$APP_NAME_LOWER" "/etc/rc3.d/S"??"$APP_NAME_LOWER" 2>/dev/null` ; do
+ eval echo `gettext ' Removing unexpected file before proceeding: $i'`
+ rm -f $i
+ done
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/K${APP_RUN_LEVEL_K}$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/S${APP_RUN_LEVEL_S}$APP_NAME_LOWER"
+ fi
+ elif [ "$DIST_OS" = "linux" ] ; then
+ eval echo `gettext 'Detected Linux:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed with $installedWith.'`
+ elif [ -n "$USE_SYSTEMD" ] ; then
+ systemdInstall
+ elif [ -n "$USE_UPSTART" ] ; then
+ upstartInstall
+ else
+ resolveInitdCommand
+ if [ -n "$USE_CHKCONFIG" ] ; then
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon with init.d \($INITD_COMMAND\)...'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ $INITD_COMMAND --add "$APP_NAME"
+ $INITD_COMMAND "$APP_NAME" on
+ elif [ "$USE_INSSERV" ] ; then
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon with init.d \($INITD_COMMAND\)...'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ $INITD_COMMAND "/etc/init.d/$APP_NAME"
+ elif [ "$USE_UPDATE_RC" ] ; then
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon with init.d \($INITD_COMMAND\)...'`
+ ln -s "$REALPATH" "/etc/init.d/$APP_NAME"
+ $INITD_COMMAND "$APP_NAME" defaults
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon with init.d...'`
+ ln -s "$REALPATH" /etc/init.d/$APP_NAME
+ for i in `ls "/etc/rc3.d/K"??"$APP_NAME_LOWER" "/etc/rc5.d/K"??"$APP_NAME_LOWER" "/etc/rc3.d/S"??"$APP_NAME_LOWER" "/etc/rc5.d/S"??"$APP_NAME_LOWER" 2>/dev/null` ; do
+ eval echo `gettext ' Removing unexpected file before proceeding: $i'`
+ rm -f $i
+ done
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/K${APP_RUN_LEVEL_K}$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc3.d/S${APP_RUN_LEVEL_S}$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc5.d/S${APP_RUN_LEVEL_S}$APP_NAME_LOWER"
+ ln -s "/etc/init.d/$APP_NAME" "/etc/rc5.d/K${APP_RUN_LEVEL_K}$APP_NAME_LOWER"
+ fi
+ fi
+ elif [ "$DIST_OS" = "hpux" ] ; then
+ eval echo `gettext 'Detected HP-UX:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon...'`
+ ln -s "$REALPATH" "/sbin/init.d/$APP_NAME"
+ for i in `ls "/sbin/rc3.d/K"??"$APP_NAME_LOWER" "/sbin/rc3.d/S"??"$APP_NAME_LOWER" 2>/dev/null` ; do
+ eval echo `gettext ' Removing unexpected file before proceeding: $i'`
+ rm -f $i
+ done
+ ln -s "/sbin/init.d/$APP_NAME" "/sbin/rc3.d/K${APP_RUN_LEVEL_K}$APP_NAME_LOWER"
+ ln -s "/sbin/init.d/$APP_NAME" "/sbin/rc3.d/S${APP_RUN_LEVEL_S}$APP_NAME_LOWER"
+ fi
+ elif [ "$DIST_OS" = "aix" ] ; then
+ eval echo `gettext 'Detected AIX:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED -a $installedStatus -ne $SERVICE_INSTALLED_SRC_PARTIAL ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed with $installedWith.'`
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon...'`
+ if [ -n "`/usr/sbin/lsitab install_assist`" ] ; then
+ eval echo `gettext ' The task /usr/sbin/install_assist was found in the inittab, this might cause problems for all subsequent tasks to launch as this process is known to block the init task. Please make sure this task is not needed anymore and remove/deactivate it.'`
+ fi
+
+ for i in `ls "/etc/rc.d/rc2.d/K"??"$APP_NAME_LOWER" "/etc/rc.d/rc2.d/S"??"$APP_NAME_LOWER" 2>/dev/null` ; do
+ eval echo `gettext ' Removing unexpected file before proceeding: $i'`
+ rm -f $i
+ done
+
+ if [ -n "$USE_SRC" ] ; then
+ srcInstall
+ else
+ # install using initd
+ ln -s "$REALPATH" "/etc/rc.d/init.d/$APP_NAME"
+ ln -s "/etc/rc.d/init.d/$APP_NAME" "/etc/rc.d/rc2.d/K${APP_RUN_LEVEL_K}$APP_NAME_LOWER"
+ ln -s "/etc/rc.d/init.d/$APP_NAME" "/etc/rc.d/rc2.d/S${APP_RUN_LEVEL_S}$APP_NAME_LOWER"
+ fi
+ fi
+ elif [ "$DIST_OS" = "freebsd" ] ; then
+ eval echo `gettext 'Detected FreeBSD:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon...'`
+ sed -i.bak "/${APP_NAME}_enable=\"YES\"/d" /etc/rc.conf
+ if [ -f "${REALDIR}/${APP_NAME}.install" ] ; then
+ ln -s "${REALDIR}/${APP_NAME}.install" "/etc/rc.d/$APP_NAME"
+ else
+ echo '#!/bin/sh' > "/etc/rc.d/$APP_NAME"
+ echo "#" >> "/etc/rc.d/$APP_NAME"
+ echo "# PROVIDE: $APP_NAME" >> "/etc/rc.d/$APP_NAME"
+ echo "# REQUIRE: NETWORKING" >> "/etc/rc.d/$APP_NAME"
+ echo "# KEYWORD: shutdown" >> "/etc/rc.d/$APP_NAME"
+ echo ". /etc/rc.subr" >> "/etc/rc.d/$APP_NAME"
+ echo "name=\"$APP_NAME\"" >> "/etc/rc.d/$APP_NAME"
+ echo "rcvar=\`set_rcvar\`" >> "/etc/rc.d/$APP_NAME"
+ echo "command=\"${REALPATH}\"" >> "/etc/rc.d/$APP_NAME"
+ echo 'start_cmd="${name}_start"' >> "/etc/rc.d/$APP_NAME"
+ echo 'load_rc_config $name' >> "/etc/rc.d/$APP_NAME"
+ echo 'status_cmd="${name}_status"' >> "/etc/rc.d/$APP_NAME"
+ echo 'stop_cmd="${name}_stop"' >> "/etc/rc.d/$APP_NAME"
+ echo "${APP_NAME}_status() {" >> "/etc/rc.d/$APP_NAME"
+ echo '${command} status' >> "/etc/rc.d/$APP_NAME"
+ echo '}' >> "/etc/rc.d/$APP_NAME"
+ echo "${APP_NAME}_stop() {" >> "/etc/rc.d/$APP_NAME"
+ echo '${command} stop' >> "/etc/rc.d/$APP_NAME"
+ echo '}' >> "/etc/rc.d/$APP_NAME"
+ echo "${APP_NAME}_start() {" >> "/etc/rc.d/$APP_NAME"
+ echo '${command} start' >> "/etc/rc.d/$APP_NAME"
+ echo '}' >> "/etc/rc.d/$APP_NAME"
+ echo 'run_rc_command "$1"' >> "/etc/rc.d/$APP_NAME"
+ fi
+ echo "${APP_NAME}_enable=\"YES\"" >> /etc/rc.conf
+ chmod 555 "/etc/rc.d/$APP_NAME"
+ fi
+ elif [ "$DIST_OS" = "macosx" ] ; then
+ eval echo `gettext 'Detected Mac OSX:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon...'`
+ if [ -f "${REALDIR}/${APP_PLIST}" ] ; then
+ ln -s "${REALDIR}/${APP_PLIST}" "/Library/LaunchDaemons/${APP_PLIST}"
+ else
+ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" > "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\"" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "\"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "<plist version=\"1.0\">" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <dict>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <key>Label</key>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <string>${APP_PLIST_BASE}</string>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <key>ProgramArguments</key>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <array>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <string>${REALPATH}</string>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <string>launchdinternal</string>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " </array>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <key>${KEY_KEEP_ALIVE}</key>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <${MACOSX_KEEP_RUNNING}/>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <key>RunAtLoad</key>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <true/>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ if [ "X$RUN_AS_USER" != "X" ] ; then
+ echo " <key>UserName</key>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo " <string>${RUN_AS_USER}</string>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ echo " </dict>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ echo "</plist>" >> "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ chmod 555 "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ elif [ "$DIST_OS" = "zos" ] ; then
+ eval echo `gettext 'Detected z/OS:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is already installed.'`
+ else
+ eval echo `gettext ' Installing the $APP_LONG_NAME daemon...'`
+ cp /etc/rc /etc/rc.bak
+ sed "s:echo /etc/rc script executed, \`date\`::g" /etc/rc.bak > /etc/rc
+ echo "_BPX_JOBNAME='${APP_NAME}' \"${REALDIR}/${APP_NAME}\" start" >>/etc/rc
+ echo '/etc/rc script executed, `date`' >>/etc/rc
+ fi
+ else
+ eval echo `gettext 'Install not currently supported for $DIST_OS.'`
+ exit 1
+ fi
+
+ # Exit with 1 if the daemon was already installed when calling installdaemon().
+ # The test below requires $installedStatus to be unchanged since the call to
+ # checkInstalled() at the beginning of the function. If the script was launched
+ # with 'installstart' we want to start normally, so don't exit here.
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED -a "$COMMAND" != 'installstart' ] ; then
+ exit 1
+ fi
+
+ # Check again the installation status. The script should exit with 1 if the service
+ # could not be installed (even if it was launched with 'installstart').
+ checkInstalled
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext 'Service not installed.'`
+ exit 1
+ fi
+}
+
+startdaemon() {
+ if [ "$DIST_OS" = "macosx" -a -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ macosxStart
+ elif [ "$DIST_OS" = "linux" -a -n "$USE_UPSTART" ] && [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ upstartStart
+ elif [ "$DIST_OS" = "linux" -a -n "$USE_SYSTEMD" -a -z "$SYSD" ] && [ -f "${SYSTEMD_SERVICE_FILE}" ] ; then
+ systemdStart
+ elif [ "$DIST_OS" = "aix" -a -n "$USE_SRC" ] && [ -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ srcStart
+ else
+ if [ -n "$SYSD" ] ; then
+ shift
+ fi
+
+ checkUser touchlock "$@"
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+
+ if [ "$SERVICE_MANAGEMENT_TOOL" != "auto" -a "$SERVICE_MANAGEMENT_TOOL" != "initd" ] ; then
+ eval echo `gettext "Starting without using the configured service management tool \'$SERVICE_MANAGEMENT_TOOL\' because the service $APP_NAME is not installed."`
+ fi
+
+ start "$@"
+ fi
+}
+
+restartdaemon() {
+ if [ "$DIST_OS" = "macosx" -a -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ macosxRestart $1
+ elif [ "$DIST_OS" = "linux" -a -n "$USE_UPSTART" ] && [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ upstartRestart $1
+ elif [ "$DIST_OS" = "linux" -a -n "$USE_SYSTEMD" -a -z "$SYSD" ] && [ -f "${SYSTEMD_SERVICE_FILE}" ] ; then
+ systemdRestart $1
+ elif [ "$DIST_OS" = "aix" -a -n "$USE_SRC" ] && [ -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ srcRestart $1
+ else
+ checkUser touchlock "$COMMAND"
+
+ checkRunning $1
+ if [ "X$pid" != "X" ] ; then
+ # The daemon was running. Stop it first.
+ eval echo `gettext 'Restarting $APP_LONG_NAME...'`
+ stopit $1
+ fi
+ shift
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ start "$@"
+ fi
+}
+
+isBitSet() {
+ if [ `expr \( $1 / $2 \) % 2` -eq 1 ]; then
+ return 1
+ else
+ return 0
+ fi
+}
+
+removedaemon() {
+ mustBeRootOrExit
+
+ checkInstalled
+ APP_NAME_LOWER=`echo "$APP_NAME" | $TR_BIN "[A-Z]" "[a-z]"`
+ if [ "$DIST_OS" = "solaris" ] ; then
+ eval echo `gettext 'Detected Solaris:'`
+ isBitSet $installedStatus $SERVICE_INSTALLED_DEFAULT
+ if [ $? -eq 1 ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon...'`
+ for i in `ls "/etc/rc3.d/K"??"$APP_NAME_LOWER" "/etc/rc3.d/S"??"$APP_NAME_LOWER" "/etc/init.d/$APP_NAME" 2>/dev/null` ; do
+ rm -f $i
+ done
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "linux" ] ; then
+ eval echo `gettext 'Detected Linux:'`
+ isBitSet $installedStatus $SERVICE_INSTALLED_SYSTEMD
+ if [ $? -eq 1 ] ; then
+ systemdRemove
+ fi
+ isBitSet $installedStatus $SERVICE_INSTALLED_UPSTART
+ if [ $? -eq 1 ] ; then
+ upstartRemove
+ fi
+ isBitSet $installedStatus $SERVICE_INSTALLED_DEFAULT
+ if [ $? -eq 1 ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon from init.d...'`
+ resolveInitdCommand
+ if [ -n "$USE_CHKCONFIG" ] ; then
+ $INITD_COMMAND "$APP_NAME" off
+ $INITD_COMMAND --del "$APP_NAME"
+ rm -f "/etc/init.d/$APP_NAME"
+ elif [ "$USE_INSSERV" ] ; then
+ $INITD_COMMAND -r "/etc/init.d/$APP_NAME"
+ rm -f "/etc/init.d/$APP_NAME"
+ elif [ "$USE_UPDATE_RC" ] ; then
+ $INITD_COMMAND -f "$APP_NAME" remove
+ rm -f "/etc/init.d/$APP_NAME"
+ else
+ for i in `ls "/etc/rc3.d/K"??"$APP_NAME_LOWER" "/etc/rc5.d/K"??"$APP_NAME_LOWER" "/etc/rc3.d/S"??"$APP_NAME_LOWER" "/etc/rc5.d/S"??"$APP_NAME_LOWER" "/etc/init.d/$APP_NAME" 2>/dev/null` ; do
+ rm -f $i
+ done
+ fi
+ fi
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "hpux" ] ; then
+ eval echo `gettext 'Detected HP-UX:'`
+ isBitSet $installedStatus $SERVICE_INSTALLED_DEFAULT
+ if [ $? -eq 1 ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon...'`
+ for i in `ls "/sbin/rc3.d/K"??"$APP_NAME_LOWER" "/sbin/rc3.d/S"??"$APP_NAME_LOWER" "/sbin/init.d/$APP_NAME" 2>/dev/null` ; do
+ rm -f $i
+ done
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "aix" ] ; then
+ eval echo `gettext 'Detected AIX:'`
+ if [ $installedStatus -ne $SERVICE_NOT_INSTALLED ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon...'`
+ isBitSet $installedStatus $SERVICE_INSTALLED_DEFAULT
+ if [ $? -eq 1 ] ; then
+ for i in `ls "/etc/rc.d/rc2.d/K"??"$APP_NAME_LOWER" "/etc/rc.d/rc2.d/S"??"$APP_NAME_LOWER" "/etc/rc.d/init.d/$APP_NAME" 2>/dev/null` ; do
+ rm -f $i
+ done
+ fi
+ isBitSet $installedStatus $SERVICE_INSTALLED_SRC
+ isSrcSet=$?
+ isBitSet $installedStatus $SERVICE_INSTALLED_SRC_PARTIAL
+ isSrcPartialSet=$?
+ if [ $isSrcSet -eq 1 -o $isSrcPartialSet -eq 1 ] ; then
+ validateAppNameLength
+ /usr/sbin/rmitab $APP_NAME
+ /usr/bin/rmssys -s $APP_NAME
+ fi
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "freebsd" ] ; then
+ eval echo `gettext 'Detected FreeBSD:'`
+ if [ -f "/etc/rc.d/$APP_NAME" -o -L "/etc/rc.d/$APP_NAME" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon...'`
+ for i in "/etc/rc.d/$APP_NAME"
+ do
+ rm -f $i
+ done
+ sed -i.bak "/${APP_NAME}_enable=\"YES\"/d" /etc/rc.conf
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "macosx" ] ; then
+ eval echo `gettext 'Detected Mac OSX:'`
+ if [ -f "/Library/LaunchDaemons/${APP_PLIST}" -o -L "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon...'`
+ # Make sure the plist is installed
+ LOADED_PLIST=`launchctl list | grep ${APP_PLIST_BASE}`
+ if [ "X${LOADED_PLIST}" != "X" ] ; then
+ launchctl unload "/Library/LaunchDaemons/${APP_PLIST}"
+ fi
+ rm -f "/Library/LaunchDaemons/${APP_PLIST}"
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ elif [ "$DIST_OS" = "zos" ] ; then
+ eval echo `gettext 'Detected z/OS:'`
+ if [ -f /etc/rc.bak ] ; then
+ stopit "0"
+ eval echo `gettext ' Removing the $APP_LONG_NAME daemon...'`
+ cp /etc/rc /etc/rc.bak
+ sed "s/_BPX_JOBNAME=\'APP_NAME\'.*//g" /etc/rc.bak > /etc/rc
+ rm /etc/rc.bak
+ else
+ eval echo `gettext ' The $APP_LONG_NAME daemon is not currently installed.'`
+ exit 1
+ fi
+ else
+ eval echo `gettext 'Remove not currently supported for $DIST_OS.'`
+ exit 1
+ fi
+}
+
+dump() {
+ eval echo `gettext 'Dumping $APP_LONG_NAME...'`
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext '$APP_LONG_NAME was not running.'`
+ else
+ kill -3 $pid
+
+ if [ $? -ne 0 ]
+ then
+ eval echo `gettext 'Failed to dump $APP_LONG_NAME.'`
+ exit 1
+ else
+ eval echo `gettext 'Dumped $APP_LONG_NAME.'`
+ fi
+ fi
+}
+
+# Used by HP-UX init scripts.
+startmsg() {
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:Stopped'`
+ else
+ if [ "X$DETAIL_STATUS" = "X" ]
+ then
+ eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:Running'`
+ else
+ getstatus
+ eval echo `gettext 'Starting $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS'`
+ fi
+ fi
+}
+
+# Used by HP-UX init scripts.
+stopmsg() {
+ getpid
+ if [ "X$pid" = "X" ]
+ then
+ eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:Stopped'`
+ else
+ if [ "X$DETAIL_STATUS" = "X" ]
+ then
+ eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:Running'`
+ else
+ getstatus
+ eval echo `gettext 'Stopping $APP_LONG_NAME... Wrapper:$STATUS, Java:$JAVASTATUS'`
+ fi
+ fi
+}
+
+# 'source' files
+sourceFiles() {
+ if [ -n "$FILES_TO_SOURCE" ] ; then
+ OIFS=$IFS
+ IFS=';'
+ files=$FILES_TO_SOURCE
+ for file in $files
+ do
+ . $file
+ done
+
+ IFS=$OIFS
+ fi
+}
+
+showUsage() {
+ # $1 bad command
+
+ if [ -n "$1" ]
+ then
+ eval echo `gettext 'Unexpected command: $1'`
+ echo "";
+ fi
+
+ if [ "X${PASS_THROUGH}" = "Xapp_args" ] ; then
+ ARGS=" {JavaAppArgs}"
+ elif [ "X${PASS_THROUGH}" = "Xboth" ] ; then
+ ARGS=" {WrapperProperties} [-- {JavaAppArgs}]"
+ else
+ ARGS=""
+ fi
+
+ eval MSG=`gettext 'Usage: '`
+ if [ -n "$FIXED_COMMAND" ] ; then
+ echo "${MSG} $0${ARGS}"
+ else
+ checkInstalled "strict"
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ # not installed, allow arguments to be passed through
+ ARGS_START=$ARGS
+ else
+ ARGS_START=""
+ fi
+ if [ -n "$PAUSABLE" ] ; then
+ echo "${MSG} $0 [ console${ARGS} | start${ARGS_START} | stop | restart${ARGS_START} | condrestart${ARGS_START} | pause | resume | status | install | installstart | remove | dump ]"
+ else
+ echo "${MSG} $0 [ console${ARGS} | start${ARGS_START} | stop | restart${ARGS_START} | condrestart${ARGS_START} | status | install | installstart | remove | dump ]"
+ fi
+ fi
+
+ if [ ! -n "$BRIEF_USAGE" ]
+ then
+ echo "";
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ echo "`gettext 'Commands:'`"
+ echo "`gettext ' console Launch in the current console.'`"
+ echo "`gettext ' start Start in the background as a daemon process.'`"
+ echo "`gettext ' stop Stop if running as a daemon or in another console.'`"
+ echo "`gettext ' restart Stop if running and then start.'`"
+ echo "`gettext ' condrestart Restart only if already running.'`"
+ if [ -n "$PAUSABLE" ] ; then
+ echo "`gettext ' pause Pause if running.'`"
+ echo "`gettext ' resume Resume if paused.'`"
+ fi
+ echo "`gettext ' status Query the current status.'`"
+ echo "`gettext ' install Install to start automatically when system boots.'`"
+ echo "`gettext ' installstart Install and start running as a daemon process.'`"
+ echo "`gettext ' remove Uninstall.'`"
+ echo "`gettext ' dump Request a Java thread dump if running.'`"
+ echo "";
+ fi
+ if [ "X${PASS_THROUGH}" = "Xapp_args" -o "X${PASS_THROUGH}" = "Xboth" ] ; then
+ if [ "X${PASS_THROUGH}" = "Xboth" ] ; then
+ echo "WrapperProperties:"
+ echo "`gettext ' Optional configuration properties which will be passed to the Wrapper.'`"
+ echo "";
+ fi
+ echo "JavaAppArgs:"
+ echo "`gettext ' Optional arguments which will be passed to the Java application.'`"
+ echo "";
+ fi
+ fi
+
+ exit 1
+}
+
+# Check if arguments are correct. This needs to be done after knowing the
+# command, the application name and OS (to check the installation status).
+# NOTE: When the validity of the arguments depends on the daemon installation,
+# make sure to call setServiceManagementTool() before this function.
+#
+# $1 0: no parameter allowed
+# -1: parameter allowed if not installed
+# 1: parameter allowed
+checkArguments() {
+ # If this is a systemd call (from the systemd service file), we don't want
+ # to check arguments ('sysd' itself should not be blocking and the user
+ # may also have edited the file and added additional args in it).
+ if [ -n "$SYSD" ] ; then
+ return
+ fi
+
+ if [ -n "$FIRST_ARG" ] ; then
+ if [ $1 = -1 ] ; then
+ checkInstalled "strict"
+ if [ $installedStatus -eq $SERVICE_NOT_INSTALLED ] ; then
+ PASS_THROUGH_ALLOWED=true
+ fi
+ elif [ $1 = 1 ] ; then
+ PASS_THROUGH_ALLOWED=true
+ fi
+
+ if [ "X${PASS_THROUGH_ALLOWED}" != "Xtrue" ] ; then
+ eval echo `gettext 'Additional arguments are not allowed with the ${COMMAND} command.'`
+
+ if [ -n "$FIXED_COMMAND" ] ; then
+ # The command can't be used with PASS_THROUGH, so disable it to show appropriate usage.
+ PASS_THROUGH=false
+ fi
+ showUsage
+ exit 2 # LSB - invalid or excess argument(s)
+ elif [ "X${PASS_THROUGH}" = "Xfalse" ] ; then
+ eval echo `gettext 'Additional arguments are not allowed when PASS_THROUGH is set to false.'`
+ showUsage
+ exit 2 # LSB - invalid or excess argument(s)
+ fi
+ fi
+}
+
+# Resolve the service management tool for linux and aix.
+setServiceManagementTool() {
+ if [ ! -n "$SERVICE_MANAGEMENT_TOOL" ] ; then
+ # Set the default value to auto.
+ SERVICE_MANAGEMENT_TOOL=auto
+ fi
+
+ if [ "$DIST_OS" = "linux" ] ; then
+ setServiceManagementToolLinux
+ elif [ "$DIST_OS" = "aix" ] ; then
+ setServiceManagementToolAix
+ else
+ if [ "$SERVICE_MANAGEMENT_TOOL" != "auto" ] ; then
+ eval echo `gettext "The script does not support the service management tool \'$SERVICE_MANAGEMENT_TOOL\' on this platform."`
+ SERVICE_MANAGEMENT_TOOL=auto
+ fi
+ return
+ fi
+
+ if [ $? = 1 ] ; then
+ eval echo `gettext 'Service management tool value is invalid: $SERVICE_MANAGEMENT_TOOL.'`
+ exit 1
+ fi
+}
+
+setServiceManagementToolLinux() {
+ case "$SERVICE_MANAGEMENT_TOOL" in
+ 'auto')
+ systemdDetection
+ if [ $? -eq 0 ] ; then
+ USE_SYSTEMD=1
+ return
+ fi
+
+ upstartDetection
+ if [ $? -eq 0 ] ; then
+ USE_UPSTART=1
+ return
+ fi
+ ;;
+ 'systemd')
+ USE_SYSTEMD=1
+ ;;
+ 'upstart')
+ USE_UPSTART=1
+ ;;
+ 'initd')
+ ;;
+ *)
+ return 1
+ esac
+}
+
+setServiceManagementToolAix() {
+ case "$SERVICE_MANAGEMENT_TOOL" in
+ 'auto')
+ srcDetection
+ if [ $? -eq 0 ] ; then
+ USE_SRC=1
+ fi
+ ;;
+ 'src')
+ USE_SRC=1
+ ;;
+ 'initd')
+ ;;
+ *)
+ return 1
+ esac
+}
+
+docommand() {
+
+ case "$COMMAND" in
+ 'console')
+ checkArguments 1
+ checkUser touchlock "$@"
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ console "$@"
+ ;;
+
+ 'start')
+ setServiceManagementTool
+ checkArguments -1
+ startdaemon "$@"
+ ;;
+
+ 'stop')
+ checkArguments 0
+ setServiceManagementTool
+ if [ "$DIST_OS" = "macosx" -a -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ macosxStop
+ elif [ "$DIST_OS" = "linux" -a -n "$USE_UPSTART" ] && [ -f "/etc/init/${APP_NAME}.conf" ] ; then
+ upstartStop
+ elif [ "$DIST_OS" = "linux" -a -n "$USE_SYSTEMD" -a -z "$SYSD" ] && [ -f "${SYSTEMD_SERVICE_FILE}" ] ; then
+ systemdStop
+ elif [ "$DIST_OS" = "aix" -a -n "$USE_SRC" ] && [ -n "`/usr/bin/lssrc -S -s $APP_NAME`" ] ; then
+ srcStop
+ else
+ checkUser "" "$COMMAND"
+ stopit "0"
+ fi
+ ;;
+
+ 'restart')
+ setServiceManagementTool
+ checkArguments -1
+ restartdaemon "0" "$@"
+ ;;
+
+ 'condrestart')
+ setServiceManagementTool
+ checkArguments -1
+ restartdaemon "1" "$@"
+ ;;
+
+ 'pause')
+ checkArguments 0
+ setServiceManagementTool
+ if [ -n "$PAUSABLE" ]
+ then
+ pause
+ else
+ showUsage "$COMMAND"
+ fi
+ ;;
+
+ 'resume')
+ checkArguments 0
+ setServiceManagementTool
+ if [ -n "$PAUSABLE" ]
+ then
+ resume
+ else
+ showUsage "$COMMAND"
+ fi
+ ;;
+
+ 'status')
+ checkArguments 0
+ setServiceManagementTool
+ status
+ ;;
+
+ 'install')
+ checkArguments 0
+ setServiceManagementTool
+ installdaemon "$@"
+ ;;
+
+ 'installstart')
+ checkArguments 0
+ setServiceManagementTool
+ installdaemon "$@"
+ startdaemon "$@"
+ ;;
+
+ 'remove')
+ checkArguments 0
+ setServiceManagementTool
+ removedaemon
+ ;;
+
+ 'dump')
+ checkArguments 0
+ checkUser "" "$COMMAND"
+ dump
+ ;;
+
+ 'start_msg')
+ # Internal command called by launchd on HP-UX.
+ checkUser "" "$COMMAND"
+ startmsg
+ ;;
+
+ 'stop_msg')
+ # Internal command called by launchd on HP-UX.
+ checkUser "" "$COMMAND"
+ stopmsg
+ ;;
+
+ 'launchdinternal' | 'upstartinternal')
+ if [ ! "$DIST_OS" = "macosx" -o ! -f "/Library/LaunchDaemons/${APP_PLIST}" ] ; then
+ checkUser touchlock "$@"
+ fi
+ # Internal command called by launchd on Max OSX.
+ # We do not want to call checkUser here as it is handled in the launchd plist file. Doing it here would confuse launchd.
+ if [ ! -n "$FIXED_COMMAND" ] ; then
+ shift
+ fi
+ launchinternal "$@"
+ ;;
+
+ *)
+ showUsage "$COMMAND"
+ ;;
+ esac
+}
+
+sourceFiles
+docommand "$@"
+
+exit 0
diff --git a/server-product/jsw/agent/AppCommand.bat.in b/server-product/jsw/agent/AppCommand.bat.in
new file mode 100644
index 0000000000..914c70cef2
--- /dev/null
+++ b/server-product/jsw/agent/AppCommand.bat.in
@@ -0,0 +1,311 @@
+@echo off
+setlocal
+
+rem
+rem Copyright (c) 1999, 2020 Tanuki Software, Ltd.
+rem http://www.tanukisoftware.com
+rem All rights reserved.
+rem
+rem This software is the proprietary information of Tanuki Software.
+rem You shall use it only in accordance with the terms of the
+rem license agreement you entered into with Tanuki Software.
+rem http://wrapper.tanukisoftware.com/doc/english/licenseOverview.html
+rem
+rem Java Service Wrapper command based script.
+rem
+
+rem -----------------------------------------------------------------------------
+rem These settings can be modified to fit the needs of your application
+rem Optimized for use with version 3.5.44-st of the Wrapper.
+
+rem The base name for the Wrapper binary.
+set _WRAPPER_BASE=wrapper
+
+rem The directory where the Wrapper binary (.exe) file is located. It can be
+rem either an absolute or a relative path. If the path contains any special
+rem characters, please make sure to quote the variable.
+set _WRAPPER_DIR=../boot
+
+rem The name and location of the Wrapper configuration file. This will be used
+rem if the user does not specify a configuration file as the first parameter to
+rem this script.
+set _WRAPPER_CONF="../conf/%_WRAPPER_BASE%.conf"
+
+rem _FIXED_COMMAND tells the script to use a hard coded command rather than
+rem expecting the first parameter of the command line to be the command.
+rem By default the command will will be expected to be the first parameter.
+rem set _FIXED_COMMAND=console
+
+rem _PASS_THROUGH controls how the script arguments should be passed to the
+rem Wrapper. Possible values are:
+rem - commented or 'false': the arguments will be ignored (not passed).
+rem - 'app_args' or 'true': the arguments will be passed through the Wrapper as
+rem arguments for the Java Application.
+rem - 'both': both Wrapper properties and Application arguments can be passed to
+rem the Wrapper. The Wrapper properties come in first position. The
+rem user can optionally add a '--' separator followed by application
+rem arguments.
+rem NOTE - If _FIXED_COMMAND is set to true the above applies to all arguments,
+rem otherwise it applies to arguments starting with the second.
+rem NOTE - Passing arguments is only valid with the 'console', 'install',
+rem 'installstart' and 'update' commands.
+set _PASS_THROUGH=app_args
+
+rem Do not modify anything beyond this point
+rem -----------------------------------------------------------------------------
+
+if "%OS%"=="Windows_NT" goto nt
+echo This script only works with NT-based versions of Windows.
+goto :eof
+
+:nt
+rem Find the application home.
+rem if no path path specified do the default action
+IF not DEFINED _WRAPPER_DIR goto dir_undefined
+set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR:"=%"
+if not "%_WRAPPER_DIR:~-2,1%" == "\" set _WRAPPER_DIR_QUOTED="%_WRAPPER_DIR_QUOTED:"=%\"
+rem check if absolute path
+if "%_WRAPPER_DIR_QUOTED:~2,1%" == ":" goto absolute_path
+if "%_WRAPPER_DIR_QUOTED:~1,1%" == "\" goto absolute_path
+rem everythig else means relative path
+set _REALPATH="%~dp0%_WRAPPER_DIR_QUOTED:"=%"
+goto pathfound
+
+:dir_undefined
+rem Use a relative path to the wrapper %~dp0 is location of current script under NT
+set _REALPATH="%~dp0"
+goto pathfound
+:absolute_path
+rem Use an absolute path to the wrapper
+set _REALPATH="%_WRAPPER_DIR_QUOTED:"=%"
+
+:pathfound
+rem
+rem Decide on the specific Wrapper binary to use (See delta-pack)
+rem
+if "%PROCESSOR_ARCHITEW6432%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="AMD64" goto amd64
+if "%PROCESSOR_ARCHITECTURE%"=="IA64" goto ia64
+:x86_32
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-32.exe"
+set _BIN_BITS="32"
+goto search
+:amd64
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-x86-64.exe"
+set _BIN_BITS="64"
+goto search
+:ia64
+set _WRAPPER_L_EXE="%_REALPATH:"=%%_WRAPPER_BASE%-windows-ia-64.exe"
+set _BIN_BITS="64"
+goto search
+:search
+set _WRAPPER_EXE="%_WRAPPER_L_EXE:"=%"
+if exist %_WRAPPER_EXE% goto check_lic_bits
+set _WRAPPER_EXE="%_REALPATH:"=%%_WRAPPER_BASE%.exe"
+if exist %_WRAPPER_EXE% goto conf
+if %_BIN_BITS%=="64" goto x86_32
+echo Unable to locate a Wrapper executable using any of the following names:
+echo %_WRAPPER_L_EXE%
+echo %_WRAPPER_EXE%
+pause
+goto :eof
+
+:check_lic_bits
+rem The command should not be called inside a IF, else errorlevel would be 0
+if not %_BIN_BITS%=="64" goto conf
+%_WRAPPER_EXE% --request_delta_binary_bits %_WRAPPER_CONF% > nul 2>&1
+if %errorlevel% equ 32 (
+ set _LIC32_OS64=true
+ goto x86_32
+)
+
+:conf
+if [%_PASS_THROUGH%]==[true] (
+ set _PASS_THROUGH=app_args
+)
+if [%_PASS_THROUGH%]==[app_args] (
+ set _PARAMETERS=--
+ set ARGS_ARE_APP_PARAMS=true
+ set _PASS_THROUGH_ON=true
+)
+if [%_PASS_THROUGH%]==[both] (
+ set _PASS_THROUGH_ON=true
+)
+if not [%_PASS_THROUGH_ON%]==[true] (
+ set _PASS_THROUGH=false
+)
+
+set _SCRIPT_NAME=%~n0
+
+if not [%_FIXED_COMMAND%]==[] (
+ set _COMMAND=%_FIXED_COMMAND%
+) else (
+ set _COMMAND=%1
+ shift
+)
+
+rem Check the command
+if [%_COMMAND%]==[console] goto args_allowed
+if [%_COMMAND%]==[setup] goto args_not_allowed
+if [%_COMMAND%]==[teardown] goto args_not_allowed
+if [%_COMMAND%]==[start] goto args_not_allowed
+if [%_COMMAND%]==[stop] goto args_not_allowed
+if [%_COMMAND%]==[install] goto args_allowed
+if [%_COMMAND%]==[installstart] goto args_allowed
+if [%_COMMAND%]==[update] goto args_allowed
+if [%_COMMAND%]==[pause] goto args_not_allowed
+if [%_COMMAND%]==[resume] goto args_not_allowed
+if [%_COMMAND%]==[status] goto args_not_allowed
+if [%_COMMAND%]==[remove] goto args_not_allowed
+if [%_COMMAND%]==[restart] goto args_not_allowed
+
+rem The command is invalid
+if [%_FIXED_COMMAND%]==[] (
+ echo Unexpected command: %_COMMAND%
+ echo.
+ goto showusage
+) else (
+ echo Invalid value '%_COMMAND%' for _FIXED_COMMAND.
+ pause
+ goto :eof
+)
+
+:args_not_allowed
+if not [%1]==[] (
+ echo Additional arguments are not allowed with the %_COMMAND% command.
+ if not [%_FIXED_COMMAND%]==[] (
+ rem The command can't be used with PASS_THROUGH, so disable it to show appropriate usage.
+ set _PASS_THROUGH=false
+ )
+ goto showusage
+)
+
+:args_allowed
+if not [%1]==[] (
+ if [%_PASS_THROUGH%]==[false] (
+ echo Additional arguments are not allowed when _PASS_THROUGH is set to false.
+ pause
+ goto :eof
+ )
+)
+
+rem Collect all parameters
+:parameters
+if [%1]==[] goto callcommand
+if [%ARGS_ARE_APP_PARAMS%]==[true] goto append
+if [%1]==[--] (
+ set ARGS_ARE_APP_PARAMS=true
+ goto append
+)
+rem So we are appending a wrapper property.
+rem 1) Check it is wrapped inside double quotes.
+if not ["%~1"]==[%1] (
+ if not [%_MISSING_QUOTES_REPORTED%]==[true] (
+ set _MISSING_QUOTES_REPORTED=true
+ echo WARNING: Any property assignment before '--' should be wrapped inside double quotes on Windows. In a powershell prompt command, double quotes should be escaped with backquote characters ^(^`^).
+ )
+ rem If not wrapped inside quotes, the following tests are not relevant, so skip them. Should we stop? We always used to continue.. but the Wrapper will probably fail.
+ goto append
+)
+rem 2) Check that the arg matches the pattern of a property (the command should be outside of a IF block for errorlevel to be correct)
+echo %1 | findstr ^wrapper\..*\=.*$ > nul 2>&1
+if %errorlevel% equ 0 goto append
+echo %1 | findstr ^.*\=.*$ > nul 2>&1
+if %errorlevel% equ 0 goto unkown_property
+rem Not a valid assignment.
+echo WARNING: Encountered an invalid configuration property assignment '%~1'. When PASS_THROUGH is set to 'both', any argument before '--' should be in the format '^<property_name^>=^<value^>'.
+goto append
+:unkown_property
+rem The property name is not starting with 'wrapper.' so invalid.
+rem Extract the property name (this should be outside of a IF-ELSE block)
+for /f "tokens=1* delims==" %%a in ("%~1") do set _COMMAND_PROP=%%a
+echo WARNING: Encountered an unknown configuration property '%_COMMAND_PROP%'. When PASS_THROUGH is set to 'both', any argument before '--' should target a valid Wrapper configuration property.
+:append
+set _PARAMETERS=%_PARAMETERS% %1
+shift
+goto parameters
+
+rem
+rem Run the Wrapper
+rem
+:callcommand
+if [%_COMMAND%]==[console] (
+ %_WRAPPER_EXE% -c "%_WRAPPER_CONF%" %_PARAMETERS%
+) else if [%_COMMAND%]==[setup] (
+ %_WRAPPER_EXE% -su "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[teardown] (
+ %_WRAPPER_EXE% -td "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[start] (
+ call :start
+) else if [%_COMMAND%]==[stop] (
+ call :stop
+) else if [%_COMMAND%]==[install] (
+ %_WRAPPER_EXE% -i "%_WRAPPER_CONF%" %_PARAMETERS%
+) else if [%_COMMAND%]==[installstart] (
+ %_WRAPPER_EXE% -it "%_WRAPPER_CONF%" %_PARAMETERS%
+) else if [%_COMMAND%]==[update] (
+ %_WRAPPER_EXE% -u "%_WRAPPER_CONF%" %_PARAMETERS%
+) else if [%_COMMAND%]==[pause] (
+ %_WRAPPER_EXE% -a "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[resume] (
+ %_WRAPPER_EXE% -e "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[status] (
+ %_WRAPPER_EXE% -q "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[remove] (
+ %_WRAPPER_EXE% -r "%_WRAPPER_CONF%"
+) else if [%_COMMAND%]==[restart] (
+ call :stop
+ call :start
+)
+if not errorlevel 1 goto :eof
+pause
+goto :eof
+
+:start
+ %_WRAPPER_EXE% -t "%_WRAPPER_CONF%"
+ goto :eof
+:stop
+ %_WRAPPER_EXE% -p "%_WRAPPER_CONF%"
+ goto :eof
+
+:showusage
+if [%_PASS_THROUGH%]==[app_args] (
+ set ARGS= {JavaAppArgs}
+) else if [%_PASS_THROUGH%]==[both] (
+ set ARGS= {WrapperProperties} [-- {JavaAppArgs}]
+) else (
+ set ARGS=
+)
+
+if [%_FIXED_COMMAND%]==[] (
+ echo Usage: %_SCRIPT_NAME% [ console%ARGS% : start : stop : restart : pause : resume : status : install%ARGS% : installstart%ARGS% : update%ARGS% : remove : setup : teardown ]
+ echo.
+ echo Commands:
+ echo console Launch in the current console.
+ echo start Start the Service.
+ echo stop Stop the Service.
+ echo restart Stop the Service if running and then start.
+ echo pause Pause the Service if running.
+ echo resume Resume the Service if paused.
+ echo status Query the current status of the Service.
+ echo install Install the Service.
+ echo installstart Install the Service and then start running it.
+ echo update Update an installed Service.
+ echo remove Uninstall the Service.
+ echo setup Setup the Wrapper ^(for registration to the Windows Event Log^).
+ echo teardown Teardown the Wrapper ^(unregister from the Windows Event Log^).
+ echo.
+) else (
+ echo Usage: %_SCRIPT_NAME%%ARGS%
+)
+if not [%_PASS_THROUGH%]==[false] (
+ if [%_PASS_THROUGH%]==[both] (
+ echo WrapperProperties:
+ echo Optional configuration properties which will be passed to the Wrapper.
+ echo.
+ )
+ echo JavaAppArgs:
+ echo Optional arguments which will be passed to the Java application.
+ echo.
+)
+pause
diff --git a/server-product/jsw/agent/wrapper-license.conf b/server-product/jsw/agent/wrapper-license.conf
new file mode 100644
index 0000000000..7ecb70a72a
--- /dev/null
+++ b/server-product/jsw/agent/wrapper-license.conf
@@ -0,0 +1,13 @@
+#encoding=UTF-8
+wrapper.license.type=DEV
+wrapper.license.id=202108130000064
+wrapper.license.licensee=OneDev
+wrapper.license.group=service wrapping
+wrapper.license.dev_application=Service Wrapping
+wrapper.license.features=64bit
+wrapper.license.upgrade_term.begin_date=2020-11-09
+wrapper.license.upgrade_term.end_date=2022-04-26
+wrapper.license.key.1=8912-a606-266c-63bf
+wrapper.license.key.2=3d3a-f0a5-b30c-8463
+wrapper.license.key.3=e883-6cc7-2fca-0d77
+wrapper.license.key.4=860a-6383-8aa1-2d44
\ No newline at end of file
diff --git a/server-product/jsw/agent/wrapper.conf b/server-product/jsw/agent/wrapper.conf
new file mode 100644
index 0000000000..90eec93a63
--- /dev/null
+++ b/server-product/jsw/agent/wrapper.conf
@@ -0,0 +1,182 @@
+#encoding=UTF-8
+# Configuration files must begin with a line specifying the encoding
+# of the the file.
+
+#********************************************************************
+# Wrapper License Properties (Ignored by Community Edition)
+#********************************************************************
+# Professional and Standard Editions of the Wrapper require a valid
+# License Key to start. Licenses can be purchased or a trial license
+# requested on the following pages:
+# http://wrapper.tanukisoftware.com/purchase
+# http://wrapper.tanukisoftware.com/trial
+
+# Include file problems can be debugged by leaving only one '#'
+# at the beginning of the following line:
+##include.debug
+
+# The Wrapper will look for either of the following optional files for a
+# valid License Key. License Key properties can optionally be included
+# directly in this configuration file.
+#include ../conf/wrapper-license.conf
+#include ../conf/wrapper-license-%WRAPPER_HOST_NAME%.conf
+
+# The following property will output information about which License Key(s)
+# are being found, and can aid in resolving any licensing problems.
+#wrapper.license.debug=TRUE
+
+#********************************************************************
+# Wrapper Localization
+#********************************************************************
+# Specify the language and locale which the Wrapper should use.
+#wrapper.lang=en_US # en_US or ja_JP
+
+# Specify the location of the language resource files (*.mo).
+wrapper.lang.folder=../lang
+
+wrapper.restart.reload_configuration=TRUE
+wrapper.pidfile=../status/onedevagent.pid
+wrapper.single_invocation=TRUE
+
+#********************************************************************
+# Wrapper Java Properties. OneDev requires at least Java version 8
+#********************************************************************
+# Specify Java 8 executable to be used. You may simply specify it as "java"
+# if the one in system path is appropriate, or specify the full path to
+# desired java executable
+wrapper.java.command=java
+
+# Tell the Wrapper to log the full generated Java command line.
+#wrapper.java.command.loglevel=INFO
+
+# Java Main class. This class must implement the WrapperListener interface
+# or guarantee that the WrapperManager class is initialized. Helper
+# classes are provided to do this for you.
+# See the following page for details:
+# http://wrapper.tanukisoftware.com/doc/english/integrate.html
+wrapper.java.mainclass=org.tanukisoftware.wrapper.WrapperSimpleApp
+
+# Java Classpath (include wrapper.jar) Add class path elements as
+# needed starting from 1
+wrapper.java.classpath.1=*.jar
+wrapper.java.classpath.2=../lib/agentVersion/io.onedev.*.jar
+wrapper.java.classpath.3=../lib/agentVersion/*.jar
+
+
+# Java Library Path (location of Wrapper.DLL or libwrapper.so)
+wrapper.java.library.path.1=.
+wrapper.java.library.path.append_system_path=TRUE
+
+# Java Bits. On applicable platforms, tells the JVM to run in 32 or 64-bit mode.
+wrapper.java.additional.auto_bits=TRUE
+
+# Java Additional Parameters
+wrapper.java.additional.1=-Djava.awt.headless=true
+
+wrapper.java.additional.10=-XX:+IgnoreUnrecognizedVMOptions
+wrapper.java.additional.11=--add-opens=java.base/java.lang=ALL-UNNAMED
+wrapper.java.additional.12=--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
+wrapper.java.additional.13=--add-opens=java.base/java.lang.invoke=ALL-UNNAMED
+wrapper.java.additional.14=--add-opens=java.base/java.util=ALL-UNNAMED
+wrapper.java.additional.15=--add-opens=java.base/java.text=ALL-UNNAMED
+wrapper.java.additional.16=--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
+
+# Maximum Java Heap Size (in MB)
+wrapper.java.maxmemory=1024
+
+# Application parameters. Add parameters as needed starting from 1
+wrapper.app.parameter.1=io.onedev.agent.Agent
+
+#********************************************************************
+# Wrapper Logging Properties
+#********************************************************************
+# Enables Debug output from the Wrapper.
+# wrapper.debug=TRUE
+
+# Format of output for the console. (See docs for formats)
+wrapper.console.format=M
+
+# Log Level for console output. (See docs for log levels)
+wrapper.console.loglevel=INFO
+
+# Log file to use for wrapper output logging.
+wrapper.logfile=../logs/console.log
+
+# Format of output for the log file. (See docs for formats)
+wrapper.logfile.format=M
+
+# Log Level for log file output. (See docs for log levels)
+wrapper.logfile.loglevel=INFO
+
+# Maximum size that the log file will be allowed to grow to before
+# the log is rolled. Size is specified in bytes. The default value
+# of 0, disables log rolling. May abbreviate with the 'k' (kb) or
+# 'm' (mb) suffix. For example: 10m = 10 megabytes.
+wrapper.logfile.maxsize=250k
+
+# Maximum number of rolled log files which will be allowed before old
+# files are deleted. The default value of 0 implies no limit.
+wrapper.logfile.maxfiles=3
+
+# Log Level for sys/event log output. (See docs for log levels)
+wrapper.syslog.loglevel=NONE
+
+#********************************************************************
+# Wrapper General Properties
+#********************************************************************
+# Allow for the use of non-contiguous numbered properties
+wrapper.ignore_sequence_gaps=TRUE
+
+# Title to use when running as a console
+wrapper.console.title=OneDev Agent
+
+
+#********************************************************************
+# Wrapper Windows NT/2000/XP Service Properties
+#********************************************************************
+# WARNING - Do not modify any of these properties when an application
+# using this configuration file has been installed as a service.
+# Please uninstall the service before modifying this section. The
+# service can then be reinstalled.
+
+# Name of the service
+wrapper.name=onedevagent
+
+# Display name of the service
+wrapper.displayname=OneDev Agent
+
+# Description of the service
+wrapper.description=OneDev Agent
+
+# Service dependencies. Add dependencies as needed starting from 1
+wrapper.ntservice.dependency.1=
+
+# Mode in which the service is installed. AUTO_START, DELAY_START or DEMAND_START
+wrapper.ntservice.starttype=AUTO_START
+
+# Allow the service to interact with the desktop.
+wrapper.ntservice.interactive=false
+
+# Specify NT service account. Leave empty to use local system account.
+wrapper.ntservice.account=
+wrapper.ntservice.password=
+
+# Optionally mount NT network shares
+#wrapper.share.1.location=\\server\share
+#wrapper.share.1.target=Z:
+#wrapper.share.1.account=domain\user
+#wrapper.share.1.password=userpass
+#wrapper.share.1.startup.premapped=CONTINUE
+#wrapper.share.1.startup.failure=SHUTDOWN
+#wrapper.share.1.startup.max_retries=5
+#wrapper.share.1.startup.retry_interval=10
+#wrapper.share.1.shutdown.unmap=TRUE
+#wrapper.share.1.shutdown.unmap.force=TRUE
+
+# Various timeouts
+wrapper.jvm_exit.timeout=60
+wrapper.startup.timeout=0
+wrapper.shutdown.timeout=0
+wrapper.ping.timeout=0
+wrapper.cpu.timeout=3600
+wrapper.ping.interval=3600
diff --git a/server-product/system/conf/wrapper-license.conf b/server-product/jsw/wrapper-license.conf
similarity index 100%
rename from server-product/system/conf/wrapper-license.conf
rename to server-product/jsw/wrapper-license.conf
diff --git a/server-product/pom.xml b/server-product/pom.xml
index a6b8a61ca2..2ccc4525a4 100644
--- a/server-product/pom.xml
+++ b/server-product/pom.xml
@@ -47,7 +47,12 @@
</dependency>
<dependency>
<groupId>io.onedev</groupId>
- <artifactId>server-plugin-executor-docker</artifactId>
+ <artifactId>server-plugin-executor-serverdocker</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>server-plugin-executor-remotedocker</artifactId>
<version>${project.version}</version>
</dependency>
<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 5dce9b5272..4876c2b347 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
@@ -17,6 +17,7 @@ import org.eclipse.jetty.servlet.ServletHolder;
import org.glassfish.jersey.servlet.ServletContainer;
import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.server.ServerSocketServlet;
import io.onedev.server.git.GitFilter;
import io.onedev.server.git.hookcallback.GitPostReceiveCallback;
import io.onedev.server.git.hookcallback.GitPreReceiveCallback;
@@ -47,10 +48,13 @@ public class ProductServletConfigurator implements ServletConfigurator {
private final WebSocketManager webSocketManager;
+ private final ServerSocketServlet serverServlet;
+
@Inject
public ProductServletConfigurator(ServerConfig serverConfig, ShiroFilter shiroFilter, GitFilter gitFilter,
GitPreReceiveCallback preReceiveServlet, GitPostReceiveCallback postReceiveServlet,
- WicketServlet wicketServlet, WebSocketManager webSocketManager, ServletContainer jerseyServlet) {
+ WicketServlet wicketServlet, WebSocketManager webSocketManager, ServletContainer jerseyServlet,
+ ServerSocketServlet serverServlet) {
this.serverConfig = serverConfig;
this.shiroFilter = shiroFilter;
this.gitFilter = gitFilter;
@@ -59,6 +63,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
this.wicketServlet = wicketServlet;
this.webSocketManager = webSocketManager;
this.jerseyServlet = jerseyServlet;
+ this.serverServlet = serverServlet;
}
@Override
@@ -108,6 +113,7 @@ public class ProductServletConfigurator implements ServletConfigurator {
context.addServlet(fileServletHolder, "/robots.txt");
context.addServlet(new ServletHolder(jerseyServlet), "/api/*");
+ context.addServlet(new ServletHolder(serverServlet), "/server");
}
}