Skip to content

The Unified and Autonomous Development Platform

Simplified job executor interface

Robin Shen5676d29badcb
diff --git a/core/pom.xml b/core/pom.xml
index 66fbc0c5c1..3161e05ccb 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,433 +1,433 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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-core</artifactId>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>server</artifactId>
- <version>2.1.2</version>
- </parent>
- <build>
- <plugins>
- <plugin>
- <groupId>io.onedev</groupId>
- <artifactId>plugin-maven</artifactId>
- </plugin>
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- <dependencies>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-launcher-loader</artifactId>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-launcher-loader</artifactId>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-codeassist</artifactId>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-jsymbol</artifactId>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-jsyntax</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- <version>1.18</version>
- </dependency>
- <dependency>
- <groupId>org.jetbrains.xodus</groupId>
- <artifactId>xodus-entity-store</artifactId>
- <version>1.2.3</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>1.20</version>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>20.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-email</artifactId>
- <version>1.4</version>
- </dependency>
- <dependency>
- <groupId>org.apache.velocity</groupId>
- <artifactId>velocity</artifactId>
- <version>1.7</version>
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <version>3.1</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>org.javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>3.20.0-GA</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlets</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty.websocket</groupId>
- <artifactId>websocket-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-guava</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-joda</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.jaxrs</groupId>
- <artifactId>jackson-jaxrs-json-provider</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.containers</groupId>
- <artifactId>jersey-container-servlet</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.core</groupId>
- <artifactId>jersey-client</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.jersey.ext</groupId>
- <artifactId>jersey-bean-validation</artifactId>
- <version>${jersey.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-validator</artifactId>
- <version>5.2.4.Final</version>
- </dependency>
- <dependency>
- <groupId>org.unbescape</groupId>
- <artifactId>unbescape</artifactId>
- <version>1.1.2.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-core</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-extensions</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-request</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-devutils</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-native-websocket-core</artifactId>
- <version>${wicket.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>font-awesome</artifactId>
- <version>4.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>bootstrap</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-core</artifactId>
- <version>${wicketbootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>de.agilecoders.wicket</groupId>
- <artifactId>wicket-bootstrap-extensions</artifactId>
- <version>${wicketbootstrap.version}</version>
- </dependency>
- <dependency>
- <groupId>org.webjars.npm</groupId>
- <artifactId>codemirror</artifactId>
- <version>5.21.0</version>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.3.3</version>
- </dependency>
- <dependency>
- <groupId>commons-validator</groupId>
- <artifactId>commons-validator</artifactId>
- <version>1.4.0</version>
- </dependency>
- <dependency>
- <groupId>org.ocpsoft.prettytime</groupId>
- <artifactId>prettytime</artifactId>
- <version>4.0.1.Final</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5.6</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish.hk2</groupId>
- <artifactId>guice-bridge</artifactId>
- <version>2.4.0-b06</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <artifactId>lucene-core</artifactId>
- <groupId>org.apache.lucene</groupId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <artifactId>lucene-queries</artifactId>
- <groupId>org.apache.lucene</groupId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <artifactId>lucene-analyzers-common</artifactId>
- <groupId>org.apache.lucene</groupId>
- <version>${lucene.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- <version>${shiro.version}</version>
- </dependency>
- <dependency>
- <groupId>com.pmease.security.shiro</groupId>
- <artifactId>shiro-bcrypt</artifactId>
- <version>1.0.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-guice</artifactId>
- <version>${shiro.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-core</artifactId>
- <version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-ehcache</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>${hibernate.version}</version>
- <exclusions>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-hikaricp</artifactId>
- <version>${hibernate.version}</version>
- </dependency>
- <dependency>
- <groupId>com.zaxxer</groupId>
- <artifactId>HikariCP</artifactId>
- <version>2.7.9</version>
- </dependency>
- <dependency>
- <groupId>org.glassfish</groupId>
- <artifactId>javax.el</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>org.hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- <version>2.4.0</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>1.4.197</version>
- </dependency>
- <dependency>
- <groupId>org.dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>2.1.1</version>
- </dependency>
- <dependency>
- <groupId>com.thoughtworks.xstream</groupId>
- <artifactId>xstream</artifactId>
- <version>1.4.9</version>
- </dependency>
- <dependency>
- <groupId>com.joestelmach</groupId>
- <artifactId>natty</artifactId>
- <version>0.13</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy</artifactId>
- <version>${groovy.version}</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.juniversalchardet</groupId>
- <artifactId>juniversalchardet</artifactId>
- <version>1.0.3</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-autolink</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-anchorlink</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-definition</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-tables</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-gfm-tasklist</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>com.vladsch.flexmark</groupId>
- <artifactId>flexmark-ext-toc</artifactId>
- <version>${flexmark.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.http.server</artifactId>
- <version>${jgit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jgit</groupId>
- <artifactId>org.eclipse.jgit.archive</artifactId>
- <version>${jgit.version}</version>
- </dependency>
- </dependencies>
- <properties>
- <moduleClass>io.onedev.server.CoreModule</moduleClass>
- <lucene.version>7.1.0</lucene.version>
- <hibernate.version>5.2.10.Final</hibernate.version>
- <shiro.version>1.4.0</shiro.version>
- <jgit.version>5.1.3.201810200350-r</jgit.version>
- <flexmark.version>0.18.3</flexmark.version>
- <groovy.version>2.4.14</groovy.version>
- <wicket.version>7.10.0</wicket.version>
- <wicketbootstrap.version>0.10.17</wicketbootstrap.version>
- <jersey.version>2.13</jersey.version>
- <jetty.version>9.3.24.v20180605</jetty.version>
- <jackson.version>2.9.8</jackson.version>
- <servlet.version>3.1.0</servlet.version>
- </properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<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-core</artifactId>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>server</artifactId>
+ <version>2.1.2</version>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>io.onedev</groupId>
+ <artifactId>plugin-maven</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-codeassist</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsymbol</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsyntax</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ <version>1.18</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jetbrains.xodus</groupId>
+ <artifactId>xodus-entity-store</artifactId>
+ <version>1.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tika</groupId>
+ <artifactId>tika-core</artifactId>
+ <version>1.20</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>20.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-email</artifactId>
+ <version>1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.7</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
+ <groupId>joda-time</groupId>
+ <artifactId>joda-time</artifactId>
+ <version>2.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>3.20.0-GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlets</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>websocket-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-guava</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-joda</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-json-provider</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.containers</groupId>
+ <artifactId>jersey-container-servlet</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.jersey.ext</groupId>
+ <artifactId>jersey-bean-validation</artifactId>
+ <version>${jersey.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-validator</artifactId>
+ <version>5.2.4.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.unbescape</groupId>
+ <artifactId>unbescape</artifactId>
+ <version>1.1.2.RELEASE</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-extensions</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-devutils</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-native-websocket-core</artifactId>
+ <version>${wicket.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars</groupId>
+ <artifactId>font-awesome</artifactId>
+ <version>4.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.webjars</groupId>
+ <artifactId>bootstrap</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-core</artifactId>
+ <version>${wicketbootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>de.agilecoders.wicket</groupId>
+ <artifactId>wicket-bootstrap-extensions</artifactId>
+ <version>${wicketbootstrap.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.webjars.npm</groupId>
+ <artifactId>codemirror</artifactId>
+ <version>5.21.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.3.3</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-validator</groupId>
+ <artifactId>commons-validator</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.ocpsoft.prettytime</groupId>
+ <artifactId>prettytime</artifactId>
+ <version>4.0.1.Final</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>4.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish.hk2</groupId>
+ <artifactId>guice-bridge</artifactId>
+ <version>2.4.0-b06</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <artifactId>lucene-core</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>lucene-queries</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>lucene-analyzers-common</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.pmease.security.shiro</groupId>
+ <artifactId>shiro-bcrypt</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-guice</artifactId>
+ <version>${shiro.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-core</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-ehcache</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-entitymanager</artifactId>
+ <version>${hibernate.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-hikaricp</artifactId>
+ <version>${hibernate.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.zaxxer</groupId>
+ <artifactId>HikariCP</artifactId>
+ <version>2.7.9</version>
+ </dependency>
+ <dependency>
+ <groupId>org.glassfish</groupId>
+ <artifactId>javax.el</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ <version>2.4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.4.197</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>2.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.4.9</version>
+ </dependency>
+ <dependency>
+ <groupId>com.joestelmach</groupId>
+ <artifactId>natty</artifactId>
+ <version>0.13</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.juniversalchardet</groupId>
+ <artifactId>juniversalchardet</artifactId>
+ <version>1.0.3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-autolink</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-anchorlink</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-definition</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-tables</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-gfm-tasklist</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.vladsch.flexmark</groupId>
+ <artifactId>flexmark-ext-toc</artifactId>
+ <version>${flexmark.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.http.server</artifactId>
+ <version>${jgit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jgit</groupId>
+ <artifactId>org.eclipse.jgit.archive</artifactId>
+ <version>${jgit.version}</version>
+ </dependency>
+ </dependencies>
+ <properties>
+ <moduleClass>io.onedev.server.CoreModule</moduleClass>
+ <lucene.version>7.1.0</lucene.version>
+ <hibernate.version>5.2.10.Final</hibernate.version>
+ <shiro.version>1.4.0</shiro.version>
+ <jgit.version>5.1.3.201810200350-r</jgit.version>
+ <flexmark.version>0.18.3</flexmark.version>
+ <groovy.version>2.4.14</groovy.version>
+ <wicket.version>7.10.0</wicket.version>
+ <wicketbootstrap.version>0.10.17</wicketbootstrap.version>
+ <jersey.version>2.13</jersey.version>
+ <jetty.version>9.3.24.v20180605</jetty.version>
+ <jackson.version>2.9.8</jackson.version>
+ <servlet.version>3.1.0</servlet.version>
+ </properties>
</project>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
index b90d2b11d0..dde51353b6 100644
--- a/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
+++ b/core/src/main/java/io/onedev/server/ci/job/DefaultJobScheduler.java
@@ -1,450 +1,463 @@
-package io.onedev.server.ci.job;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.commons.launcher.loader.ListenerRegistry;
-import io.onedev.commons.utils.LockUtils;
-import io.onedev.server.ci.CISpec;
-import io.onedev.server.ci.Dependency;
-import io.onedev.server.ci.InvalidCISpecException;
-import io.onedev.server.ci.job.log.JobLogger;
-import io.onedev.server.ci.job.log.LogLevel;
-import io.onedev.server.ci.job.log.LogManager;
-import io.onedev.server.ci.job.param.JobParam;
-import io.onedev.server.ci.job.trigger.JobTrigger;
-import io.onedev.server.entitymanager.Build2Manager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.entitymanager.UserManager;
-import io.onedev.server.event.CommitAware;
-import io.onedev.server.event.ProjectEvent;
-import io.onedev.server.event.build2.BuildFinished;
-import io.onedev.server.event.build2.BuildPending;
-import io.onedev.server.event.build2.BuildRunning;
-import io.onedev.server.event.build2.BuildSubmitted;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.exception.OneException;
-import io.onedev.server.model.Build2;
-import io.onedev.server.model.BuildDependence;
-import io.onedev.server.model.BuildParam;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.util.MatrixRunner;
-
-@Singleton
-public class DefaultJobScheduler implements JobScheduler, Runnable {
-
- private static final int CHECK_INTERVAL = 5;
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultJobScheduler.class);
-
- private enum Status {RUNNING, STOPPING, STOPPED};
-
- private final ProjectManager projectManager;
-
- private final Build2Manager buildManager;
-
- private final UserManager userManager;
-
- private final ListenerRegistry listenerRegistry;
-
- private final TransactionManager transactionManager;
-
- private final LogManager logManager;
-
- private final SettingManager settingManager;
-
- private volatile Status status;
-
- @Inject
- public DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,
- UserManager userManager, ListenerRegistry listenerRegistry, SettingManager settingManager,
- TransactionManager transactionManager, LogManager logManager) {
- this.projectManager = projectManager;
- this.settingManager = settingManager;
- this.buildManager = buildManager;
- this.userManager = userManager;
- this.listenerRegistry = listenerRegistry;
- this.transactionManager = transactionManager;
- this.logManager = logManager;
- }
-
- @Sessional
- @Override
- public void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix) {
- String lockKey = "job-schedule: " + project.getId() + "-" + commitHash;
- Long projectId = project.getId();
- Long userId = User.idOf(userManager.getCurrent());
- transactionManager.runAsyncAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- LockUtils.call(lockKey, new Callable<Void>() {
-
- @Override
- public Void call() {
- transactionManager.run(new Runnable() {
-
- @Override
- public void run() {
- Project project = projectManager.load(projectId);
- User user = (userId != null? userManager.load(userId): null);
- new MatrixRunner(paramMatrix).run(new MatrixRunner.Runnable() {
-
- @Override
- public void run(Map<String, String> params) {
- submit(project, user, commitHash, jobName, params, new ArrayList<>());
- }
-
- });
- }
-
- });
- return null;
- }
-
- });
- }
-
- });
- }
-
- private Map<String, List<String>> getParamMatrix(List<JobParam> params) {
- Map<String, List<String>> paramMatrix = new LinkedHashMap<>();
- for (JobParam param: params)
- paramMatrix.put(param.getName(), param.getValueProvider().getValues());
- return paramMatrix;
- }
-
- private List<Build2> submit(Project project, @Nullable User user, String commitHash, String jobName,
- Map<String, String> paramMap, List<String> dependencyChain) {
- List<Build2> builds = buildManager.query(project, commitHash, jobName, paramMap);
- if (builds.isEmpty()) {
- Build2 build = new Build2();
- build.setProject(project);
- build.setCommitHash(commitHash);
- build.setJobName(jobName);
- build.setSubmitDate(new Date());
- build.setStatus(Build2.Status.WAITING);
- build.setUser(user);
-
- builds.add(build);
-
- for (Map.Entry<String, String> entry: paramMap.entrySet()) {
- BuildParam param = new BuildParam();
- param.setBuild(build);
- param.setName(entry.getKey());
- param.setValue(entry.getValue());
- build.getParams().add(param);
- }
-
- if (dependencyChain.contains(jobName)) {
- dependencyChain.add(jobName);
- markBuildError(build, "Circular job dependencies found: " + dependencyChain);
- return builds;
- }
-
- dependencyChain.add(jobName);
-
- CISpec ciSpec;
- try {
- ciSpec = project.getCISpec(ObjectId.fromString(commitHash));
- if (ciSpec == null) {
- markBuildError(build, "No CI spec");
- return builds;
- }
- } catch (InvalidCISpecException e) {
- markBuildError(build, e.getMessage());
- return builds;
- }
-
- Job job = ciSpec.getJobMap().get(jobName);
- if (job == null) {
- markBuildError(build, "Job not found");
- return builds;
- }
-
- for (Dependency dependency: job.getDependencies()) {
- new MatrixRunner(getParamMatrix(dependency.getParams())).run(new MatrixRunner.Runnable() {
-
- @Override
- public void run(Map<String, String> params) {
- List<Build2> dependencyBuilds = submit(project, null, commitHash, dependency.getJobName(),
- params, new ArrayList<>(dependencyChain));
- for (Build2 dependencyBuild: dependencyBuilds) {
- BuildDependence dependence = new BuildDependence();
- dependence.setDependency(dependencyBuild);
- dependence.setDependent(build);
- build.getDependencies().add(dependence);
- }
- }
-
- });
- }
-
- buildManager.create(build);
- listenerRegistry.post(new BuildSubmitted(build));
- }
- return builds;
- }
-
- private void run(Build2 build) {
- ObjectId commitId = ObjectId.fromString(build.getCommitHash());
- try {
- CISpec ciSpec = build.getProject().getCISpec(commitId);
- if (ciSpec != null) {
- Job job = ciSpec.getJobMap().get(build.getJobName());
- if (job != null) {
- JobExecutor executor = settingManager.getJobExecutor(build.getProject(), commitId, job.getName(), job.getEnvironment());
- if (executor != null) {
- Long projectId = build.getProject().getId();
- Long buildId = build.getId();
- LogLevel loggerLevel = job.getLogLevel();
-
- String jobInstance = executor.run(job.getEnvironment(), job.getCommands(), new JobCallback() {
-
- @Override
- public void jobFinished(JobResult result, String resultMessage) {
- transactionManager.call(new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- Build2 build = buildManager.load(buildId);
- switch (result) {
- case SUCCESSFUL:
- build.setStatus(Build2.Status.SUCCESSFUL, resultMessage);
- break;
- case FAILED:
- build.setStatus(Build2.Status.FAILED, resultMessage);
- break;
- case CANCELLED:
- build.setStatus(Build2.Status.CANCELLED, resultMessage);
- break;
- case IN_ERROR:
- build.setStatus(Build2.Status.IN_ERROR, resultMessage);
- break;
- default:
- throw new OneException("Unexpected job result: " + result);
- }
- buildManager.save(build);
- listenerRegistry.post(new BuildFinished(build));
- return null;
- }
-
- });
- }
-
- @Override
- public JobLogger getJobLogger() {
- return logManager.getLogger(projectId, buildId, loggerLevel);
- }
-
- });
- if (jobInstance != null) {
- build.setStatus(Build2.Status.RUNNING);
- build.setJobInstance(jobInstance);
- build.setRunningDate(new Date());
- buildManager.save(build);
- listenerRegistry.post(new BuildRunning(build));
- }
- } else {
- markBuildError(build, "No applicable job executor");
- }
- } else {
- markBuildError(build, "Job not found");
- }
- } else {
- markBuildError(build, "No CI spec");
- }
- } catch (InvalidCISpecException e) {
- markBuildError(build, e.getMessage());
- }
- }
-
- private void markBuildError(Build2 build, String errorMessage) {
- build.setStatus(Build2.Status.IN_ERROR, errorMessage);
- build.setFinishDate(new Date());
- buildManager.save(build);
- listenerRegistry.post(new BuildFinished(build));
- }
-
- @Sessional
- @Listen
- public void on(ProjectEvent event) {
- if (event instanceof CommitAware) {
- ObjectId commitId = ((CommitAware) event).getCommitId();
- try {
- CISpec ciSpec = event.getProject().getCISpec(commitId);
- if (ciSpec != null) {
- for (Job job: ciSpec.getJobs()) {
- JobTrigger trigger = job.getMatchedTrigger(event);
- if (trigger != null)
- submit(event.getProject(), commitId.name(), job.getName(), getParamMatrix(trigger.getParams()));
- }
- }
- } catch (Exception e) {
- String message = String.format("Error checking job triggers (project: %s, commit: %s)",
- event.getProject().getName(), commitId.name());
- logger.error(message, e);
- }
- }
- }
-
- @Transactional
- @Override
- public void resubmit(Build2 build) {
- for (BuildDependence dependence: build.getDependents())
- resubmit(dependence.getDependent());
-
- if (build.isFinished()) {
- build.setStatus(Build2.Status.WAITING);
- build.setFinishDate(null);
- build.setPendingDate(null);
- build.setJobInstance(null);
- build.setRunningDate(null);
- build.setSubmitDate(new Date());
- build.setUser(userManager.getCurrent());
- buildManager.save(build);
- listenerRegistry.post(new BuildSubmitted(build));
- } else {
- throw new OneException("Build #" + build.getNumber() + " not finished yet");
- }
- }
-
- @Transactional
- @Override
- public void cancel(Build2 build) {
- if (build.getStatus() == Build2.Status.RUNNING) {
- JobExecutor executor = settingManager.getJobExecutor(build.getJobInstance());
- if (executor != null)
- executor.stop(build.getJobInstance());
- else
- markBuildError(build, "Aborted for unknown reason");
- } else if (!build.isFinished()) {
- build.setStatus(Build2.Status.CANCELLED);
- build.setFinishDate(new Date());
- buildManager.save(build);
- listenerRegistry.post(new BuildFinished(build));
- }
- }
-
- @Listen
- public void on(SystemStarted event) {
- status = Status.RUNNING;
- new Thread(this).start();
- }
-
- @Listen
- public void on(SystemStopping event) {
- if (status == Status.RUNNING) {
- status = Status.STOPPING;
- while (status == Status.STOPPING) {
- synchronized (this) {
- notify();
- }
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
- }
- }
- }
-
- @Override
- public synchronized void run() {
- while (true) {
- try {
- wait(CHECK_INTERVAL * 1000L);
- } catch (InterruptedException e) {
- }
- try {
- boolean hasRunnings = transactionManager.call(new Callable<Boolean>() {
-
- @Override
- public Boolean call() {
- boolean hasRunnings = false;
- for (Build2 build: buildManager.queryUnfinished()) {
- if (build.getStatus() == Build2.Status.PENDING) {
- if (status == Status.RUNNING)
- DefaultJobScheduler.this.run(build);
- } else if (build.getStatus() == Build2.Status.RUNNING) {
- hasRunnings = true;
- JobExecutor executor = settingManager.getJobExecutor(build.getJobInstance());
- if (executor != null) {
- ObjectId commitId = ObjectId.fromString(build.getCommitHash());
- try {
- CISpec ciSpec = build.getProject().getCISpec(commitId);
- if (ciSpec != null) {
- Job job = ciSpec.getJobMap().get(build.getJobName());
- if (job != null) {
- if (System.currentTimeMillis() - build.getRunningDate().getTime() > job.getTimeout() * 1000L)
- executor.stop(build.getJobInstance());
- } else {
- markBuildError(build, "Job not found");
- }
- } else {
- markBuildError(build, "No CI spec");
- }
- } catch (InvalidCISpecException e) {
- markBuildError(build, e.getMessage());
- }
- } else {
- markBuildError(build, "Stopped for unknown reason");
- }
- } else if (build.getStatus() == Build2.Status.WAITING) {
- boolean hasUnsuccessful = false;
- boolean hasUnfinished = false;
-
- for (BuildDependence dependence: build.getDependencies()) {
- Build2 dependency = dependence.getDependency();
-
- if (dependency.getStatus() == Build2.Status.SUCCESSFUL)
- continue;
- else if (dependency.isFinished())
- hasUnsuccessful = true;
- else
- hasUnfinished = true;
- }
-
- if (hasUnsuccessful) {
- markBuildError(build, "There are failed dependency jobs");
- } else if (!hasUnfinished) {
- build.setStatus(Build2.Status.PENDING);
- build.setPendingDate(new Date());
- listenerRegistry.post(new BuildPending(build));
- }
- }
- }
- return hasRunnings;
- }
-
- });
- if (!hasRunnings && status == Status.STOPPING)
- break;
- } catch (Exception e) {
- logger.error("Error checking unfinished builds", e);
- }
- }
- status = Status.STOPPED;
- }
-
-}
+package io.onedev.server.ci.job;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.launcher.loader.ListenerRegistry;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.InvalidCISpecException;
+import io.onedev.server.ci.job.log.LogManager;
+import io.onedev.server.ci.job.param.JobParam;
+import io.onedev.server.ci.job.trigger.JobTrigger;
+import io.onedev.server.entitymanager.Build2Manager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.event.CommitAware;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.event.build2.BuildFinished;
+import io.onedev.server.event.build2.BuildPending;
+import io.onedev.server.event.build2.BuildRunning;
+import io.onedev.server.event.build2.BuildSubmitted;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.exception.OneException;
+import io.onedev.server.model.Build2;
+import io.onedev.server.model.BuildDependence;
+import io.onedev.server.model.BuildParam;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.jobexecutor.SourceSnapshot;
+import io.onedev.server.persistence.TransactionManager;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.util.MatrixRunner;
+
+@Singleton
+public class DefaultJobScheduler implements JobScheduler, Runnable {
+
+ private static final int CHECK_INTERVAL = 5;
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultJobScheduler.class);
+
+ private enum Status {RUNNING, STOPPING, STOPPED};
+
+ private final Map<Long, JobExecution> jobExecutions = new ConcurrentHashMap<>();
+
+ private final ProjectManager projectManager;
+
+ private final Build2Manager buildManager;
+
+ private final UserManager userManager;
+
+ private final ListenerRegistry listenerRegistry;
+
+ private final TransactionManager transactionManager;
+
+ private final LogManager logManager;
+
+ private final SettingManager settingManager;
+
+ private final ExecutorService executorService;
+
+ private volatile Status status;
+
+ @Inject
+ public DefaultJobScheduler(ProjectManager projectManager, Build2Manager buildManager,
+ UserManager userManager, ListenerRegistry listenerRegistry, SettingManager settingManager,
+ TransactionManager transactionManager, LogManager logManager, ExecutorService executorService) {
+ this.projectManager = projectManager;
+ this.settingManager = settingManager;
+ this.buildManager = buildManager;
+ this.userManager = userManager;
+ this.listenerRegistry = listenerRegistry;
+ this.transactionManager = transactionManager;
+ this.logManager = logManager;
+ this.executorService = executorService;
+ }
+
+ @Sessional
+ @Override
+ public void submit(Project project, String commitHash, String jobName, Map<String, List<String>> paramMatrix) {
+ String lockKey = "job-schedule: " + project.getId() + "-" + commitHash;
+ Long projectId = project.getId();
+ Long userId = User.idOf(userManager.getCurrent());
+ transactionManager.runAsyncAfterCommit(new Runnable() {
+
+ @Override
+ public void run() {
+ LockUtils.call(lockKey, new Callable<Void>() {
+
+ @Override
+ public Void call() {
+ transactionManager.run(new Runnable() {
+
+ @Override
+ public void run() {
+ Project project = projectManager.load(projectId);
+ User user = (userId != null? userManager.load(userId): null);
+ new MatrixRunner(paramMatrix).run(new MatrixRunner.Runnable() {
+
+ @Override
+ public void run(Map<String, String> params) {
+ submit(project, user, commitHash, jobName, params, new ArrayList<>());
+ }
+
+ });
+ }
+
+ });
+ return null;
+ }
+
+ });
+ }
+
+ });
+ }
+
+ private Map<String, List<String>> getParamMatrix(List<JobParam> params) {
+ Map<String, List<String>> paramMatrix = new LinkedHashMap<>();
+ for (JobParam param: params)
+ paramMatrix.put(param.getName(), param.getValueProvider().getValues());
+ return paramMatrix;
+ }
+
+ private List<Build2> submit(Project project, @Nullable User user, String commitHash, String jobName,
+ Map<String, String> paramMap, List<String> dependencyChain) {
+ List<Build2> builds = buildManager.query(project, commitHash, jobName, paramMap);
+ if (builds.isEmpty()) {
+ Build2 build = new Build2();
+ build.setProject(project);
+ build.setCommitHash(commitHash);
+ build.setJobName(jobName);
+ build.setSubmitDate(new Date());
+ build.setStatus(Build2.Status.WAITING);
+ build.setUser(user);
+
+ builds.add(build);
+
+ for (Map.Entry<String, String> entry: paramMap.entrySet()) {
+ BuildParam param = new BuildParam();
+ param.setBuild(build);
+ param.setName(entry.getKey());
+ param.setValue(entry.getValue());
+ build.getParams().add(param);
+ }
+
+ if (dependencyChain.contains(jobName)) {
+ dependencyChain.add(jobName);
+ markBuildError(build, "Circular job dependencies found: " + dependencyChain);
+ return builds;
+ }
+
+ dependencyChain.add(jobName);
+
+ CISpec ciSpec;
+ try {
+ ciSpec = project.getCISpec(ObjectId.fromString(commitHash));
+ if (ciSpec == null) {
+ markBuildError(build, "No CI spec");
+ return builds;
+ }
+ } catch (InvalidCISpecException e) {
+ markBuildError(build, e.getMessage());
+ return builds;
+ }
+
+ Job job = ciSpec.getJobMap().get(jobName);
+ if (job == null) {
+ markBuildError(build, "Job not found");
+ return builds;
+ }
+
+ for (Dependency dependency: job.getDependencies()) {
+ new MatrixRunner(getParamMatrix(dependency.getParams())).run(new MatrixRunner.Runnable() {
+
+ @Override
+ public void run(Map<String, String> params) {
+ List<Build2> dependencyBuilds = submit(project, null, commitHash, dependency.getJobName(),
+ params, new ArrayList<>(dependencyChain));
+ for (Build2 dependencyBuild: dependencyBuilds) {
+ BuildDependence dependence = new BuildDependence();
+ dependence.setDependency(dependencyBuild);
+ dependence.setDependent(build);
+ build.getDependencies().add(dependence);
+ }
+ }
+
+ });
+ }
+
+ buildManager.create(build);
+ listenerRegistry.post(new BuildSubmitted(build));
+ }
+ return builds;
+ }
+
+ @Nullable
+ private JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image) {
+ for (JobExecutor executor: settingManager.getJobExecutors()) {
+ if (executor.isApplicable(project, commitId, jobName, image))
+ return executor;
+ }
+ return null;
+ }
+
+ private void run(Build2 build) {
+ ObjectId commitId = ObjectId.fromString(build.getCommitHash());
+ try {
+ CISpec ciSpec = build.getProject().getCISpec(commitId);
+ if (ciSpec != null) {
+ Job job = ciSpec.getJobMap().get(build.getJobName());
+ if (job != null) {
+ JobExecutor executor = getJobExecutor(build.getProject(), commitId, job.getName(), job.getEnvironment());
+ if (executor != null) {
+ if (executor.hasCapacity()) {
+ build.setStatus(Build2.Status.RUNNING);
+ build.setRunningDate(new Date());
+ buildManager.save(build);
+ listenerRegistry.post(new BuildRunning(build));
+
+ SourceSnapshot snapshot;
+ if (job.isCloneSource())
+ snapshot = new SourceSnapshot(build.getProject(), commitId);
+ else
+ snapshot = null;
+
+ Logger logger = logManager.getLogger(build.getProject().getId(), build.getId(), job.getLogLevel());
+
+ JobExecution execution = new JobExecution(executorService.submit(new Runnable() {
+
+ @Override
+ public void run() {
+ executor.execute(job.getEnvironment(), job.getCommands(), snapshot, logger);
+ }
+
+ }), job.getTimeout() * 1000L);
+
+ JobExecution prevExecution = jobExecutions.put(build.getId(), execution);
+
+ if (prevExecution != null)
+ prevExecution.getFuture().cancel(true);
+ }
+ } else {
+ markBuildError(build, "No applicable job executor");
+ }
+ } else {
+ markBuildError(build, "Job not found");
+ }
+ } else {
+ markBuildError(build, "No CI spec");
+ }
+ } catch (InvalidCISpecException e) {
+ markBuildError(build, e.getMessage());
+ }
+ }
+
+ private void markBuildError(Build2 build, String errorMessage) {
+ build.setStatus(Build2.Status.IN_ERROR, errorMessage);
+ build.setFinishDate(new Date());
+ listenerRegistry.post(new BuildFinished(build));
+ }
+
+ @Sessional
+ @Listen
+ public void on(ProjectEvent event) {
+ if (event instanceof CommitAware) {
+ ObjectId commitId = ((CommitAware) event).getCommitId();
+ if (!commitId.equals(ObjectId.zeroId())) {
+ try {
+ CISpec ciSpec = event.getProject().getCISpec(commitId);
+ if (ciSpec != null) {
+ for (Job job: ciSpec.getJobs()) {
+ JobTrigger trigger = job.getMatchedTrigger(event);
+ if (trigger != null)
+ submit(event.getProject(), commitId.name(), job.getName(), getParamMatrix(trigger.getParams()));
+ }
+ }
+ } catch (Exception e) {
+ String message = String.format("Error checking job triggers (project: %s, commit: %s)",
+ event.getProject().getName(), commitId.name());
+ logger.error(message, e);
+ }
+ }
+ }
+ }
+
+ @Transactional
+ @Override
+ public void resubmit(Build2 build) {
+ for (BuildDependence dependence: build.getDependents())
+ resubmit(dependence.getDependent());
+
+ if (build.isFinished()) {
+ logManager.clearLogger(build.getProject().getId(), build.getId());
+ build.setStatus(Build2.Status.WAITING);
+ build.setFinishDate(null);
+ build.setPendingDate(null);
+ build.setRunningDate(null);
+ build.setSubmitDate(new Date());
+ build.setUser(userManager.getCurrent());
+ buildManager.save(build);
+ listenerRegistry.post(new BuildSubmitted(build));
+ } else {
+ throw new OneException("Build #" + build.getNumber() + " not finished yet");
+ }
+ }
+
+ @Sessional
+ @Override
+ public void cancel(Build2 build) {
+ JobExecution execution = jobExecutions.get(build.getId());
+ if (execution != null)
+ execution.getFuture().cancel(true);
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ status = Status.RUNNING;
+ new Thread(this).start();
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ if (status == Status.RUNNING) {
+ status = Status.STOPPING;
+ while (status == Status.STOPPING) {
+ synchronized (this) {
+ notify();
+ }
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException e) {
+ }
+ }
+ }
+ }
+
+ @Override
+ public synchronized void run() {
+ while (true) {
+ try {
+ wait(CHECK_INTERVAL * 1000L);
+ } catch (InterruptedException e) {
+ }
+ try {
+ boolean hasRunnings = transactionManager.call(new Callable<Boolean>() {
+
+ @Override
+ public Boolean call() {
+ for (Build2 build: buildManager.queryUnfinished()) {
+ if (build.getStatus() == Build2.Status.PENDING) {
+ if (status == Status.RUNNING)
+ run(build);
+ } else if (build.getStatus() == Build2.Status.RUNNING) {
+ JobExecution execution = jobExecutions.get(build.getId());
+ if (execution != null) {
+ if (System.currentTimeMillis() - build.getRunningDate().getTime() > execution.getTimeout())
+ execution.getFuture().cancel(true);
+ } else {
+ markBuildError(build, "Stopped for unknown reason");
+ }
+ } else if (build.getStatus() == Build2.Status.WAITING) {
+ boolean hasUnsuccessful = false;
+ boolean hasUnfinished = false;
+
+ for (BuildDependence dependence: build.getDependencies()) {
+ Build2 dependency = dependence.getDependency();
+
+ if (dependency.getStatus() == Build2.Status.SUCCESSFUL)
+ continue;
+ else if (dependency.isFinished())
+ hasUnsuccessful = true;
+ else
+ hasUnfinished = true;
+ }
+
+ if (hasUnsuccessful) {
+ markBuildError(build, "There are failed dependency jobs");
+ } else if (!hasUnfinished) {
+ build.setStatus(Build2.Status.PENDING);
+ build.setPendingDate(new Date());
+ listenerRegistry.post(new BuildPending(build));
+ }
+ }
+ }
+ for (Iterator<Map.Entry<Long, JobExecution>> it = jobExecutions.entrySet().iterator(); it.hasNext();) {
+ Map.Entry<Long, JobExecution> entry = it.next();
+ Build2 build = buildManager.get(entry.getKey());
+ JobExecution execution = entry.getValue();
+ if (build == null || build.getStatus() != Build2.Status.RUNNING) {
+ it.remove();
+ execution.getFuture().cancel(true);
+ } else if (execution.getFuture().isDone()) {
+ it.remove();
+ try {
+ execution.getFuture().get();
+ build.setStatus(Build2.Status.SUCCESSFUL);
+ } catch (CancellationException e) {
+ build.setStatus(Build2.Status.CANCELLED);
+ } catch (Exception e) {
+ build.setStatus(Build2.Status.FAILED, e.getMessage());
+ } finally {
+ build.setFinishDate(new Date());
+ listenerRegistry.post(new BuildFinished(build));
+ }
+ }
+ }
+ return !jobExecutions.isEmpty();
+ }
+
+ });
+ if (!hasRunnings && status == Status.STOPPING)
+ break;
+ } catch (Exception e) {
+ logger.error("Error checking unfinished builds", e);
+ }
+ }
+ status = Status.STOPPED;
+ }
+
+ private static class JobExecution {
+
+ private final Future<?> future;
+
+ private final long timeout;
+
+ public JobExecution(Future<?> future, long timeout) {
+ this.future = future;
+ this.timeout = timeout;
+ }
+
+ public Future<?> getFuture() {
+ return future;
+ }
+
+ public long getTimeout() {
+ return timeout;
+ }
+
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/Job.java b/core/src/main/java/io/onedev/server/ci/job/Job.java
index f150e3ecd5..2523db17d9 100644
--- a/core/src/main/java/io/onedev/server/ci/job/Job.java
+++ b/core/src/main/java/io/onedev/server/ci/job/Job.java
@@ -1,166 +1,166 @@
-package io.onedev.server.ci.job;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.validation.constraints.Size;
-
-import org.hibernate.validator.constraints.NotEmpty;
-
-import io.onedev.server.ci.Dependency;
-import io.onedev.server.ci.job.log.LogLevel;
-import io.onedev.server.ci.job.trigger.JobTrigger;
-import io.onedev.server.event.ProjectEvent;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Horizontal;
-import io.onedev.server.web.editable.annotation.Patterns;
-
-@Editable
-@Horizontal
-public class Job implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private String name;
-
- private String environment;
-
- private List<String> commands;
-
- private boolean cloneSource = true;
-
- private boolean retrieveDependencyArtifacts = true;
-
- private String publishArtifacts;
-
- private List<Dependency> dependencies = new ArrayList<>();
-
- private List<InputSpec> promptParams = new ArrayList<>();
-
- private List<JobTrigger> triggers = new ArrayList<>();
-
- private long timeout = 3600;
-
- private LogLevel logLevel = LogLevel.INFO;
-
- @Editable(order=100, description="Specify name of the job")
- @NotEmpty
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- @Editable(order=110, description="Specify the environment to run the command. Environment will be interpretated "
- + "by underlying job executor. For instance, a docker executor will treat it as a docker image, and an "
- + "agent executor will treat it as labels to match agents")
- @NotEmpty
- public String getEnvironment() {
- return environment;
- }
-
- public void setEnvironment(String environment) {
- this.environment = environment;
- }
-
- @Editable(order=120, description="Specify commands to execute in above environment, with one command per line. "
- + "For Windows based environments, commands will be interpretated by PowerShell, and for Unix/Linux "
- + "based environments, commands will be interpretated by shell")
- @Size(min=1, message="At least one command needs to be specified")
- public List<String> getCommands() {
- return commands;
- }
-
- public void setCommands(List<String> commands) {
- this.commands = commands;
- }
-
- @Editable(order=130, description="Whether or not to clone the source code")
- public boolean isCloneSource() {
- return cloneSource;
- }
-
- public void setCloneSource(boolean cloneSource) {
- this.cloneSource = cloneSource;
- }
-
- @Editable(order=140, description="Whether or not to retrieve artifacts of dependency jobs")
- public boolean isRetrieveDependencyArtifacts() {
- return retrieveDependencyArtifacts;
- }
-
- public void setRetrieveDependencyArtifacts(boolean retrieveDependencyArtifacts) {
- this.retrieveDependencyArtifacts = retrieveDependencyArtifacts;
- }
-
- @Editable(order=300, description="Specify parameters to prompt when the job "
- + "is triggered manually")
- public List<InputSpec> getPromptParams() {
- return promptParams;
- }
-
- public void setPromptParams(List<InputSpec> promptParams) {
- this.promptParams = promptParams;
- }
-
- @Editable(name="Dependency Jobs", order=400, description="Job dependencies determines the order and "
- + "concurrency when run different jobs")
- public List<Dependency> getDependencies() {
- return dependencies;
- }
-
- public void setDependencies(List<Dependency> dependencies) {
- this.dependencies = dependencies;
- }
-
- @Editable(order=500, description="Use triggers to run the job automatically under certain conditions")
- public List<JobTrigger> getTriggers() {
- return triggers;
- }
-
- public void setTriggers(List<JobTrigger> triggers) {
- this.triggers = triggers;
- }
-
- @Editable(order=600, description="Optionally specify space-separated workspace files to publish as artifacts. "
- + "Use * or ? for wildcard match")
- @Patterns
- public String getPublishArtifacts() {
- return publishArtifacts;
- }
-
- public void setPublishArtifacts(String publishArtifacts) {
- this.publishArtifacts = publishArtifacts;
- }
-
- @Editable(order=700, description="Specify timeout in seconds")
- public long getTimeout() {
- return timeout;
- }
-
- public void setTimeout(long timeout) {
- this.timeout = timeout;
- }
-
- @Editable(order=800)
- public LogLevel getLogLevel() {
- return logLevel;
- }
-
- public void setLogLevel(LogLevel logLevel) {
- this.logLevel = logLevel;
- }
-
- public JobTrigger getMatchedTrigger(ProjectEvent event) {
- for (JobTrigger trigger: getTriggers()) {
- if (trigger.matches(event, this))
- return trigger;
- }
- return null;
- }
-
-}
+package io.onedev.server.ci.job;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.validation.constraints.Size;
+
+import org.hibernate.validator.constraints.NotEmpty;
+
+import io.onedev.server.ci.Dependency;
+import io.onedev.server.ci.job.log.LogLevel;
+import io.onedev.server.ci.job.trigger.JobTrigger;
+import io.onedev.server.event.ProjectEvent;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.Horizontal;
+import io.onedev.server.web.editable.annotation.Patterns;
+
+@Editable
+@Horizontal
+public class Job implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String name;
+
+ private String environment;
+
+ private List<String> commands;
+
+ private boolean cloneSource = true;
+
+ private boolean retrieveDependencyArtifacts = true;
+
+ private String publishArtifacts;
+
+ private List<Dependency> dependencies = new ArrayList<>();
+
+ private List<InputSpec> promptParams = new ArrayList<>();
+
+ private List<JobTrigger> triggers = new ArrayList<>();
+
+ private long timeout = 3600;
+
+ private LogLevel logLevel = LogLevel.INFO;
+
+ @Editable(order=100, description="Specify name of the job")
+ @NotEmpty
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Editable(order=110, description="Specify the environment to run the command. Environment will be interpretated "
+ + "by underlying job executor. For instance, a docker executor will treat it as a docker image, and an "
+ + "agent executor will treat it as labels to match agents")
+ @NotEmpty
+ public String getEnvironment() {
+ return environment;
+ }
+
+ public void setEnvironment(String environment) {
+ this.environment = environment;
+ }
+
+ @Editable(order=120, description="Specify commands to execute in above environment, with one command per line. "
+ + "For Windows based environments, commands will be interpretated by PowerShell, and for Unix/Linux "
+ + "based environments, commands will be interpretated by shell")
+ @Size(min=1, message="At least one command needs to be specified")
+ public List<String> getCommands() {
+ return commands;
+ }
+
+ public void setCommands(List<String> commands) {
+ this.commands = commands;
+ }
+
+ @Editable(order=130, description="Whether or not to clone the source code")
+ public boolean isCloneSource() {
+ return cloneSource;
+ }
+
+ public void setCloneSource(boolean cloneSource) {
+ this.cloneSource = cloneSource;
+ }
+
+ @Editable(order=140, description="Whether or not to retrieve artifacts of dependency jobs")
+ public boolean isRetrieveDependencyArtifacts() {
+ return retrieveDependencyArtifacts;
+ }
+
+ public void setRetrieveDependencyArtifacts(boolean retrieveDependencyArtifacts) {
+ this.retrieveDependencyArtifacts = retrieveDependencyArtifacts;
+ }
+
+ @Editable(order=300, description="Specify parameters to prompt when the job "
+ + "is triggered manually")
+ public List<InputSpec> getPromptParams() {
+ return promptParams;
+ }
+
+ public void setPromptParams(List<InputSpec> promptParams) {
+ this.promptParams = promptParams;
+ }
+
+ @Editable(name="Dependency Jobs", order=400, description="Job dependencies determines the order and "
+ + "concurrency when run different jobs")
+ public List<Dependency> getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(List<Dependency> dependencies) {
+ this.dependencies = dependencies;
+ }
+
+ @Editable(order=500, description="Use triggers to run the job automatically under certain conditions")
+ public List<JobTrigger> getTriggers() {
+ return triggers;
+ }
+
+ public void setTriggers(List<JobTrigger> triggers) {
+ this.triggers = triggers;
+ }
+
+ @Editable(order=600, description="Optionally specify space-separated workspace files to publish as artifacts. "
+ + "Use * or ? for wildcard match")
+ @Patterns
+ public String getPublishArtifacts() {
+ return publishArtifacts;
+ }
+
+ public void setPublishArtifacts(String publishArtifacts) {
+ this.publishArtifacts = publishArtifacts;
+ }
+
+ @Editable(order=700, description="Specify timeout in seconds")
+ public long getTimeout() {
+ return timeout;
+ }
+
+ public void setTimeout(long timeout) {
+ this.timeout = timeout;
+ }
+
+ @Editable(order=800)
+ public LogLevel getLogLevel() {
+ return logLevel;
+ }
+
+ public void setLogLevel(LogLevel logLevel) {
+ this.logLevel = logLevel;
+ }
+
+ public JobTrigger getMatchedTrigger(ProjectEvent event) {
+ for (JobTrigger trigger: getTriggers()) {
+ if (trigger.matches(event, this))
+ return trigger;
+ }
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/JobCallback.java b/core/src/main/java/io/onedev/server/ci/job/JobCallback.java
deleted file mode 100644
index dbb9ddd59d..0000000000
--- a/core/src/main/java/io/onedev/server/ci/job/JobCallback.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.ci.job;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.ci.job.log.JobLogger;
-
-public interface JobCallback {
-
- void jobFinished(JobResult result, @Nullable String resultMessage);
-
- JobLogger getJobLogger();
-
-}
diff --git a/core/src/main/java/io/onedev/server/ci/job/JobResult.java b/core/src/main/java/io/onedev/server/ci/job/JobResult.java
deleted file mode 100644
index 57303fcd60..0000000000
--- a/core/src/main/java/io/onedev/server/ci/job/JobResult.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package io.onedev.server.ci.job;
-
-public enum JobResult {SUCCESSFUL, FAILED, CANCELLED, IN_ERROR}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
index de15f257bf..1fcf6ebd2a 100644
--- a/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
+++ b/core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java
@@ -1,373 +1,396 @@
-package io.onedev.server.ci.job.log;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.EOFException;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.Lock;
-import java.util.regex.Pattern;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.joda.time.format.DateTimeFormat;
-import org.joda.time.format.DateTimeFormatter;
-
-import com.google.common.base.Charsets;
-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.server.event.build2.BuildFinished;
-import io.onedev.server.model.Build2;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.storage.StorageManager;
-import io.onedev.server.web.websocket.WebSocketManager;
-
-@Singleton
-public class DefaultLogManager implements LogManager {
-
- private static final int MIN_CACHE_ENTRIES = 5000;
-
- private static final int MAX_CACHE_ENTRIES = 10000;
-
- private static final String LOG_FILE = "build.log";
-
- private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern("HH:mm:ss");
-
- private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
-
- private final StorageManager storageManager;
-
- private final WebSocketManager webSocketManager;
-
- private final Map<Long, LogSnippet> recentSnippets = new ConcurrentHashMap<>();
-
- @Inject
- public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager) {
- this.storageManager = storageManager;
- this.webSocketManager = webSocketManager;
- }
-
- private File getLogFile(Long projectId, Long buildId) {
- File buildDir = storageManager.getBuildDir(projectId, buildId);
- return new File(buildDir, LOG_FILE);
- }
-
- @Sessional
- @Override
- public JobLogger getLogger(Long projectId, Long buildId, LogLevel loggerLevel) {
- return new JobLogger() {
-
- @Override
- public void log(LogLevel logLevel, String message) {
- if (logLevel.ordinal() <= loggerLevel.ordinal()) {
- Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();
- lock.lock();
- try {
- LogSnippet snippet = recentSnippets.get(buildId);
- File logFile = getLogFile(projectId, buildId);
- if (snippet == null) {
- snippet = new LogSnippet();
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- while (true) {
- ois.readObject();
- snippet.offset++;
- }
- } catch (EOFException e) {
- } catch (IOException | ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- recentSnippets.put(buildId, snippet);
- }
- snippet.entries.add(new LogEntry(new Date(), logLevel, message));
- if (snippet.entries.size() > MAX_CACHE_ENTRIES) {
- try (ObjectOutputStream oos = newOutputStream(logFile)) {
- while (snippet.entries.size() > MIN_CACHE_ENTRIES) {
- LogEntry entry = snippet.entries.remove(0);
- oos.writeObject(entry);
- snippet.offset++;
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- webSocketManager.notifyObservableChange(Build2.getLogWebSocketObservable(buildId), null);
- } finally {
- lock.unlock();
- }
- }
- }
-
- @Override
- public LogLevel getLogLevel() {
- return loggerLevel;
- }
-
- };
- }
-
- private String getLockKey(Long buildId) {
- return "build-log: " + buildId;
- }
-
- private List<LogEntry> readLogEntries(File logFile, int from, int count) {
- List<LogEntry> entries = new ArrayList<>();
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- int numOfReadEntries = 0;
- while (numOfReadEntries < from) {
- ois.readObject();
- numOfReadEntries++;
- }
- while (count == 0 || numOfReadEntries - from < count) {
- entries.add((LogEntry) ois.readObject());
- numOfReadEntries++;
- }
- } catch (EOFException e) {
- } catch (IOException | ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- return entries;
- }
-
- private LogSnippet readLogSnippetReversely(File logFile, int count) {
- LogSnippet snippet = new LogSnippet();
- if (logFile.exists()) {
- try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
- while (true) {
- snippet.entries.add((LogEntry) ois.readObject());
- if (snippet.entries.size() > count) {
- snippet.entries.remove(0);
- snippet.offset ++;
- }
- }
- } catch (EOFException e) {
- } catch (IOException | ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- }
- return snippet;
- }
-
- private List<LogEntry> readLogEntries(List<LogEntry> cachedEntries, int from, int count) {
- if (from < cachedEntries.size()) {
- int to = from + count;
- if (to == from || to > cachedEntries.size())
- to = cachedEntries.size();
- return new ArrayList<>(cachedEntries.subList(from, to));
- } else {
- return new ArrayList<>();
- }
- }
-
- @Sessional
- @Override
- public List<LogEntry> readLogEntries(Build2 build, int from, int count) {
- Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
- lock.lock();
- try {
- File logFile = getLogFile(build.getProject().getId(), build.getId());
- LogSnippet snippet = recentSnippets.get(build.getId());
- if (snippet != null) {
- if (from >= snippet.offset) {
- return readLogEntries(snippet.entries, from - snippet.offset, count);
- } else {
- List<LogEntry> entries = new ArrayList<>();
- entries.addAll(readLogEntries(logFile, from, count));
- if (count == 0)
- entries.addAll(snippet.entries);
- else if (entries.size() < count)
- entries.addAll(readLogEntries(snippet.entries, 0, count - entries.size()));
- return entries;
- }
- } else {
- return readLogEntries(logFile, from, count);
- }
- } finally {
- lock.unlock();
- }
- }
-
- @Sessional
- @Override
- public LogSnippet readLogSnippetReversely(Build2 build, int count) {
- Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
- lock.lock();
- try {
- File logFile = getLogFile(build.getProject().getId(), build.getId());
- LogSnippet recentSnippet = recentSnippets.get(build.getId());
- if (recentSnippet != null) {
- LogSnippet snippet = new LogSnippet();
- if (count <= recentSnippet.entries.size()) {
- snippet.entries.addAll(recentSnippet.entries.subList(
- recentSnippet.entries.size()-count, recentSnippet.entries.size()));
- } else {
- snippet.entries.addAll(recentSnippet.entries);
- snippet.entries.addAll(readLogSnippetReversely(logFile, count - recentSnippet.entries.size()).entries);
- }
- snippet.offset = recentSnippet.entries.size() + recentSnippet.offset - snippet.entries.size();
- return snippet;
- } else {
- return readLogSnippetReversely(logFile, count);
- }
- } finally {
- lock.unlock();
- }
- }
-
- private ObjectOutputStream newOutputStream(File logFile) {
- try {
- if (logFile.exists()) {
- return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile, true))) {
-
- @Override
- protected void writeStreamHeader() throws IOException {
- reset();
- }
-
- };
- } else {
- return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile)));
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Sessional
- @Listen
- public void on(BuildFinished event) {
- Build2 build = event.getBuild();
- Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).writeLock();
- lock.lock();
- try {
- LogSnippet snippet = recentSnippets.remove(build.getId());
- if (snippet != null) {
- File logFile = getLogFile(build.getProject().getId(), build.getId());
- try (ObjectOutputStream oos = newOutputStream(logFile)) {
- for (LogEntry entry: snippet.entries)
- oos.writeObject(entry);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- } finally {
- lock.unlock();
- }
- }
-
- @Override
- public InputStream openLogStream(Build2 build) {
- return new LogStream(build);
- }
-
- class LogStream extends InputStream {
-
- private ObjectInputStream ois;
-
- private final Lock lock;
-
- private byte[] buffer = new byte[0];
-
- private byte[] recentBuffer;
-
- private int pos = 0;
-
- public LogStream(Build2 build) {
- lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
- lock.lock();
- try {
- File logFile = getLogFile(build.getProject().getId(), build.getId());
-
- if (logFile.exists())
- ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)));
-
- LogSnippet snippet = recentSnippets.get(build.getId());
- if (snippet != null) {
- StringBuilder builder = new StringBuilder();
- for (LogEntry entry: snippet.entries)
- builder.append(renderAsText(entry) + "\n");
- recentBuffer = builder.toString().getBytes(Charsets.UTF_8);
- }
- } catch (Exception e) {
- lock.unlock();
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- private String renderAsText(LogEntry entry) {
- String prefix = DATE_FORMATTER.print(new DateTime(entry.getDate())) + " "
- + StringUtils.leftPad(entry.getLevel().name(), 5) + " ";
- StringBuilder builder = new StringBuilder();
- for (String line: Splitter.on(EOL_PATTERN).split(entry.getMessage())) {
- if (builder.length() == 0) {
- builder.append(prefix).append(line);
- } else {
- builder.append("\n");
- for (int i=0; i<prefix.length(); i++)
- builder.append(" ");
- builder.append(line);
- }
- }
- return builder.toString();
- }
-
- @Override
- public int read() throws IOException {
- if (pos == buffer.length) {
- if (ois != null) {
- try {
- buffer = (renderAsText((LogEntry) ois.readObject()) + "\n").getBytes(Charsets.UTF_8);
- } catch (EOFException e) {
- IOUtils.closeQuietly(ois);
- ois = null;
- if (recentBuffer != null) {
- buffer = recentBuffer;
- recentBuffer = null;
- } else {
- return -1;
- }
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
- } else if (recentBuffer != null) {
- buffer = recentBuffer;
- recentBuffer = null;
- } else {
- return -1;
- }
- pos = 1;
- return buffer[0];
- } else {
- return buffer[pos++];
- }
- }
-
- @Override
- public void close() throws IOException {
- IOUtils.closeQuietly(ois);
- lock.unlock();
- }
-
- }
-}
+package io.onedev.server.ci.job.log;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.EOFException;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.locks.Lock;
+import java.util.regex.Pattern;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Charsets;
+import com.google.common.base.Splitter;
+import com.google.common.base.Throwables;
+
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.server.event.build2.BuildFinished;
+import io.onedev.server.model.Build2;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.storage.StorageManager;
+import io.onedev.server.web.websocket.WebSocketManager;
+
+@Singleton
+public class DefaultLogManager implements LogManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultLogManager.class);
+
+ private static final int MIN_CACHE_ENTRIES = 5000;
+
+ private static final int MAX_CACHE_ENTRIES = 10000;
+
+ private static final String LOG_FILE = "build.log";
+
+ private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormat.forPattern("HH:mm:ss");
+
+ private static final Pattern EOL_PATTERN = Pattern.compile("\r?\n");
+
+ private final StorageManager storageManager;
+
+ private final WebSocketManager webSocketManager;
+
+ private final Map<Long, LogSnippet> recentSnippets = new ConcurrentHashMap<>();
+
+ @Inject
+ public DefaultLogManager(StorageManager storageManager, WebSocketManager webSocketManager) {
+ this.storageManager = storageManager;
+ this.webSocketManager = webSocketManager;
+ }
+
+ private File getLogFile(Long projectId, Long buildId) {
+ File buildDir = storageManager.getBuildDir(projectId, buildId);
+ return new File(buildDir, LOG_FILE);
+ }
+
+ @Override
+ public void clearLogger(Long projectId, Long buildId) {
+ Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();
+ lock.lock();
+ try {
+ FileUtils.deleteFile(getLogFile(projectId, buildId));
+ recentSnippets.remove(buildId);
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Override
+ public Logger getLogger(Long projectId, Long buildId, LogLevel loggerLevel) {
+ return new JobLogger(loggerLevel) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void log(LogLevel logLevel, String message, Throwable throwable) {
+ try {
+ if (throwable != null) {
+ for (String line: Splitter.on(EOL_PATTERN).split(Throwables.getStackTraceAsString(throwable)))
+ message += "\n " + line;
+ }
+
+ if (logLevel.ordinal() <= loggerLevel.ordinal()) {
+ Lock lock = LockUtils.getReadWriteLock(getLockKey(buildId)).writeLock();
+ lock.lock();
+ try {
+ LogSnippet snippet = recentSnippets.get(buildId);
+ File logFile = getLogFile(projectId, buildId);
+ if (snippet == null) {
+ snippet = new LogSnippet();
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ while (true) {
+ ois.readObject();
+ snippet.offset++;
+ }
+ } catch (EOFException e) {
+ } catch (IOException | ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ recentSnippets.put(buildId, snippet);
+ }
+ snippet.entries.add(new LogEntry(new Date(), logLevel, message));
+ if (snippet.entries.size() > MAX_CACHE_ENTRIES) {
+ try (ObjectOutputStream oos = newOutputStream(logFile)) {
+ while (snippet.entries.size() > MIN_CACHE_ENTRIES) {
+ LogEntry entry = snippet.entries.remove(0);
+ oos.writeObject(entry);
+ snippet.offset++;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ webSocketManager.notifyObservableChange(Build2.getLogWebSocketObservable(buildId), null);
+ } finally {
+ lock.unlock();
+ }
+ }
+ } catch (Exception e) {
+ logger.error("Error logging", e);
+ }
+ }
+
+ };
+ }
+
+ private String getLockKey(Long buildId) {
+ return "build-log: " + buildId;
+ }
+
+ private List<LogEntry> readLogEntries(File logFile, int from, int count) {
+ List<LogEntry> entries = new ArrayList<>();
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ int numOfReadEntries = 0;
+ while (numOfReadEntries < from) {
+ ois.readObject();
+ numOfReadEntries++;
+ }
+ while (count == 0 || numOfReadEntries - from < count) {
+ entries.add((LogEntry) ois.readObject());
+ numOfReadEntries++;
+ }
+ } catch (EOFException e) {
+ } catch (IOException | ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return entries;
+ }
+
+ private LogSnippet readLogSnippetReversely(File logFile, int count) {
+ LogSnippet snippet = new LogSnippet();
+ if (logFile.exists()) {
+ try (ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)))) {
+ while (true) {
+ snippet.entries.add((LogEntry) ois.readObject());
+ if (snippet.entries.size() > count) {
+ snippet.entries.remove(0);
+ snippet.offset ++;
+ }
+ }
+ } catch (EOFException e) {
+ } catch (IOException | ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ return snippet;
+ }
+
+ private List<LogEntry> readLogEntries(List<LogEntry> cachedEntries, int from, int count) {
+ if (from < cachedEntries.size()) {
+ int to = from + count;
+ if (to == from || to > cachedEntries.size())
+ to = cachedEntries.size();
+ return new ArrayList<>(cachedEntries.subList(from, to));
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ @Sessional
+ @Override
+ public List<LogEntry> readLogEntries(Build2 build, int from, int count) {
+ Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
+ lock.lock();
+ try {
+ File logFile = getLogFile(build.getProject().getId(), build.getId());
+ LogSnippet snippet = recentSnippets.get(build.getId());
+ if (snippet != null) {
+ if (from >= snippet.offset) {
+ return readLogEntries(snippet.entries, from - snippet.offset, count);
+ } else {
+ List<LogEntry> entries = new ArrayList<>();
+ entries.addAll(readLogEntries(logFile, from, count));
+ if (count == 0)
+ entries.addAll(snippet.entries);
+ else if (entries.size() < count)
+ entries.addAll(readLogEntries(snippet.entries, 0, count - entries.size()));
+ return entries;
+ }
+ } else {
+ return readLogEntries(logFile, from, count);
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Sessional
+ @Override
+ public LogSnippet readLogSnippetReversely(Build2 build, int count) {
+ Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
+ lock.lock();
+ try {
+ File logFile = getLogFile(build.getProject().getId(), build.getId());
+ LogSnippet recentSnippet = recentSnippets.get(build.getId());
+ if (recentSnippet != null) {
+ LogSnippet snippet = new LogSnippet();
+ if (count <= recentSnippet.entries.size()) {
+ snippet.entries.addAll(recentSnippet.entries.subList(
+ recentSnippet.entries.size()-count, recentSnippet.entries.size()));
+ } else {
+ snippet.entries.addAll(recentSnippet.entries);
+ snippet.entries.addAll(readLogSnippetReversely(logFile, count - recentSnippet.entries.size()).entries);
+ }
+ snippet.offset = recentSnippet.entries.size() + recentSnippet.offset - snippet.entries.size();
+ return snippet;
+ } else {
+ return readLogSnippetReversely(logFile, count);
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ private ObjectOutputStream newOutputStream(File logFile) {
+ try {
+ if (logFile.exists()) {
+ return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile, true))) {
+
+ @Override
+ protected void writeStreamHeader() throws IOException {
+ reset();
+ }
+
+ };
+ } else {
+ return new ObjectOutputStream(new BufferedOutputStream(new FileOutputStream(logFile)));
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Sessional
+ @Listen
+ public void on(BuildFinished event) {
+ Build2 build = event.getBuild();
+ Lock lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).writeLock();
+ lock.lock();
+ try {
+ LogSnippet snippet = recentSnippets.remove(build.getId());
+ if (snippet != null) {
+ File logFile = getLogFile(build.getProject().getId(), build.getId());
+ try (ObjectOutputStream oos = newOutputStream(logFile)) {
+ for (LogEntry entry: snippet.entries)
+ oos.writeObject(entry);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ } finally {
+ lock.unlock();
+ }
+ }
+
+ @Override
+ public InputStream openLogStream(Build2 build) {
+ return new LogStream(build);
+ }
+
+ class LogStream extends InputStream {
+
+ private ObjectInputStream ois;
+
+ private final Lock lock;
+
+ private byte[] buffer = new byte[0];
+
+ private byte[] recentBuffer;
+
+ private int pos = 0;
+
+ public LogStream(Build2 build) {
+ lock = LockUtils.getReadWriteLock(getLockKey(build.getId())).readLock();
+ lock.lock();
+ try {
+ File logFile = getLogFile(build.getProject().getId(), build.getId());
+
+ if (logFile.exists())
+ ois = new ObjectInputStream(new BufferedInputStream(new FileInputStream(logFile)));
+
+ LogSnippet snippet = recentSnippets.get(build.getId());
+ if (snippet != null) {
+ StringBuilder builder = new StringBuilder();
+ for (LogEntry entry: snippet.entries)
+ builder.append(renderAsText(entry) + "\n");
+ recentBuffer = builder.toString().getBytes(Charsets.UTF_8);
+ }
+ } catch (Exception e) {
+ lock.unlock();
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ private String renderAsText(LogEntry entry) {
+ String prefix = DATE_FORMATTER.print(new DateTime(entry.getDate())) + " "
+ + StringUtils.leftPad(entry.getLevel().name(), 5) + " ";
+ StringBuilder builder = new StringBuilder();
+ for (String line: Splitter.on(EOL_PATTERN).split(entry.getMessage())) {
+ if (builder.length() == 0) {
+ builder.append(prefix).append(line);
+ } else {
+ builder.append("\n");
+ for (int i=0; i<prefix.length(); i++)
+ builder.append(" ");
+ builder.append(line);
+ }
+ }
+ return builder.toString();
+ }
+
+ @Override
+ public int read() throws IOException {
+ if (pos == buffer.length) {
+ if (ois != null) {
+ try {
+ buffer = (renderAsText((LogEntry) ois.readObject()) + "\n").getBytes(Charsets.UTF_8);
+ } catch (EOFException e) {
+ IOUtils.closeQuietly(ois);
+ ois = null;
+ if (recentBuffer != null) {
+ buffer = recentBuffer;
+ recentBuffer = null;
+ } else {
+ return -1;
+ }
+ } catch (ClassNotFoundException e) {
+ throw new RuntimeException(e);
+ }
+ } else if (recentBuffer != null) {
+ buffer = recentBuffer;
+ recentBuffer = null;
+ } else {
+ return -1;
+ }
+ pos = 1;
+ return buffer[0];
+ } else {
+ return buffer[pos++];
+ }
+ }
+
+ @Override
+ public void close() throws IOException {
+ IOUtils.closeQuietly(ois);
+ lock.unlock();
+ }
+
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java b/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java
index 6dedfd0114..0a54d69990 100644
--- a/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java
+++ b/core/src/main/java/io/onedev/server/ci/job/log/JobLogger.java
@@ -1,49 +1,231 @@
-package io.onedev.server.ci.job.log;
-
-public abstract class JobLogger {
-
- public void trace(String message) {
- log(LogLevel.TRACE, message);
- }
-
- public void debug(String message) {
- log(LogLevel.DEBUG, message);
- }
-
- public void info(String message) {
- log(LogLevel.INFO, message);
- }
-
- public void warn(String message) {
- log(LogLevel.WARN, message);
- }
-
- public void error(String message) {
- log(LogLevel.ERROR, message);
- }
-
- public boolean isTraceEnabled() {
- return getLogLevel().ordinal() >= LogLevel.TRACE.ordinal();
- }
-
- public boolean isDebugEnabled() {
- return getLogLevel().ordinal() >= LogLevel.DEBUG.ordinal();
- }
-
- public boolean isInfoEnabled() {
- return getLogLevel().ordinal() >= LogLevel.INFO.ordinal();
- }
-
- public boolean isWarnEnabled() {
- return getLogLevel().ordinal() >= LogLevel.WARN.ordinal();
- }
-
- public boolean isErrorEnabled() {
- return getLogLevel().ordinal() >= LogLevel.ERROR.ordinal();
- }
-
- public abstract void log(LogLevel logLevel, String message);
-
- public abstract LogLevel getLogLevel();
-
-}
+package io.onedev.server.ci.job.log;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+import org.slf4j.helpers.MarkerIgnoringBase;
+import org.slf4j.helpers.MessageFormatter;
+
+public abstract class JobLogger extends MarkerIgnoringBase implements Logger {
+
+ private static final long serialVersionUID = 1L;
+
+ private final LogLevel logLevel;
+
+ public JobLogger(LogLevel logLevel) {
+ this.logLevel = logLevel;
+ }
+
+ @Override
+ public String getName() {
+ return "Job Logger";
+ }
+
+ @Override
+ public boolean isTraceEnabled() {
+ return logLevel.compareTo(LogLevel.TRACE) >= 0;
+ }
+
+ @Override
+ public void trace(String msg) {
+ if (isTraceEnabled())
+ log(LogLevel.TRACE, msg, null);
+ }
+
+ @Override
+ public void trace(String format, Object arg) {
+ if (isTraceEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg).getMessage();
+ log(LogLevel.TRACE, msgStr, null);
+ }
+ }
+
+ @Override
+ public void trace(String format, Object arg1, Object arg2) {
+ if (isTraceEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg1, arg2).getMessage();
+ log(LogLevel.TRACE, msgStr, null);
+ }
+ }
+
+ @Override
+ public void trace(String msg, Throwable t) {
+ if (isTraceEnabled())
+ log(LogLevel.TRACE, msg, t);
+ }
+
+ @Override
+ public boolean isDebugEnabled() {
+ return logLevel.compareTo(LogLevel.DEBUG) >= 0;
+ }
+
+ @Override
+ public void debug(String msg) {
+ if (isDebugEnabled())
+ log(LogLevel.DEBUG, msg, null);
+ }
+
+ @Override
+ public void debug(String format, Object arg) {
+ if (isDebugEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg).getMessage();
+ log(LogLevel.DEBUG, msgStr, null);
+ }
+ }
+
+ @Override
+ public void debug(String format, Object arg1, Object arg2) {
+ if (isDebugEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg1, arg2).getMessage();
+ log(LogLevel.DEBUG, msgStr, null);
+ }
+ }
+
+ @Override
+ public void debug(String msg, Throwable t) {
+ if (isDebugEnabled())
+ log(LogLevel.DEBUG, msg, t);
+ }
+
+ @Override
+ public boolean isInfoEnabled() {
+ return logLevel.compareTo(LogLevel.INFO) >= 0;
+ }
+
+ @Override
+ public void info(String msg) {
+ if (isInfoEnabled())
+ log(LogLevel.INFO, msg, null);
+ }
+
+ @Override
+ public void info(String format, Object arg) {
+ if (isInfoEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg).getMessage();
+ log(LogLevel.INFO, msgStr, null);
+ }
+ }
+
+ @Override
+ public void info(String format, Object arg1, Object arg2) {
+ if (isInfoEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg1, arg2).getMessage();
+ log(LogLevel.INFO, msgStr, null);
+ }
+ }
+
+ @Override
+ public void info(String msg, Throwable t) {
+ if (isInfoEnabled())
+ log(LogLevel.INFO, msg, t);
+ }
+
+ @Override
+ public boolean isWarnEnabled() {
+ return logLevel.compareTo(LogLevel.WARN) >= 0;
+ }
+
+ @Override
+ public void warn(String msg) {
+ if (isWarnEnabled())
+ log(LogLevel.WARN, msg, null);
+ }
+
+ @Override
+ public void warn(String format, Object arg) {
+ if (isWarnEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg).getMessage();
+ log(LogLevel.WARN, msgStr, null);
+ }
+ }
+
+ @Override
+ public void warn(String format, Object arg1, Object arg2) {
+ if (isWarnEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg1, arg2).getMessage();
+ log(LogLevel.WARN, msgStr, null);
+ }
+ }
+
+ @Override
+ public void warn(String msg, Throwable t) {
+ if (isWarnEnabled())
+ log(LogLevel.WARN, msg, t);
+ }
+
+ @Override
+ public boolean isErrorEnabled() {
+ return logLevel.compareTo(LogLevel.ERROR) >= 0;
+ }
+
+ @Override
+ public void error(String msg) {
+ if (isErrorEnabled())
+ log(LogLevel.ERROR, msg, null);
+ }
+
+ @Override
+ public void error(String format, Object arg) {
+ if (isErrorEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg).getMessage();
+ log(LogLevel.ERROR, msgStr, null);
+ }
+ }
+
+ @Override
+ public void error(String format, Object arg1, Object arg2) {
+ if (isErrorEnabled()) {
+ String msgStr = MessageFormatter.format(format, arg1, arg2).getMessage();
+ log(LogLevel.ERROR, msgStr, null);
+ }
+ }
+
+ @Override
+ public void error(String msg, Throwable t) {
+ if (isErrorEnabled())
+ log(LogLevel.ERROR, msg, t);
+ }
+
+ @Override
+ public void debug(String arg0, Object... arg1) {
+ if (isDebugEnabled()) {
+ String msgStr = MessageFormatter.arrayFormat(arg0, arg1).getMessage();
+ log(LogLevel.DEBUG, msgStr, null);
+ }
+ }
+
+ @Override
+ public void error(String arg0, Object... arg1) {
+ if (isErrorEnabled()) {
+ String msgStr = MessageFormatter.arrayFormat(arg0, arg1).getMessage();
+ log(LogLevel.ERROR, msgStr, null);
+ }
+ }
+
+ @Override
+ public void info(String arg0, Object... arg1) {
+ if (isInfoEnabled()) {
+ String msgStr = MessageFormatter.arrayFormat(arg0, arg1).getMessage();
+ log(LogLevel.INFO, msgStr, null);
+ }
+ }
+
+ @Override
+ public void trace(String arg0, Object... arg1) {
+ if (isTraceEnabled()) {
+ String msgStr = MessageFormatter.arrayFormat(arg0, arg1).getMessage();
+ log(LogLevel.TRACE, msgStr, null);
+ }
+ }
+
+ @Override
+ public void warn(String arg0, Object... arg1) {
+ if (isWarnEnabled()) {
+ String msgStr = MessageFormatter.arrayFormat(arg0, arg1).getMessage();
+ log(LogLevel.WARN, msgStr, null);
+ }
+ }
+
+ protected abstract void log(LogLevel logLevel, String message, @Nullable Throwable throwable);
+
+}
diff --git a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java
index f2b91e0428..1c171dd3ac 100644
--- a/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java
+++ b/core/src/main/java/io/onedev/server/ci/job/log/LogManager.java
@@ -1,43 +1,47 @@
-package io.onedev.server.ci.job.log;
-
-import java.io.InputStream;
-import java.util.List;
-
-import io.onedev.server.model.Build2;
-
-public interface LogManager {
-
- JobLogger getLogger(Long projectId, Long buildId, LogLevel logLevel);
-
- /**
- * Read specified number of log entries from specified build, starting from specified index
- *
- * @param build
- * build to read log entries from
- * @param offset
- * index of the log entry to start read
- * @param count
- * number of log entries to read. Specifically use <tt>0</tt> to read all entries
- * since offset
- * @return
- * log entries. Number of entries may be less than required count if there is no
- * enough log entries
- */
- List<LogEntry> readLogEntries(Build2 build, int offset, int count);
-
- /**
- * Read specified number of log entries starting from end of the log
- *
- * @param build
- * build to read log entries from
- * @param count
- * number of log entries to read
- * @return
- * log entries with normal order. Number of entries may be less than required count
- * if there is no enough log entries
- */
- LogSnippet readLogSnippetReversely(Build2 build, int count);
-
- InputStream openLogStream(Build2 build);
-
-}
+package io.onedev.server.ci.job.log;
+
+import java.io.InputStream;
+import java.util.List;
+
+import org.slf4j.Logger;
+
+import io.onedev.server.model.Build2;
+
+public interface LogManager {
+
+ void clearLogger(Long projectId, Long buildId);
+
+ Logger getLogger(Long projectId, Long buildId, LogLevel logLevel);
+
+ /**
+ * Read specified number of log entries from specified build, starting from specified index
+ *
+ * @param build
+ * build to read log entries from
+ * @param offset
+ * index of the log entry to start read
+ * @param count
+ * number of log entries to read. Specifically use <tt>0</tt> to read all entries
+ * since offset
+ * @return
+ * log entries. Number of entries may be less than required count if there is no
+ * enough log entries
+ */
+ List<LogEntry> readLogEntries(Build2 build, int offset, int count);
+
+ /**
+ * Read specified number of log entries starting from end of the log
+ *
+ * @param build
+ * build to read log entries from
+ * @param count
+ * number of log entries to read
+ * @return
+ * log entries with normal order. Number of entries may be less than required count
+ * if there is no enough log entries
+ */
+ LogSnippet readLogSnippetReversely(Build2 build, int count);
+
+ InputStream openLogStream(Build2 build);
+
+}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
index e9600de10a..3f1db85f3d 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/SettingManager.java
@@ -1,116 +1,108 @@
-package io.onedev.server.entitymanager;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jgit.lib.ObjectId;
-
-import io.onedev.server.model.Project;
-import io.onedev.server.model.Setting;
-import io.onedev.server.model.support.authenticator.Authenticator;
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.model.support.setting.BackupSetting;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.model.support.setting.MailSetting;
-import io.onedev.server.model.support.setting.SecuritySetting;
-import io.onedev.server.model.support.setting.SystemSetting;
-import io.onedev.server.persistence.dao.EntityManager;
-
-public interface SettingManager extends EntityManager<Setting> {
-
- /**
- * Retrieve setting by key.
- * <p>
- * @param key
- * key of the setting
- * @return
- * setting associated with specified key, or <tt>null</tt> if
- * no setting record found for the key
- */
- Setting getSetting(Setting.Key key);
-
- /**
- * Get system setting.
- * <p>
- * @return
- * system setting, never <tt>null</tt>
- * @throws
- * RuntimeException if system setting record is not found
- * @throws
- * NullPointerException if system setting record exists but value is null
- */
- SystemSetting getSystemSetting();
-
- /**
- * Save specified system setting.
- * <p>
- * @param systemSetting
- * system setting to be saved
- */
- void saveSystemSetting(SystemSetting systemSetting);
-
- /**
- * Get mail setting.
- * <p>
- * @return
- * mail setting, or <tt>null</tt> if mail setting record exists but value is
- * null.
- * @throws
- * RuntimeException if mail setting record is not found
- */
- @Nullable
- MailSetting getMailSetting();
-
- /**
- * Save specified mail setting.
- * <p>
- * @param mailSetting
- * mail setting to be saved. Use <tt>null</tt> to clear the setting (but
- * setting record will still be remained in database)
- */
- void saveMailSetting(@Nullable MailSetting mailSetting);
-
- /**
- * Get backup setting.
- * <p>
- * @return
- * backup setting, or <tt>null</tt> if backup setting record exists but value is null
- * @throws
- * RuntimeException if backup setting record is not found
- */
- @Nullable
- BackupSetting getBackupSetting();
-
- /**
- * Save specified backup setting.
- * <p>
- * @param backupSetting
- * backup setting to be saved. Use <tt>null</tt> to clear the setting (but
- * setting record will still be remained in database)
- */
- void saveBackupSetting(@Nullable BackupSetting backupSetting);
-
- SecuritySetting getSecuritySetting();
-
- void saveSecuritySetting(SecuritySetting securitySetting);
-
- GlobalIssueSetting getIssueSetting();
-
- void saveIssueSetting(GlobalIssueSetting issueSetting);
-
- @Nullable
- Authenticator getAuthenticator();
-
- void saveAuthenticator(@Nullable Authenticator authenticator);
-
- List<JobExecutor> getJobExecutors();
-
- void saveJobExecutors(List<JobExecutor> jobExecutors);
-
- @Nullable
- JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image);
-
- @Nullable
- JobExecutor getJobExecutor(String runningInstance);
-}
+package io.onedev.server.entitymanager;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.setting.BackupSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.model.support.setting.MailSetting;
+import io.onedev.server.model.support.setting.SecuritySetting;
+import io.onedev.server.model.support.setting.SystemSetting;
+import io.onedev.server.persistence.dao.EntityManager;
+
+public interface SettingManager extends EntityManager<Setting> {
+
+ /**
+ * Retrieve setting by key.
+ * <p>
+ * @param key
+ * key of the setting
+ * @return
+ * setting associated with specified key, or <tt>null</tt> if
+ * no setting record found for the key
+ */
+ Setting getSetting(Setting.Key key);
+
+ /**
+ * Get system setting.
+ * <p>
+ * @return
+ * system setting, never <tt>null</tt>
+ * @throws
+ * RuntimeException if system setting record is not found
+ * @throws
+ * NullPointerException if system setting record exists but value is null
+ */
+ SystemSetting getSystemSetting();
+
+ /**
+ * Save specified system setting.
+ * <p>
+ * @param systemSetting
+ * system setting to be saved
+ */
+ void saveSystemSetting(SystemSetting systemSetting);
+
+ /**
+ * Get mail setting.
+ * <p>
+ * @return
+ * mail setting, or <tt>null</tt> if mail setting record exists but value is
+ * null.
+ * @throws
+ * RuntimeException if mail setting record is not found
+ */
+ @Nullable
+ MailSetting getMailSetting();
+
+ /**
+ * Save specified mail setting.
+ * <p>
+ * @param mailSetting
+ * mail setting to be saved. Use <tt>null</tt> to clear the setting (but
+ * setting record will still be remained in database)
+ */
+ void saveMailSetting(@Nullable MailSetting mailSetting);
+
+ /**
+ * Get backup setting.
+ * <p>
+ * @return
+ * backup setting, or <tt>null</tt> if backup setting record exists but value is null
+ * @throws
+ * RuntimeException if backup setting record is not found
+ */
+ @Nullable
+ BackupSetting getBackupSetting();
+
+ /**
+ * Save specified backup setting.
+ * <p>
+ * @param backupSetting
+ * backup setting to be saved. Use <tt>null</tt> to clear the setting (but
+ * setting record will still be remained in database)
+ */
+ void saveBackupSetting(@Nullable BackupSetting backupSetting);
+
+ SecuritySetting getSecuritySetting();
+
+ void saveSecuritySetting(SecuritySetting securitySetting);
+
+ GlobalIssueSetting getIssueSetting();
+
+ void saveIssueSetting(GlobalIssueSetting issueSetting);
+
+ @Nullable
+ Authenticator getAuthenticator();
+
+ void saveAuthenticator(@Nullable Authenticator authenticator);
+
+ List<JobExecutor> getJobExecutors();
+
+ void saveJobExecutors(List<JobExecutor> jobExecutors);
+
+}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
index 1fc4832494..2d27dc890d 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java
@@ -1,373 +1,376 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.apache.commons.io.IOUtils;
-import org.eclipse.jgit.api.Git;
-import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
-import org.eclipse.jgit.internal.storage.file.FileRepository;
-import org.eclipse.jgit.lib.ConfigConstants;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.hibernate.query.Query;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.launcher.loader.Listen;
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.commons.utils.FileUtils;
-import io.onedev.commons.utils.StringUtils;
-import io.onedev.server.cache.CacheManager;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.entitymanager.UserAuthorizationManager;
-import io.onedev.server.event.RefUpdated;
-import io.onedev.server.event.system.SystemStarted;
-import io.onedev.server.event.system.SystemStopping;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.CloneCommand;
-import io.onedev.server.git.command.ListChangedFilesCommand;
-import io.onedev.server.model.Build;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.User;
-import io.onedev.server.model.UserAuthorization;
-import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.model.support.FileProtection;
-import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.persistence.TransactionManager;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.security.permission.ProjectPrivilege;
-import io.onedev.server.util.facade.GroupAuthorizationFacade;
-import io.onedev.server.util.facade.MembershipFacade;
-import io.onedev.server.util.facade.ProjectFacade;
-import io.onedev.server.util.facade.UserAuthorizationFacade;
-import io.onedev.server.util.reviewrequirement.ReviewRequirement;
-import io.onedev.server.web.util.avatar.AvatarManager;
-
-@Singleton
-public class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {
-
- private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);
-
- private final CommitInfoManager commitInfoManager;
-
- private final UserAuthorizationManager userAuthorizationManager;
-
- private final BuildManager buildManager;
-
- private final CacheManager cacheManager;
-
- private final AvatarManager avatarManager;
-
- private final TransactionManager transactionManager;
-
- private final String gitReceiveHook;
-
- private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
-
- @Inject
- public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
- UserAuthorizationManager userAuthorizationManager, BuildManager buildManager,
- CacheManager cacheManager, AvatarManager avatarManager,
- TransactionManager transactionManager) {
- super(dao);
-
- this.commitInfoManager = commitInfoManager;
- this.userAuthorizationManager = userAuthorizationManager;
- this.buildManager = buildManager;
- this.cacheManager = cacheManager;
- this.avatarManager = avatarManager;
- this.transactionManager = transactionManager;
-
- try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {
- Preconditions.checkNotNull(is);
- gitReceiveHook = StringUtils.join(IOUtils.readLines(is, Charset.defaultCharset()), "\n");
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- }
-
- @Override
- public Repository getRepository(Project project) {
- Repository repository = repositoryCache.get(project.getId());
- if (repository == null) {
- synchronized (repositoryCache) {
- repository = repositoryCache.get(project.getId());
- if (repository == null) {
- try {
- repository = new FileRepository(project.getGitDir());
- repository.getConfig().setEnum(ConfigConstants.CONFIG_DIFF_SECTION, null,
- ConfigConstants.CONFIG_KEY_ALGORITHM, SupportedAlgorithm.HISTOGRAM);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- repositoryCache.put(project.getId(), repository);
- }
- }
- }
- return repository;
- }
-
- @Override
- public void save(Project project) {
- save(project, null);
- }
-
- @Transactional
- @Override
- public void save(Project project, String oldName) {
- boolean isNew = project.isNew();
-
- dao.persist(project);
-
- if (isNew) {
- UserAuthorization authorization = new UserAuthorization();
- authorization.setPrivilege(ProjectPrivilege.ADMINISTRATION);
- authorization.setProject(project);
- authorization.setUser(SecurityUtils.getUser());
- userAuthorizationManager.save(authorization);
- }
-
- File gitDir = project.getGitDir();
-
- transactionManager.runAfterCommit(new Runnable() {
-
- @Override
- public void run() {
- checkGit(gitDir);
- }
-
- });
- }
-
- @Transactional
- @Override
- public void delete(Project project) {
- Query<?> query = getSession().createQuery("update Project set forkedFrom=null where forkedFrom=:forkedFrom");
- query.setParameter("forkedFrom", project);
- query.executeUpdate();
-
- dao.remove(project);
-
- synchronized (repositoryCache) {
- Repository repository = repositoryCache.remove(project.getId());
- if (repository != null)
- repository.close();
- }
- }
-
- @Override
- public Project find(String projectName) {
- Long id = cacheManager.getProjectIdByName(projectName);
- if (id != null)
- return load(id);
- else
- return null;
- }
-
- @Transactional
- @Override
- public void fork(Project from, Project to) {
- save(to);
- FileUtils.cleanDir(to.getGitDir());
- new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();
- commitInfoManager.cloneInfo(from, to);
- avatarManager.copyAvatar(from.getFacade(), to.getFacade());
- }
-
- private boolean isGitHookValid(File gitDir, String hookName) {
- File hookFile = new File(gitDir, "hooks/" + hookName);
- if (!hookFile.exists())
- return false;
-
- try {
- String content = FileUtils.readFileToString(hookFile, Charset.defaultCharset());
- if (!content.contains("ENV_GIT_ALTERNATE_OBJECT_DIRECTORIES"))
- return false;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
-
- if (!hookFile.canExecute())
- return false;
-
- return true;
- }
-
- private void checkGit(File gitDir) {
- if (gitDir.listFiles().length == 0) {
- logger.info("Initializing git repository in '" + gitDir + "'...");
- try {
- Git.init().setDirectory(gitDir).setBare(true).call();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- } else if (!GitUtils.isValid(gitDir)) {
- logger.warn("Directory '" + gitDir + "' is not a valid git repository, reinitializing...");
- FileUtils.cleanDir(gitDir);
- try {
- Git.init().setDirectory(gitDir).setBare(true).call();
- } catch (Exception e) {
- throw ExceptionUtils.unchecked(e);
- }
- }
-
- if (!isGitHookValid(gitDir, "pre-receive") || !isGitHookValid(gitDir, "post-receive")) {
- File hooksDir = new File(gitDir, "hooks");
-
- File gitPreReceiveHookFile = new File(hooksDir, "pre-receive");
- FileUtils.writeFile(gitPreReceiveHookFile, String.format(gitReceiveHook, "git-prereceive-callback"));
- gitPreReceiveHookFile.setExecutable(true);
-
- File gitPostReceiveHookFile = new File(hooksDir, "post-receive");
- FileUtils.writeFile(gitPostReceiveHookFile, String.format(gitReceiveHook, "git-postreceive-callback"));
- gitPostReceiveHookFile.setExecutable(true);
- }
- }
-
- @Listen
- public void on(SystemStopping event) {
- synchronized(repositoryCache) {
- for (Repository repository: repositoryCache.values()) {
- repository.close();
- }
- }
- }
-
- @Listen
- public void on(SystemStarted event) {
- for (Project project: query())
- checkGit(project.getGitDir());
- }
-
- @Transactional
- @Listen
- public void on(RefUpdated event) {
- if (event.getNewCommitId().equals(ObjectId.zeroId())) {
- Project project = event.getProject();
- String branch = GitUtils.ref2branch(event.getRefName());
- if (branch != null) {
- for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
- if (it.next().onBranchDeleted(branch))
- it.remove();
- }
- }
- String tag = GitUtils.ref2tag(event.getRefName());
- if (tag != null) {
- for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
- if (it.next().onTagDeleted(tag))
- it.remove();
- }
- }
- }
- }
-
- @Override
- public Collection<ProjectFacade> getAccessibleProjects(User user) {
- Collection<ProjectFacade> projects = new HashSet<>();
-
- if (SecurityUtils.isAdministrator()) {
- projects.addAll(cacheManager.getProjects().values());
- } else {
- if (user != null) {
- Collection<Long> groupIds = new HashSet<>();
- for (MembershipFacade membership: cacheManager.getMemberships().values()) {
- if (membership.getUserId().equals(user.getId()))
- groupIds.add(membership.getGroupId());
- }
- for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {
- if (groupIds.contains(authorization.getGroupId()))
- projects.add(cacheManager.getProject(authorization.getProjectId()));
- }
- for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
- if (authorization.getUserId().equals(user.getId()))
- projects.add(cacheManager.getProject(authorization.getProjectId()));
- }
- }
- for (ProjectFacade project: cacheManager.getProjects().values()) {
- if (project.getDefaultPrivilege() != null)
- projects.add(project);
- }
- }
-
- return projects;
- }
-
- private Collection<String> getChangedFiles(Project project, ObjectId oldObjectId, ObjectId newObjectId,
- Map<String, String> gitEnvs) {
- if (gitEnvs != null && !gitEnvs.isEmpty()) {
- ListChangedFilesCommand cmd = new ListChangedFilesCommand(project.getGitDir(), gitEnvs);
- cmd.fromRev(oldObjectId.name()).toRev(newObjectId.name());
- return cmd.call();
- } else {
- return GitUtils.getChangedFiles(project.getRepository(), oldObjectId, newObjectId);
- }
- }
-
- @Override
- public boolean isModificationNeedsQualityCheck(User user, Project project, String branch, @Nullable String file) {
- BranchProtection branchProtection = project.getBranchProtection(branch, user);
- if (branchProtection != null) {
- if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))
- return true;
- if (!branchProtection.getConfigurations().isEmpty())
- return true;
-
- if (file != null) {
- FileProtection fileProtection = branchProtection.getFileProtection(file);
- if (fileProtection != null
- && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {
- return true;
- }
- }
- }
- return false;
- }
-
- @Override
- public boolean isPushNeedsQualityCheck(User user, Project project, String branch, ObjectId oldObjectId,
- ObjectId newObjectId, Map<String, String> gitEnvs) {
- BranchProtection branchProtection = project.getBranchProtection(branch, user);
- if (branchProtection != null) {
- if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))
- return true;
-
- List<Build> builds = buildManager.query(project, newObjectId.name());
- if (!builds.stream().map(it->it.getConfiguration().getName()).collect(Collectors.toSet())
- .containsAll(branchProtection.getConfigurations())) {
- return true;
- }
-
- for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId, gitEnvs)) {
- FileProtection fileProtection = branchProtection.getFileProtection(changedFile);
- if (fileProtection != null
- && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {
- return true;
- }
- }
- }
- return false;
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.apache.commons.io.IOUtils;
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.diff.DiffAlgorithm.SupportedAlgorithm;
+import org.eclipse.jgit.internal.storage.file.FileRepository;
+import org.eclipse.jgit.lib.ConfigConstants;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.StoredConfig;
+import org.hibernate.query.Query;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.launcher.loader.Listen;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.cache.CacheManager;
+import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserAuthorizationManager;
+import io.onedev.server.event.RefUpdated;
+import io.onedev.server.event.system.SystemStarted;
+import io.onedev.server.event.system.SystemStopping;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.CloneCommand;
+import io.onedev.server.git.command.ListChangedFilesCommand;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.model.support.BranchProtection;
+import io.onedev.server.model.support.FileProtection;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.ProjectPrivilege;
+import io.onedev.server.util.facade.GroupAuthorizationFacade;
+import io.onedev.server.util.facade.MembershipFacade;
+import io.onedev.server.util.facade.ProjectFacade;
+import io.onedev.server.util.facade.UserAuthorizationFacade;
+import io.onedev.server.util.reviewrequirement.ReviewRequirement;
+import io.onedev.server.web.util.avatar.AvatarManager;
+
+@Singleton
+public class DefaultProjectManager extends AbstractEntityManager<Project> implements ProjectManager {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultProjectManager.class);
+
+ private final CommitInfoManager commitInfoManager;
+
+ private final UserAuthorizationManager userAuthorizationManager;
+
+ private final BuildManager buildManager;
+
+ private final CacheManager cacheManager;
+
+ private final AvatarManager avatarManager;
+
+ private final String gitReceiveHook;
+
+ private final Map<Long, Repository> repositoryCache = new ConcurrentHashMap<>();
+
+ @Inject
+ public DefaultProjectManager(Dao dao, CommitInfoManager commitInfoManager,
+ UserAuthorizationManager userAuthorizationManager, BuildManager buildManager,
+ CacheManager cacheManager, AvatarManager avatarManager) {
+ super(dao);
+
+ this.commitInfoManager = commitInfoManager;
+ this.userAuthorizationManager = userAuthorizationManager;
+ this.buildManager = buildManager;
+ this.cacheManager = cacheManager;
+ this.avatarManager = avatarManager;
+
+ try (InputStream is = getClass().getClassLoader().getResourceAsStream("git-receive-hook")) {
+ Preconditions.checkNotNull(is);
+ gitReceiveHook = StringUtils.join(IOUtils.readLines(is, Charset.defaultCharset()), "\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ @Override
+ public Repository getRepository(Project project) {
+ Repository repository = repositoryCache.get(project.getId());
+ if (repository == null) {
+ synchronized (repositoryCache) {
+ repository = repositoryCache.get(project.getId());
+ if (repository == null) {
+ try {
+ repository = new FileRepository(project.getGitDir());
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ repositoryCache.put(project.getId(), repository);
+ }
+ }
+ }
+ return repository;
+ }
+
+ @Override
+ public void save(Project project) {
+ save(project, null);
+ }
+
+ @Transactional
+ @Override
+ public void save(Project project, String oldName) {
+ boolean isNew = project.isNew();
+
+ dao.persist(project);
+
+ if (isNew) {
+ UserAuthorization authorization = new UserAuthorization();
+ authorization.setPrivilege(ProjectPrivilege.ADMINISTRATION);
+ authorization.setProject(project);
+ authorization.setUser(SecurityUtils.getUser());
+ userAuthorizationManager.save(authorization);
+ checkSanity(project);
+ }
+ }
+
+ @Transactional
+ @Override
+ public void delete(Project project) {
+ Query<?> query = getSession().createQuery("update Project set forkedFrom=null where forkedFrom=:forkedFrom");
+ query.setParameter("forkedFrom", project);
+ query.executeUpdate();
+
+ dao.remove(project);
+
+ synchronized (repositoryCache) {
+ Repository repository = repositoryCache.remove(project.getId());
+ if (repository != null)
+ repository.close();
+ }
+ }
+
+ @Override
+ public Project find(String projectName) {
+ Long id = cacheManager.getProjectIdByName(projectName);
+ if (id != null)
+ return load(id);
+ else
+ return null;
+ }
+
+ @Transactional
+ @Override
+ public void fork(Project from, Project to) {
+ save(to);
+ FileUtils.cleanDir(to.getGitDir());
+ new CloneCommand(to.getGitDir()).mirror(true).from(from.getGitDir().getAbsolutePath()).call();
+ commitInfoManager.cloneInfo(from, to);
+ avatarManager.copyAvatar(from.getFacade(), to.getFacade());
+ }
+
+ private boolean isGitHookValid(File gitDir, String hookName) {
+ File hookFile = new File(gitDir, "hooks/" + hookName);
+ if (!hookFile.exists())
+ return false;
+
+ try {
+ String content = FileUtils.readFileToString(hookFile, Charset.defaultCharset());
+ if (!content.contains("ENV_GIT_ALTERNATE_OBJECT_DIRECTORIES"))
+ return false;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+
+ if (!hookFile.canExecute())
+ return false;
+
+ return true;
+ }
+
+ private void checkSanity(Project project) {
+ File gitDir = project.getGitDir();
+ if (gitDir.listFiles().length == 0) {
+ logger.info("Initializing git repository in '" + gitDir + "'...");
+ try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ } else if (!GitUtils.isValid(gitDir)) {
+ logger.warn("Directory '" + gitDir + "' is not a valid git repository, reinitializing...");
+ FileUtils.cleanDir(gitDir);
+ try (Git git = Git.init().setDirectory(gitDir).setBare(true).call()) {
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+ if (!isGitHookValid(gitDir, "pre-receive") || !isGitHookValid(gitDir, "post-receive")) {
+ File hooksDir = new File(gitDir, "hooks");
+
+ File gitPreReceiveHookFile = new File(hooksDir, "pre-receive");
+ FileUtils.writeFile(gitPreReceiveHookFile, String.format(gitReceiveHook, "git-prereceive-callback"));
+ gitPreReceiveHookFile.setExecutable(true);
+
+ File gitPostReceiveHookFile = new File(hooksDir, "post-receive");
+ FileUtils.writeFile(gitPostReceiveHookFile, String.format(gitReceiveHook, "git-postreceive-callback"));
+ gitPostReceiveHookFile.setExecutable(true);
+ }
+
+ try {
+ StoredConfig config = project.getRepository().getConfig();
+ boolean changed = false;
+ if (config.getEnum(ConfigConstants.CONFIG_DIFF_SECTION, null, ConfigConstants.CONFIG_KEY_ALGORITHM,
+ SupportedAlgorithm.MYERS) != SupportedAlgorithm.HISTOGRAM) {
+ config.setEnum(ConfigConstants.CONFIG_DIFF_SECTION, null, ConfigConstants.CONFIG_KEY_ALGORITHM,
+ SupportedAlgorithm.HISTOGRAM);
+ changed = true;
+ }
+ if (!config.getBoolean("uploadpack", "allowAnySHA1InWant", false)) {
+ config.setBoolean("uploadpack", null, "allowAnySHA1InWant", true);
+ changed = true;
+ }
+ if (changed)
+ config.save();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Listen
+ public void on(SystemStopping event) {
+ synchronized(repositoryCache) {
+ for (Repository repository: repositoryCache.values()) {
+ repository.close();
+ }
+ }
+ }
+
+ @Listen
+ public void on(SystemStarted event) {
+ logger.info("Checking projects...");
+ for (Project project: query())
+ checkSanity(project);
+ }
+
+ @Transactional
+ @Listen
+ public void on(RefUpdated event) {
+ if (event.getNewCommitId().equals(ObjectId.zeroId())) {
+ Project project = event.getProject();
+ String branch = GitUtils.ref2branch(event.getRefName());
+ if (branch != null) {
+ for (Iterator<BranchProtection> it = project.getBranchProtections().iterator(); it.hasNext();) {
+ if (it.next().onBranchDeleted(branch))
+ it.remove();
+ }
+ }
+ String tag = GitUtils.ref2tag(event.getRefName());
+ if (tag != null) {
+ for (Iterator<TagProtection> it = project.getTagProtections().iterator(); it.hasNext();) {
+ if (it.next().onTagDeleted(tag))
+ it.remove();
+ }
+ }
+ }
+ }
+
+ @Override
+ public Collection<ProjectFacade> getAccessibleProjects(User user) {
+ Collection<ProjectFacade> projects = new HashSet<>();
+
+ if (SecurityUtils.isAdministrator()) {
+ projects.addAll(cacheManager.getProjects().values());
+ } else {
+ if (user != null) {
+ Collection<Long> groupIds = new HashSet<>();
+ for (MembershipFacade membership: cacheManager.getMemberships().values()) {
+ if (membership.getUserId().equals(user.getId()))
+ groupIds.add(membership.getGroupId());
+ }
+ for (GroupAuthorizationFacade authorization: cacheManager.getGroupAuthorizations().values()) {
+ if (groupIds.contains(authorization.getGroupId()))
+ projects.add(cacheManager.getProject(authorization.getProjectId()));
+ }
+ for (UserAuthorizationFacade authorization: cacheManager.getUserAuthorizations().values()) {
+ if (authorization.getUserId().equals(user.getId()))
+ projects.add(cacheManager.getProject(authorization.getProjectId()));
+ }
+ }
+ for (ProjectFacade project: cacheManager.getProjects().values()) {
+ if (project.getDefaultPrivilege() != null)
+ projects.add(project);
+ }
+ }
+
+ return projects;
+ }
+
+ private Collection<String> getChangedFiles(Project project, ObjectId oldObjectId, ObjectId newObjectId,
+ Map<String, String> gitEnvs) {
+ if (gitEnvs != null && !gitEnvs.isEmpty()) {
+ ListChangedFilesCommand cmd = new ListChangedFilesCommand(project.getGitDir(), gitEnvs);
+ cmd.fromRev(oldObjectId.name()).toRev(newObjectId.name());
+ return cmd.call();
+ } else {
+ return GitUtils.getChangedFiles(project.getRepository(), oldObjectId, newObjectId);
+ }
+ }
+
+ @Override
+ public boolean isModificationNeedsQualityCheck(User user, Project project, String branch, @Nullable String file) {
+ BranchProtection branchProtection = project.getBranchProtection(branch, user);
+ if (branchProtection != null) {
+ if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))
+ return true;
+ if (!branchProtection.getConfigurations().isEmpty())
+ return true;
+
+ if (file != null) {
+ FileProtection fileProtection = branchProtection.getFileProtection(file);
+ if (fileProtection != null
+ && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isPushNeedsQualityCheck(User user, Project project, String branch, ObjectId oldObjectId,
+ ObjectId newObjectId, Map<String, String> gitEnvs) {
+ BranchProtection branchProtection = project.getBranchProtection(branch, user);
+ if (branchProtection != null) {
+ if (!ReviewRequirement.fromString(branchProtection.getReviewRequirement()).satisfied(user))
+ return true;
+
+ List<Build> builds = buildManager.query(project, newObjectId.name());
+ if (!builds.stream().map(it->it.getConfiguration().getName()).collect(Collectors.toSet())
+ .containsAll(branchProtection.getConfigurations())) {
+ return true;
+ }
+
+ for (String changedFile: getChangedFiles(project, oldObjectId, newObjectId, gitEnvs)) {
+ FileProtection fileProtection = branchProtection.getFileProtection(changedFile);
+ if (fileProtection != null
+ && !ReviewRequirement.fromString(fileProtection.getReviewRequirement()).satisfied(user)) {
+ return true;
+ }
+ }
+ }
+ return false;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
index a1c13cc046..6c2d2e9940 100644
--- a/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
+++ b/core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java
@@ -1,296 +1,249 @@
-package io.onedev.server.entitymanager.impl;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.List;
-
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-import org.eclipse.jgit.lib.ObjectId;
-import org.hibernate.criterion.Restrictions;
-
-import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
-
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
-import io.onedev.commons.utils.stringmatch.Matcher;
-import io.onedev.server.cache.CommitInfoManager;
-import io.onedev.server.data.DataManager;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.RefInfo;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.Setting;
-import io.onedev.server.model.Setting.Key;
-import io.onedev.server.model.support.authenticator.Authenticator;
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.model.support.setting.BackupSetting;
-import io.onedev.server.model.support.setting.GlobalIssueSetting;
-import io.onedev.server.model.support.setting.MailSetting;
-import io.onedev.server.model.support.setting.SecuritySetting;
-import io.onedev.server.model.support.setting.SystemSetting;
-import io.onedev.server.persistence.annotation.Sessional;
-import io.onedev.server.persistence.annotation.Transactional;
-import io.onedev.server.persistence.dao.AbstractEntityManager;
-import io.onedev.server.persistence.dao.Dao;
-import io.onedev.server.persistence.dao.EntityCriteria;
-import io.onedev.server.util.patternset.PatternSet;
-
-@Singleton
-public class DefaultSettingManager extends AbstractEntityManager<Setting> implements SettingManager {
-
- private final DataManager dataManager;
-
- private final CommitInfoManager commitInfoManager;
-
- private volatile Long systemSettingId;
-
- private volatile Long mailSettingId;
-
- private volatile Long backupSettingId;
-
- private volatile Long securitySettingId;
-
- private volatile Long issueSettingId;
-
- private volatile Long authenticatorId;
-
- private volatile Long jobExecutorId;
-
- @Inject
- public DefaultSettingManager(Dao dao, DataManager dataManager, CommitInfoManager commitInfoManager) {
- super(dao);
- this.dataManager = dataManager;
- this.commitInfoManager = commitInfoManager;
- }
-
- @Sessional
- @Override
- public SystemSetting getSystemSetting() {
- Setting setting;
- if (systemSettingId == null) {
- setting = getSetting(Key.SYSTEM);
- Preconditions.checkNotNull(setting);
- systemSettingId = setting.getId();
- } else {
- setting = load(systemSettingId);
- }
- SystemSetting value = (SystemSetting) setting.getValue();
- Preconditions.checkNotNull(value);
- return value;
- }
-
- @Transactional
- @Override
- public void saveSystemSetting(SystemSetting systemSetting) {
- Preconditions.checkNotNull(systemSetting);
-
- Setting setting = getSetting(Key.SYSTEM);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.SYSTEM);
- }
- setting.setValue(systemSetting);
- dao.persist(setting);
- }
-
- @Sessional
- @Override
- public Setting getSetting(Key key) {
- return find(EntityCriteria.of(Setting.class).add(Restrictions.eq("key", key)));
- }
-
- @Sessional
- @Override
- public MailSetting getMailSetting() {
- Setting setting;
- if (mailSettingId == null) {
- setting = getSetting(Key.MAIL);
- Preconditions.checkNotNull(setting);
- mailSettingId = setting.getId();
- } else {
- setting = load(mailSettingId);
- }
- return (MailSetting) setting.getValue();
- }
-
- @Transactional
- @Override
- public void saveMailSetting(MailSetting mailSetting) {
- Setting setting = getSetting(Key.MAIL);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.MAIL);
- }
- setting.setValue(mailSetting);
- dao.persist(setting);
- }
-
- @Sessional
- @Override
- public BackupSetting getBackupSetting() {
- Setting setting;
- if (backupSettingId == null) {
- setting = getSetting(Key.BACKUP);
- Preconditions.checkNotNull(setting);
- backupSettingId = setting.getId();
- } else {
- setting = load(backupSettingId);
- }
- return (BackupSetting) setting.getValue();
- }
-
- @Transactional
- @Override
- public void saveBackupSetting(BackupSetting backupSetting) {
- Setting setting = getSetting(Key.BACKUP);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.BACKUP);
- }
- setting.setValue(backupSetting);
- dao.persist(setting);
- dataManager.scheduleBackup(backupSetting);
- }
-
- @Sessional
- @Override
- public SecuritySetting getSecuritySetting() {
- Setting setting;
- if (securitySettingId == null) {
- setting = getSetting(Key.SECURITY);
- Preconditions.checkNotNull(setting);
- securitySettingId = setting.getId();
- } else {
- setting = load(securitySettingId);
- }
- return (SecuritySetting) setting.getValue();
- }
-
- @Transactional
- @Override
- public void saveIssueSetting(GlobalIssueSetting issueSetting) {
- Setting setting = getSetting(Key.ISSUE);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.ISSUE);
- }
- setting.setValue(issueSetting);
- dao.persist(setting);
- }
-
- @Sessional
- @Override
- public GlobalIssueSetting getIssueSetting() {
- Setting setting;
- if (issueSettingId == null) {
- setting = getSetting(Key.ISSUE);
- Preconditions.checkNotNull(setting);
- issueSettingId = setting.getId();
- } else {
- setting = load(issueSettingId);
- }
- return (GlobalIssueSetting) setting.getValue();
- }
-
- @Transactional
- @Override
- public void saveSecuritySetting(SecuritySetting securitySetting) {
- Setting setting = getSetting(Key.SECURITY);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.SECURITY);
- }
- setting.setValue(securitySetting);
- dao.persist(setting);
- }
-
- @Sessional
- @Override
- public Authenticator getAuthenticator() {
- Setting setting;
- if (authenticatorId == null) {
- setting = getSetting(Key.AUTHENTICATOR);
- Preconditions.checkNotNull(setting);
- authenticatorId = setting.getId();
- } else {
- setting = load(authenticatorId);
- }
- return (Authenticator) setting.getValue();
- }
-
- @Transactional
- @Override
- public void saveAuthenticator(Authenticator authenticator) {
- Setting setting = getSetting(Key.AUTHENTICATOR);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.AUTHENTICATOR);
- }
- setting.setValue(authenticator);
- dao.persist(setting);
- }
-
- @SuppressWarnings("unchecked")
- @Override
- public List<JobExecutor> getJobExecutors() {
- Setting setting;
- if (jobExecutorId == null) {
- setting = getSetting(Key.JOB_EXECUTORS);
- Preconditions.checkNotNull(setting);
- jobExecutorId = setting.getId();
- } else {
- setting = load(jobExecutorId);
- }
- return (List<JobExecutor>) setting.getValue();
- }
-
- @Override
- public void saveJobExecutors(List<JobExecutor> jobExecutors) {
- Setting setting = getSetting(Key.JOB_EXECUTORS);
- if (setting == null) {
- setting = new Setting();
- setting.setKey(Key.JOB_EXECUTORS);
- }
- setting.setValue((Serializable) jobExecutors);
- dao.persist(setting);
- }
-
- @Nullable
- public JobExecutor getJobExecutor(Project project, ObjectId commitId, String jobName, String image) {
- Matcher matcher = new ChildAwareMatcher();
-
- for (JobExecutor executor: getJobExecutors()) {
- if (executor.isEnabled()
- && (executor.getProjects() == null || PatternSet.fromString(executor.getProjects()).matches(matcher, project.getName()))
- && (executor.getJobs() == null || PatternSet.fromString(executor.getJobs()).matches(matcher, jobName))
- && (executor.getEnvironments() == null || PatternSet.fromString(executor.getEnvironments()).matches(matcher, image))) {
- if (executor.getBranches() == null)
- return executor;
-
- Collection<ObjectId> descendants = commitInfoManager.getDescendants(project, Sets.newHashSet(commitId));
- descendants.add(commitId);
-
- PatternSet branchPatterns = PatternSet.fromString(executor.getBranches());
- for (RefInfo ref: project.getBranches()) {
- String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));
- if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))
- return executor;
- }
- }
- }
- return null;
- }
-
- @Override
- public JobExecutor getJobExecutor(String runningInstance) {
- for (JobExecutor executor: getJobExecutors()) {
- if (executor.isEnabled() && executor.isRunning(runningInstance))
- return executor;
- }
- return null;
- }
-
-}
+package io.onedev.server.entitymanager.impl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import org.hibernate.criterion.Restrictions;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.data.DataManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.Setting;
+import io.onedev.server.model.Setting.Key;
+import io.onedev.server.model.support.authenticator.Authenticator;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.model.support.setting.BackupSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.model.support.setting.MailSetting;
+import io.onedev.server.model.support.setting.SecuritySetting;
+import io.onedev.server.model.support.setting.SystemSetting;
+import io.onedev.server.persistence.annotation.Sessional;
+import io.onedev.server.persistence.annotation.Transactional;
+import io.onedev.server.persistence.dao.AbstractEntityManager;
+import io.onedev.server.persistence.dao.Dao;
+import io.onedev.server.persistence.dao.EntityCriteria;
+
+@Singleton
+public class DefaultSettingManager extends AbstractEntityManager<Setting> implements SettingManager {
+
+ private final DataManager dataManager;
+
+ private volatile Long systemSettingId;
+
+ private volatile Long mailSettingId;
+
+ private volatile Long backupSettingId;
+
+ private volatile Long securitySettingId;
+
+ private volatile Long issueSettingId;
+
+ private volatile Long authenticatorId;
+
+ /*
+ * Cache job executors as it may contain internal state
+ */
+ private List<JobExecutor> jobExecutors;
+
+ @Inject
+ public DefaultSettingManager(Dao dao, DataManager dataManager) {
+ super(dao);
+ this.dataManager = dataManager;
+ }
+
+ @Sessional
+ @Override
+ public SystemSetting getSystemSetting() {
+ Setting setting;
+ if (systemSettingId == null) {
+ setting = getSetting(Key.SYSTEM);
+ Preconditions.checkNotNull(setting);
+ systemSettingId = setting.getId();
+ } else {
+ setting = load(systemSettingId);
+ }
+ SystemSetting value = (SystemSetting) setting.getValue();
+ Preconditions.checkNotNull(value);
+ return value;
+ }
+
+ @Transactional
+ @Override
+ public void saveSystemSetting(SystemSetting systemSetting) {
+ Preconditions.checkNotNull(systemSetting);
+
+ Setting setting = getSetting(Key.SYSTEM);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.SYSTEM);
+ }
+ setting.setValue(systemSetting);
+ dao.persist(setting);
+ }
+
+ @Sessional
+ @Override
+ public Setting getSetting(Key key) {
+ return find(EntityCriteria.of(Setting.class).add(Restrictions.eq("key", key)));
+ }
+
+ @Sessional
+ @Override
+ public MailSetting getMailSetting() {
+ Setting setting;
+ if (mailSettingId == null) {
+ setting = getSetting(Key.MAIL);
+ Preconditions.checkNotNull(setting);
+ mailSettingId = setting.getId();
+ } else {
+ setting = load(mailSettingId);
+ }
+ return (MailSetting) setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveMailSetting(MailSetting mailSetting) {
+ Setting setting = getSetting(Key.MAIL);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.MAIL);
+ }
+ setting.setValue(mailSetting);
+ dao.persist(setting);
+ }
+
+ @Sessional
+ @Override
+ public BackupSetting getBackupSetting() {
+ Setting setting;
+ if (backupSettingId == null) {
+ setting = getSetting(Key.BACKUP);
+ Preconditions.checkNotNull(setting);
+ backupSettingId = setting.getId();
+ } else {
+ setting = load(backupSettingId);
+ }
+ return (BackupSetting) setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveBackupSetting(BackupSetting backupSetting) {
+ Setting setting = getSetting(Key.BACKUP);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.BACKUP);
+ }
+ setting.setValue(backupSetting);
+ dao.persist(setting);
+ dataManager.scheduleBackup(backupSetting);
+ }
+
+ @Sessional
+ @Override
+ public SecuritySetting getSecuritySetting() {
+ Setting setting;
+ if (securitySettingId == null) {
+ setting = getSetting(Key.SECURITY);
+ Preconditions.checkNotNull(setting);
+ securitySettingId = setting.getId();
+ } else {
+ setting = load(securitySettingId);
+ }
+ return (SecuritySetting) setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveIssueSetting(GlobalIssueSetting issueSetting) {
+ Setting setting = getSetting(Key.ISSUE);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.ISSUE);
+ }
+ setting.setValue(issueSetting);
+ dao.persist(setting);
+ }
+
+ @Sessional
+ @Override
+ public GlobalIssueSetting getIssueSetting() {
+ Setting setting;
+ if (issueSettingId == null) {
+ setting = getSetting(Key.ISSUE);
+ Preconditions.checkNotNull(setting);
+ issueSettingId = setting.getId();
+ } else {
+ setting = load(issueSettingId);
+ }
+ return (GlobalIssueSetting) setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveSecuritySetting(SecuritySetting securitySetting) {
+ Setting setting = getSetting(Key.SECURITY);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.SECURITY);
+ }
+ setting.setValue(securitySetting);
+ dao.persist(setting);
+ }
+
+ @Sessional
+ @Override
+ public Authenticator getAuthenticator() {
+ Setting setting;
+ if (authenticatorId == null) {
+ setting = getSetting(Key.AUTHENTICATOR);
+ Preconditions.checkNotNull(setting);
+ authenticatorId = setting.getId();
+ } else {
+ setting = load(authenticatorId);
+ }
+ return (Authenticator) setting.getValue();
+ }
+
+ @Transactional
+ @Override
+ public void saveAuthenticator(Authenticator authenticator) {
+ Setting setting = getSetting(Key.AUTHENTICATOR);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.AUTHENTICATOR);
+ }
+ setting.setValue(authenticator);
+ dao.persist(setting);
+ }
+
+ @Sessional
+ @SuppressWarnings("unchecked")
+ @Override
+ public synchronized List<JobExecutor> getJobExecutors() {
+ if (jobExecutors == null) {
+ Setting setting = Preconditions.checkNotNull(getSetting(Key.JOB_EXECUTORS));
+ jobExecutors = (List<JobExecutor>) setting.getValue();
+ }
+ return jobExecutors;
+ }
+
+ @Transactional
+ @Override
+ public synchronized void saveJobExecutors(List<JobExecutor> jobExecutors) {
+ this.jobExecutors = jobExecutors;
+ Setting setting = getSetting(Key.JOB_EXECUTORS);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.JOB_EXECUTORS);
+ }
+ setting.setValue((Serializable) jobExecutors);
+ dao.persist(setting);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/GitUtils.java b/core/src/main/java/io/onedev/server/git/GitUtils.java
index aa9063abf9..ef48d24f36 100644
--- a/core/src/main/java/io/onedev/server/git/GitUtils.java
+++ b/core/src/main/java/io/onedev/server/git/GitUtils.java
@@ -1,573 +1,573 @@
-package io.onedev.server.git;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.regex.Pattern;
-
-import javax.annotation.Nullable;
-
-import org.eclipse.jgit.diff.DiffEntry;
-import org.eclipse.jgit.diff.DiffEntry.ChangeType;
-import org.eclipse.jgit.diff.DiffFormatter;
-import org.eclipse.jgit.diff.RawTextComparator;
-import org.eclipse.jgit.errors.AmbiguousObjectException;
-import org.eclipse.jgit.errors.IncorrectObjectTypeException;
-import org.eclipse.jgit.errors.MissingObjectException;
-import org.eclipse.jgit.errors.RevisionSyntaxException;
-import org.eclipse.jgit.lib.AnyObjectId;
-import org.eclipse.jgit.lib.CommitBuilder;
-import org.eclipse.jgit.lib.Constants;
-import org.eclipse.jgit.lib.FileMode;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.ObjectInserter;
-import org.eclipse.jgit.lib.ObjectReader;
-import org.eclipse.jgit.lib.PersonIdent;
-import org.eclipse.jgit.lib.RefUpdate;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.merge.MergeStrategy;
-import org.eclipse.jgit.merge.Merger;
-import org.eclipse.jgit.merge.ResolveMerger;
-import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.revwalk.RevWalk;
-import org.eclipse.jgit.revwalk.RevWalkUtils;
-import org.eclipse.jgit.revwalk.filter.RevFilter;
-import org.eclipse.jgit.treewalk.CanonicalTreeParser;
-import org.eclipse.jgit.treewalk.TreeWalk;
-import org.eclipse.jgit.treewalk.filter.TreeFilter;
-import org.eclipse.jgit.util.SystemReader;
-import org.eclipse.jgit.util.io.NullOutputStream;
-
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.base.Preconditions;
-import com.google.common.base.Splitter;
-import com.google.common.base.Strings;
-import com.google.common.collect.Iterables;
-
-import io.onedev.commons.utils.LockUtils;
-import io.onedev.commons.utils.PathUtils;
-import io.onedev.server.git.command.FetchCommand;
-import io.onedev.server.git.command.IsAncestorCommand;
-import io.onedev.server.git.exception.ObsoleteCommitException;
-import io.onedev.server.git.exception.RefUpdateException;
-import io.onedev.server.util.diff.WhitespaceOption;
-
-public class GitUtils {
-
- public static final Pattern PATTERN_HASH = Pattern.compile("[a-z0-9]{40}");
-
- public static final int SHORT_SHA_LENGTH = 8;
-
- public static boolean isHash(String sha) {
- return PATTERN_HASH.matcher(sha).matches();
- }
-
- public static boolean isEmptyPath(String path) {
- return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);
- }
-
- public static String abbreviateSHA(String sha, int length) {
- Preconditions.checkArgument(isHash(sha));
- return sha.substring(0, length);
- }
-
- public static String abbreviateSHA(String sha) {
- return abbreviateSHA(sha, SHORT_SHA_LENGTH);
- }
-
- public static List<DiffEntry> diff(Repository repository, AnyObjectId oldRevId, AnyObjectId newRevId) {
- List<DiffEntry> diffs = new ArrayList<>();
- try ( DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);
- RevWalk revWalk = new RevWalk(repository);
- ObjectReader reader = repository.newObjectReader();) {
- diffFormatter.setRepository(repository);
- diffFormatter.setDetectRenames(true);
- diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);
-
- CanonicalTreeParser oldTreeParser = new CanonicalTreeParser();
- if (!oldRevId.equals(ObjectId.zeroId()))
- oldTreeParser.reset(reader, revWalk.parseCommit(oldRevId).getTree());
-
- CanonicalTreeParser newTreeParser = new CanonicalTreeParser();
- if (!newRevId.equals(ObjectId.zeroId()))
- newTreeParser.reset(reader, revWalk.parseCommit(newRevId).getTree());
-
- for (DiffEntry entry: diffFormatter.scan(oldTreeParser, newTreeParser)) {
- if (!Objects.equal(entry.getOldPath(), entry.getNewPath())
- || !Objects.equal(entry.getOldMode(), entry.getNewMode())
- || entry.getOldId()==null || !entry.getOldId().isComplete()
- || entry.getNewId()== null || !entry.getNewId().isComplete()
- || !entry.getOldId().equals(entry.getNewId())) {
- diffs.add(entry);
- }
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return diffs;
- }
-
- @Nullable
- public static String getDetailMessage(RevCommit commit) {
- int start = 0;
- String fullMessage = commit.getFullMessage();
- while (true) {
- int index = fullMessage.indexOf('\n', start);
- if (index == -1)
- return null;
- start = index+1;
- int nextIndex = fullMessage.indexOf('\n', start);
- if (nextIndex == -1)
- return null;
- start = nextIndex+1;
- if (fullMessage.substring(index, nextIndex).trim().length() == 0) {
- String detailMessage = fullMessage.substring(start).trim();
- return detailMessage.length()!=0?detailMessage:null;
- }
- }
- }
-
- public static String getBlobTypeName(int blobType) {
- if (blobType == FileMode.TYPE_FILE)
- return "File";
- else if (blobType == FileMode.TYPE_GITLINK)
- return "Sub module";
- else if (blobType == FileMode.TYPE_SYMLINK)
- return "Symbol link";
- else
- return "Folder";
- }
-
- public static PersonIdent newPersonIdent(String name, String email, Date when) {
- return new PersonIdent(name, email, when.getTime(),
- SystemReader.getInstance().getTimezone(when.getTime()));
- }
-
- /**
- * Parse the original git raw date to Java date. The raw git date is in
- * unix timestamp with timezone like:
- * 1392312299 -0800
- *
- * @param input the input raw date string
- * @return Java date
- */
- public static Date parseRawDate(String input) {
- String[] pieces = Iterables.toArray(Splitter.on(" ").split(input), String.class);
- return new Date(Long.valueOf(pieces[0]) * 1000L);
- }
-
- /**
- * Parse the raw user information into PersonIdent object, the raw information
- * should be in format <code>[name] [<email>] [epoch timezone]</code>, for
- * example:
- *
- * Jacob Thornton <[email protected]> 1328060294 -0800
- *
- * @param raw
- * @return
- */
- public static @Nullable PersonIdent parsePersonIdent(String raw) {
- if (Strings.isNullOrEmpty(raw))
- return null;
-
- int pos1 = raw.indexOf('<');
- if (pos1 <= 0)
- throw new IllegalArgumentException("Raw " + raw);
-
- String name = raw.substring(0, pos1 - 1);
-
- int pos2 = raw.indexOf('>');
- if (pos2 <= 0)
- throw new IllegalArgumentException("Raw " + raw);
-
- String time = raw.substring(pos2 + 1).trim();
- Date when = parseRawDate(time);
-
- String email = raw.substring(pos1 + 1, pos2 - 1);
-
- return newPersonIdent(name, email, when);
- }
-
- public static int comparePath(@Nullable String path1, @Nullable String path2) {
- List<String> segments1 = splitPath(path1);
- List<String> segments2 = splitPath(path2);
-
- int index = 0;
- for (String segment1: segments1) {
- if (index<segments2.size()) {
- int result = segment1.compareTo(segments2.get(index));
- if (result != 0)
- return result;
- } else {
- return 1;
- }
- index++;
- }
- if (index<segments2.size())
- return -1;
- else
- return 0;
- }
-
- public static List<String> splitPath(@Nullable String path) {
- List<String> pathSegments;
- if (path != null)
- pathSegments = Splitter.on("/").omitEmptyStrings().splitToList(path);
- else
- pathSegments = new ArrayList<>();
- return pathSegments;
- }
-
- public static @Nullable String normalizePath(@Nullable String path) {
- List<String> pathSegments = splitPath(PathUtils.normalizeDots(path));
- if (!pathSegments.isEmpty())
- return Joiner.on("/").join(pathSegments);
- else
- return null;
- }
-
- /**
- * Convert a git reference name to branch name.
- *
- * @param refName
- * name of the git reference
- * @return
- * name of the branch, or <tt>null</tt> if specified ref
- * does not represent a branch
- */
- public static @Nullable String ref2branch(String refName) {
- if (refName.startsWith(Constants.R_HEADS))
- return refName.substring(Constants.R_HEADS.length());
- else
- return null;
- }
-
- public static String branch2ref(String branch) {
- return Constants.R_HEADS + branch;
- }
-
- /**
- * Convert a git reference name to tag name.
- *
- * @param refName
- * name of the git reference
- * @return
- * name of the tag, or <tt>null</tt> if specified ref
- * does not represent a tag
- */
- public static @Nullable String ref2tag(String refName) {
- if (refName.startsWith(Constants.R_TAGS))
- return refName.substring(Constants.R_TAGS.length());
- else
- return null;
- }
-
- public static String tag2ref(String tag) {
- return Constants.R_TAGS + tag;
- }
-
- public static BlobIdent getOldBlobIdent(DiffEntry diffEntry, String oldRev) {
- BlobIdent blobIdent;
- if (diffEntry.getChangeType() != ChangeType.ADD) {
- blobIdent = new BlobIdent(oldRev, diffEntry.getOldPath(), diffEntry.getOldMode().getBits());
- } else {
- blobIdent = new BlobIdent(oldRev, null, null);
- }
- return blobIdent;
- }
-
- public static BlobIdent getNewBlobIdent(DiffEntry diffEntry, String newRev) {
- BlobIdent blobIdent;
- if (diffEntry.getChangeType() != ChangeType.DELETE) {
- blobIdent = new BlobIdent(newRev, diffEntry.getNewPath(), diffEntry.getNewMode().getBits());
- } else {
- blobIdent = new BlobIdent(newRev, null, null);
- }
- return blobIdent;
- }
-
- /**
- * @return
- * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this
- * case, these two commits can not be merged
- */
- @Nullable
- public static ObjectId getMergeBase(Repository repository, ObjectId commit1, ObjectId commit2) {
- try (RevWalk revWalk = new RevWalk(repository)) {
- revWalk.setRevFilter(RevFilter.MERGE_BASE);
-
- revWalk.markStart(revWalk.parseCommit(commit1));
- revWalk.markStart(revWalk.parseCommit(commit2));
- RevCommit mergeBase = revWalk.next();
- return mergeBase!=null?mergeBase.copy():null;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * @return
- * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this
- * case, these two commits can not be merged
- */
- @Nullable
- public static ObjectId getMergeBase(Repository repository1, ObjectId commit1,
- Repository repository2, ObjectId commit2, @Nullable String fetchRef) {
- if (repository1.getDirectory() == null || !repository1.getDirectory().equals(repository2.getDirectory())) {
- fetch(repository2, commit2, repository1, fetchRef);
- }
- return GitUtils.getMergeBase(repository1, commit1, commit2);
- }
-
- public static void fetch(Repository fromRepository, ObjectId fromCommit, Repository toRepository,
- @Nullable String fetchRef) {
- if (fetchRef != null) {
- new FetchCommand(toRepository.getDirectory())
- .from(fromRepository.getDirectory().getAbsolutePath())
- .refspec(fetchRef)
- .call();
- } else {
- LockUtils.call("repository-fetch:" + fromRepository.getDirectory(), new Callable<Void>() {
-
- @Override
- public Void call() throws Exception {
- try {
- RefUpdate refUpdate = fromRepository.updateRef("refs/temp/fetch");
- refUpdate.setNewObjectId(fromCommit);
- updateRef(refUpdate);
- new FetchCommand(toRepository.getDirectory())
- .from(fromRepository.getDirectory().getAbsolutePath())
- .refspec(refUpdate.getName())
- .call();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return null;
- }
-
- });
- }
- }
-
- public static boolean isMergedInto(Repository repository, @Nullable Map<String, String> gitEnvs,
- ObjectId base, ObjectId tip) {
- if (gitEnvs != null && !gitEnvs.isEmpty()) {
- IsAncestorCommand cmd = new IsAncestorCommand(repository.getDirectory(), gitEnvs);
- cmd.ancestor(base.name()).descendant(tip.name());
- return cmd.call();
- } else {
- try (RevWalk revWalk = new RevWalk(repository)) {
- RevCommit baseCommit;
- try {
- baseCommit = revWalk.parseCommit(base);
- } catch (MissingObjectException e) {
- return false;
- }
- return revWalk.isMergedInto(baseCommit, revWalk.parseCommit(tip));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- }
-
- /**
- * Get commit of specified revision id.
- *
- * @param revWalk
- * @param revId
- * @return
- * <tt>null</tt> if specified id does not exist or does not
- * represent a commit
- */
- @Nullable
- public static RevCommit parseCommit(RevWalk revWalk, ObjectId revId) {
- RevObject peeled;
- try {
- peeled = revWalk.peel(revWalk.parseAny(revId));
- if (peeled instanceof RevCommit)
- return (RevCommit) peeled;
- else
- return null;
- } catch (MissingObjectException e) {
- return null;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Nullable
- public static ObjectId resolve(Repository repository, String revision) {
- try {
- return repository.resolve(revision);
- } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {
- return null;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Nullable
- public static ObjectId rebase(Repository repository, ObjectId source, ObjectId target, PersonIdent committer) {
- try ( RevWalk revWalk = new RevWalk(repository);
- ObjectInserter inserter = repository.newObjectInserter();) {
- RevCommit sourceCommit = revWalk.parseCommit(source);
- RevCommit targetCommit = revWalk.parseCommit(target);
- revWalk.setRevFilter(RevFilter.NO_MERGES);
- List<RevCommit> commits = RevWalkUtils.find(revWalk, sourceCommit, targetCommit);
- Collections.reverse(commits);
- RevCommit headCommit = targetCommit;
- for (RevCommit commit: commits) {
- ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
- merger.setBase(commit.getParent(0));
- if (merger.merge(headCommit, commit)) {
- if (!headCommit.getTree().getId().equals(merger.getResultTreeId())) {
- CommitBuilder newCommit = new CommitBuilder();
- newCommit.setAuthor(commit.getAuthorIdent());
- newCommit.setCommitter(committer);
- newCommit.setParentId(headCommit);
- newCommit.setMessage(commit.getFullMessage());
- newCommit.setTreeId(merger.getResultTreeId());
- headCommit = revWalk.parseCommit(inserter.insert(newCommit));
- }
- } else {
- return null;
- }
- }
- inserter.flush();
- return headCommit.copy();
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Nullable
- public static ObjectId merge(Repository repository, ObjectId source, ObjectId target,
- boolean squash, PersonIdent committer, PersonIdent author, String commitMessage) {
- try ( RevWalk revWalk = new RevWalk(repository);
- ObjectInserter inserter = repository.newObjectInserter();) {
- RevCommit sourceCommit = revWalk.parseCommit(source);
- RevCommit targetCommit = revWalk.parseCommit(target);
- Merger merger = MergeStrategy.RECURSIVE.newMerger(repository, true);
- if (merger.merge(targetCommit, sourceCommit)) {
- CommitBuilder mergedCommit = new CommitBuilder();
- mergedCommit.setAuthor(author);
- mergedCommit.setCommitter(committer);
- if (squash)
- mergedCommit.setParentId(targetCommit);
- else
- mergedCommit.setParentIds(targetCommit, sourceCommit);
- mergedCommit.setMessage(commitMessage);
- mergedCommit.setTreeId(merger.getResultTreeId());
- ObjectId mergedCommitId = inserter.insert(mergedCommit);
- inserter.flush();
- return mergedCommitId;
- } else {
- return null;
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static Collection<String> getChangedFiles(Repository repository, ObjectId oldCommitId, ObjectId newCommitId) {
- Collection<String> changedFiles = new HashSet<>();
- try ( RevWalk revWalk = new RevWalk(repository);
- TreeWalk treeWalk = new TreeWalk(repository)) {
- treeWalk.setFilter(TreeFilter.ANY_DIFF);
- treeWalk.setRecursive(true);
- RevCommit oldCommit = revWalk.parseCommit(oldCommitId);
- RevCommit newCommit = revWalk.parseCommit(newCommitId);
- treeWalk.addTree(oldCommit.getTree());
- treeWalk.addTree(newCommit.getTree());
- while (treeWalk.next()) {
- changedFiles.add(treeWalk.getPathString());
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- return changedFiles;
- }
-
- public static boolean isValid(File gitDir) {
- return new File(gitDir, "objects").exists();
- }
-
- public static RefUpdate getRefUpdate(Repository repository, String refName) {
- try {
- return repository.updateRef(refName);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static void updateRef(RefUpdate refUpdate) {
- try {
- RefUpdate.Result result = refUpdate.forceUpdate();
- if (result == RefUpdate.Result.LOCK_FAILURE
- && refUpdate.getExpectedOldObjectId() != null
- && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {
- throw new ObsoleteCommitException(refUpdate.getOldObjectId());
- } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED
- && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {
- throw new RefUpdateException(result);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static void deleteRef(RefUpdate refUpdate) {
- try {
- refUpdate.setForceUpdate(true);
- RefUpdate.Result result = refUpdate.delete();
- if (result == RefUpdate.Result.LOCK_FAILURE
- && refUpdate.getExpectedOldObjectId() != null
- && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {
- throw new ObsoleteCommitException(refUpdate.getOldObjectId());
- } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED
- && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {
- throw new RefUpdateException(result);
- }
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static void linkRef(RefUpdate refUpdate, String target) {
- try {
- RefUpdate.Result result = refUpdate.link(target);
- if (result != RefUpdate.Result.FORCED && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE)
- throw new RefUpdateException(result);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- public static List<String> readLines(Repository repository, RevCommit commit, String path,
- WhitespaceOption whitespaceOption) {
- try {
- TreeWalk treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, path, commit.getTree()));
- ObjectId blobId = treeWalk.getObjectId(0);
- ObjectReader objectReader = treeWalk.getObjectReader();
- BlobIdent blobIdent = new BlobIdent(commit.name(), path, FileMode.REGULAR_FILE.getBits());
- Blob blob = new Blob(blobIdent, blobId, objectReader);
- List<String> normalizedLines = new ArrayList<>();
- for (String line: Preconditions.checkNotNull(blob.getText()).getLines()) {
- normalizedLines.add(whitespaceOption.process(line));
- }
- return normalizedLines;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
-}
+package io.onedev.server.git;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jgit.diff.DiffEntry;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
+import org.eclipse.jgit.diff.DiffFormatter;
+import org.eclipse.jgit.diff.RawTextComparator;
+import org.eclipse.jgit.errors.AmbiguousObjectException;
+import org.eclipse.jgit.errors.IncorrectObjectTypeException;
+import org.eclipse.jgit.errors.MissingObjectException;
+import org.eclipse.jgit.errors.RevisionSyntaxException;
+import org.eclipse.jgit.lib.AnyObjectId;
+import org.eclipse.jgit.lib.CommitBuilder;
+import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.ObjectInserter;
+import org.eclipse.jgit.lib.ObjectReader;
+import org.eclipse.jgit.lib.PersonIdent;
+import org.eclipse.jgit.lib.RefUpdate;
+import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.merge.MergeStrategy;
+import org.eclipse.jgit.merge.Merger;
+import org.eclipse.jgit.merge.ResolveMerger;
+import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.revwalk.RevObject;
+import org.eclipse.jgit.revwalk.RevWalk;
+import org.eclipse.jgit.revwalk.RevWalkUtils;
+import org.eclipse.jgit.revwalk.filter.RevFilter;
+import org.eclipse.jgit.treewalk.CanonicalTreeParser;
+import org.eclipse.jgit.treewalk.TreeWalk;
+import org.eclipse.jgit.treewalk.filter.TreeFilter;
+import org.eclipse.jgit.util.SystemReader;
+import org.eclipse.jgit.util.io.NullOutputStream;
+
+import com.google.common.base.Joiner;
+import com.google.common.base.Objects;
+import com.google.common.base.Preconditions;
+import com.google.common.base.Splitter;
+import com.google.common.base.Strings;
+import com.google.common.collect.Iterables;
+
+import io.onedev.commons.utils.LockUtils;
+import io.onedev.commons.utils.PathUtils;
+import io.onedev.server.git.command.FetchCommand;
+import io.onedev.server.git.command.IsAncestorCommand;
+import io.onedev.server.git.exception.ObsoleteCommitException;
+import io.onedev.server.git.exception.RefUpdateException;
+import io.onedev.server.util.diff.WhitespaceOption;
+
+public class GitUtils {
+
+ public static final Pattern PATTERN_HASH = Pattern.compile("[a-z0-9]{40}");
+
+ public static final int SHORT_SHA_LENGTH = 8;
+
+ public static boolean isHash(String sha) {
+ return PATTERN_HASH.matcher(sha).matches();
+ }
+
+ public static boolean isEmptyPath(String path) {
+ return Strings.isNullOrEmpty(path) || Objects.equal(path, DiffEntry.DEV_NULL);
+ }
+
+ public static String abbreviateSHA(String sha, int length) {
+ Preconditions.checkArgument(isHash(sha));
+ return sha.substring(0, length);
+ }
+
+ public static String abbreviateSHA(String sha) {
+ return abbreviateSHA(sha, SHORT_SHA_LENGTH);
+ }
+
+ public static List<DiffEntry> diff(Repository repository, AnyObjectId oldRevId, AnyObjectId newRevId) {
+ List<DiffEntry> diffs = new ArrayList<>();
+ try ( DiffFormatter diffFormatter = new DiffFormatter(NullOutputStream.INSTANCE);
+ RevWalk revWalk = new RevWalk(repository);
+ ObjectReader reader = repository.newObjectReader();) {
+ diffFormatter.setRepository(repository);
+ diffFormatter.setDetectRenames(true);
+ diffFormatter.setDiffComparator(RawTextComparator.DEFAULT);
+
+ CanonicalTreeParser oldTreeParser = new CanonicalTreeParser();
+ if (!oldRevId.equals(ObjectId.zeroId()))
+ oldTreeParser.reset(reader, revWalk.parseCommit(oldRevId).getTree());
+
+ CanonicalTreeParser newTreeParser = new CanonicalTreeParser();
+ if (!newRevId.equals(ObjectId.zeroId()))
+ newTreeParser.reset(reader, revWalk.parseCommit(newRevId).getTree());
+
+ for (DiffEntry entry: diffFormatter.scan(oldTreeParser, newTreeParser)) {
+ if (!Objects.equal(entry.getOldPath(), entry.getNewPath())
+ || !Objects.equal(entry.getOldMode(), entry.getNewMode())
+ || entry.getOldId()==null || !entry.getOldId().isComplete()
+ || entry.getNewId()== null || !entry.getNewId().isComplete()
+ || !entry.getOldId().equals(entry.getNewId())) {
+ diffs.add(entry);
+ }
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return diffs;
+ }
+
+ @Nullable
+ public static String getDetailMessage(RevCommit commit) {
+ int start = 0;
+ String fullMessage = commit.getFullMessage();
+ while (true) {
+ int index = fullMessage.indexOf('\n', start);
+ if (index == -1)
+ return null;
+ start = index+1;
+ int nextIndex = fullMessage.indexOf('\n', start);
+ if (nextIndex == -1)
+ return null;
+ start = nextIndex+1;
+ if (fullMessage.substring(index, nextIndex).trim().length() == 0) {
+ String detailMessage = fullMessage.substring(start).trim();
+ return detailMessage.length()!=0?detailMessage:null;
+ }
+ }
+ }
+
+ public static String getBlobTypeName(int blobType) {
+ if (blobType == FileMode.TYPE_FILE)
+ return "File";
+ else if (blobType == FileMode.TYPE_GITLINK)
+ return "Sub module";
+ else if (blobType == FileMode.TYPE_SYMLINK)
+ return "Symbol link";
+ else
+ return "Folder";
+ }
+
+ public static PersonIdent newPersonIdent(String name, String email, Date when) {
+ return new PersonIdent(name, email, when.getTime(),
+ SystemReader.getInstance().getTimezone(when.getTime()));
+ }
+
+ /**
+ * Parse the original git raw date to Java date. The raw git date is in
+ * unix timestamp with timezone like:
+ * 1392312299 -0800
+ *
+ * @param input the input raw date string
+ * @return Java date
+ */
+ public static Date parseRawDate(String input) {
+ String[] pieces = Iterables.toArray(Splitter.on(" ").split(input), String.class);
+ return new Date(Long.valueOf(pieces[0]) * 1000L);
+ }
+
+ /**
+ * Parse the raw user information into PersonIdent object, the raw information
+ * should be in format <code>[name] [<email>] [epoch timezone]</code>, for
+ * example:
+ *
+ * Jacob Thornton <[email protected]> 1328060294 -0800
+ *
+ * @param raw
+ * @return
+ */
+ public static @Nullable PersonIdent parsePersonIdent(String raw) {
+ if (Strings.isNullOrEmpty(raw))
+ return null;
+
+ int pos1 = raw.indexOf('<');
+ if (pos1 <= 0)
+ throw new IllegalArgumentException("Raw " + raw);
+
+ String name = raw.substring(0, pos1 - 1);
+
+ int pos2 = raw.indexOf('>');
+ if (pos2 <= 0)
+ throw new IllegalArgumentException("Raw " + raw);
+
+ String time = raw.substring(pos2 + 1).trim();
+ Date when = parseRawDate(time);
+
+ String email = raw.substring(pos1 + 1, pos2 - 1);
+
+ return newPersonIdent(name, email, when);
+ }
+
+ public static int comparePath(@Nullable String path1, @Nullable String path2) {
+ List<String> segments1 = splitPath(path1);
+ List<String> segments2 = splitPath(path2);
+
+ int index = 0;
+ for (String segment1: segments1) {
+ if (index<segments2.size()) {
+ int result = segment1.compareTo(segments2.get(index));
+ if (result != 0)
+ return result;
+ } else {
+ return 1;
+ }
+ index++;
+ }
+ if (index<segments2.size())
+ return -1;
+ else
+ return 0;
+ }
+
+ public static List<String> splitPath(@Nullable String path) {
+ List<String> pathSegments;
+ if (path != null)
+ pathSegments = Splitter.on("/").omitEmptyStrings().splitToList(path);
+ else
+ pathSegments = new ArrayList<>();
+ return pathSegments;
+ }
+
+ public static @Nullable String normalizePath(@Nullable String path) {
+ List<String> pathSegments = splitPath(PathUtils.normalizeDots(path));
+ if (!pathSegments.isEmpty())
+ return Joiner.on("/").join(pathSegments);
+ else
+ return null;
+ }
+
+ /**
+ * Convert a git reference name to branch name.
+ *
+ * @param refName
+ * name of the git reference
+ * @return
+ * name of the branch, or <tt>null</tt> if specified ref
+ * does not represent a branch
+ */
+ public static @Nullable String ref2branch(String refName) {
+ if (refName.startsWith(Constants.R_HEADS))
+ return refName.substring(Constants.R_HEADS.length());
+ else
+ return null;
+ }
+
+ public static String branch2ref(String branch) {
+ return Constants.R_HEADS + branch;
+ }
+
+ /**
+ * Convert a git reference name to tag name.
+ *
+ * @param refName
+ * name of the git reference
+ * @return
+ * name of the tag, or <tt>null</tt> if specified ref
+ * does not represent a tag
+ */
+ public static @Nullable String ref2tag(String refName) {
+ if (refName.startsWith(Constants.R_TAGS))
+ return refName.substring(Constants.R_TAGS.length());
+ else
+ return null;
+ }
+
+ public static String tag2ref(String tag) {
+ return Constants.R_TAGS + tag;
+ }
+
+ public static BlobIdent getOldBlobIdent(DiffEntry diffEntry, String oldRev) {
+ BlobIdent blobIdent;
+ if (diffEntry.getChangeType() != ChangeType.ADD) {
+ blobIdent = new BlobIdent(oldRev, diffEntry.getOldPath(), diffEntry.getOldMode().getBits());
+ } else {
+ blobIdent = new BlobIdent(oldRev, null, null);
+ }
+ return blobIdent;
+ }
+
+ public static BlobIdent getNewBlobIdent(DiffEntry diffEntry, String newRev) {
+ BlobIdent blobIdent;
+ if (diffEntry.getChangeType() != ChangeType.DELETE) {
+ blobIdent = new BlobIdent(newRev, diffEntry.getNewPath(), diffEntry.getNewMode().getBits());
+ } else {
+ blobIdent = new BlobIdent(newRev, null, null);
+ }
+ return blobIdent;
+ }
+
+ /**
+ * @return
+ * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this
+ * case, these two commits can not be merged
+ */
+ @Nullable
+ public static ObjectId getMergeBase(Repository repository, ObjectId commit1, ObjectId commit2) {
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ revWalk.setRevFilter(RevFilter.MERGE_BASE);
+
+ revWalk.markStart(revWalk.parseCommit(commit1));
+ revWalk.markStart(revWalk.parseCommit(commit2));
+ RevCommit mergeBase = revWalk.next();
+ return mergeBase!=null?mergeBase.copy():null;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * @return
+ * merge base of specified commits, or <tt>null</tt> if two commits do not have related history. In this
+ * case, these two commits can not be merged
+ */
+ @Nullable
+ public static ObjectId getMergeBase(Repository repository1, ObjectId commit1,
+ Repository repository2, ObjectId commit2, @Nullable String fetchRef) {
+ if (repository1.getDirectory() == null || !repository1.getDirectory().equals(repository2.getDirectory())) {
+ fetch(repository2, commit2, repository1, fetchRef);
+ }
+ return GitUtils.getMergeBase(repository1, commit1, commit2);
+ }
+
+ public static void fetch(Repository fromRepository, ObjectId fromCommit, Repository toRepository,
+ @Nullable String fetchRef) {
+ if (fetchRef != null) {
+ new FetchCommand(toRepository.getDirectory())
+ .from(fromRepository.getDirectory().getAbsolutePath())
+ .refspec(fetchRef)
+ .call();
+ } else {
+ LockUtils.call("repository-fetch:" + fromRepository.getDirectory(), new Callable<Void>() {
+
+ @Override
+ public Void call() throws Exception {
+ try {
+ RefUpdate refUpdate = fromRepository.updateRef("refs/temp/fetch");
+ refUpdate.setNewObjectId(fromCommit);
+ updateRef(refUpdate);
+ new FetchCommand(toRepository.getDirectory())
+ .from(fromRepository.getDirectory().getAbsolutePath())
+ .refspec(refUpdate.getName())
+ .call();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return null;
+ }
+
+ });
+ }
+ }
+
+ public static boolean isMergedInto(Repository repository, @Nullable Map<String, String> gitEnvs,
+ ObjectId base, ObjectId tip) {
+ if (gitEnvs != null && !gitEnvs.isEmpty()) {
+ IsAncestorCommand cmd = new IsAncestorCommand(repository.getDirectory(), gitEnvs);
+ cmd.ancestor(base.name()).descendant(tip.name());
+ return cmd.call();
+ } else {
+ try (RevWalk revWalk = new RevWalk(repository)) {
+ RevCommit baseCommit;
+ try {
+ baseCommit = revWalk.parseCommit(base);
+ } catch (MissingObjectException e) {
+ return false;
+ }
+ return revWalk.isMergedInto(baseCommit, revWalk.parseCommit(tip));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
+
+ /**
+ * Get commit of specified revision id.
+ *
+ * @param revWalk
+ * @param revId
+ * @return
+ * <tt>null</tt> if specified id does not exist or does not
+ * represent a commit
+ */
+ @Nullable
+ public static RevCommit parseCommit(RevWalk revWalk, ObjectId revId) {
+ RevObject peeled;
+ try {
+ peeled = revWalk.peel(revWalk.parseAny(revId));
+ if (peeled instanceof RevCommit)
+ return (RevCommit) peeled;
+ else
+ return null;
+ } catch (MissingObjectException e) {
+ return null;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Nullable
+ public static ObjectId resolve(Repository repository, String revision) {
+ try {
+ return repository.resolve(revision);
+ } catch (RevisionSyntaxException | AmbiguousObjectException | IncorrectObjectTypeException e) {
+ return null;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Nullable
+ public static ObjectId rebase(Repository repository, ObjectId source, ObjectId target, PersonIdent committer) {
+ try ( RevWalk revWalk = new RevWalk(repository);
+ ObjectInserter inserter = repository.newObjectInserter();) {
+ RevCommit sourceCommit = revWalk.parseCommit(source);
+ RevCommit targetCommit = revWalk.parseCommit(target);
+ revWalk.setRevFilter(RevFilter.NO_MERGES);
+ List<RevCommit> commits = RevWalkUtils.find(revWalk, sourceCommit, targetCommit);
+ Collections.reverse(commits);
+ RevCommit headCommit = targetCommit;
+ for (RevCommit commit: commits) {
+ ResolveMerger merger = (ResolveMerger) MergeStrategy.RECURSIVE.newMerger(repository, true);
+ merger.setBase(commit.getParent(0));
+ if (merger.merge(headCommit, commit)) {
+ if (!headCommit.getTree().getId().equals(merger.getResultTreeId())) {
+ CommitBuilder newCommit = new CommitBuilder();
+ newCommit.setAuthor(commit.getAuthorIdent());
+ newCommit.setCommitter(committer);
+ newCommit.setParentId(headCommit);
+ newCommit.setMessage(commit.getFullMessage());
+ newCommit.setTreeId(merger.getResultTreeId());
+ headCommit = revWalk.parseCommit(inserter.insert(newCommit));
+ }
+ } else {
+ return null;
+ }
+ }
+ inserter.flush();
+ return headCommit.copy();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Nullable
+ public static ObjectId merge(Repository repository, ObjectId source, ObjectId target,
+ boolean squash, PersonIdent committer, PersonIdent author, String commitMessage) {
+ try ( RevWalk revWalk = new RevWalk(repository);
+ ObjectInserter inserter = repository.newObjectInserter();) {
+ RevCommit sourceCommit = revWalk.parseCommit(source);
+ RevCommit targetCommit = revWalk.parseCommit(target);
+ Merger merger = MergeStrategy.RECURSIVE.newMerger(repository, true);
+ if (merger.merge(targetCommit, sourceCommit)) {
+ CommitBuilder mergedCommit = new CommitBuilder();
+ mergedCommit.setAuthor(author);
+ mergedCommit.setCommitter(committer);
+ if (squash)
+ mergedCommit.setParentId(targetCommit);
+ else
+ mergedCommit.setParentIds(targetCommit, sourceCommit);
+ mergedCommit.setMessage(commitMessage);
+ mergedCommit.setTreeId(merger.getResultTreeId());
+ ObjectId mergedCommitId = inserter.insert(mergedCommit);
+ inserter.flush();
+ return mergedCommitId;
+ } else {
+ return null;
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static Collection<String> getChangedFiles(Repository repository, ObjectId oldCommitId, ObjectId newCommitId) {
+ Collection<String> changedFiles = new HashSet<>();
+ try ( RevWalk revWalk = new RevWalk(repository);
+ TreeWalk treeWalk = new TreeWalk(repository)) {
+ treeWalk.setFilter(TreeFilter.ANY_DIFF);
+ treeWalk.setRecursive(true);
+ RevCommit oldCommit = revWalk.parseCommit(oldCommitId);
+ RevCommit newCommit = revWalk.parseCommit(newCommitId);
+ treeWalk.addTree(oldCommit.getTree());
+ treeWalk.addTree(newCommit.getTree());
+ while (treeWalk.next()) {
+ changedFiles.add(treeWalk.getPathString());
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ return changedFiles;
+ }
+
+ public static boolean isValid(File gitDir) {
+ return new File(gitDir, "objects").exists();
+ }
+
+ public static RefUpdate getRefUpdate(Repository repository, String refName) {
+ try {
+ return repository.updateRef(refName);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void updateRef(RefUpdate refUpdate) {
+ try {
+ RefUpdate.Result result = refUpdate.forceUpdate();
+ if (result == RefUpdate.Result.LOCK_FAILURE
+ && refUpdate.getExpectedOldObjectId() != null
+ && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {
+ throw new ObsoleteCommitException(refUpdate.getOldObjectId());
+ } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED
+ && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {
+ throw new RefUpdateException(result);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void deleteRef(RefUpdate refUpdate) {
+ try {
+ refUpdate.setForceUpdate(true);
+ RefUpdate.Result result = refUpdate.delete();
+ if (result == RefUpdate.Result.LOCK_FAILURE
+ && refUpdate.getExpectedOldObjectId() != null
+ && !refUpdate.getExpectedOldObjectId().equals(refUpdate.getOldObjectId())) {
+ throw new ObsoleteCommitException(refUpdate.getOldObjectId());
+ } else if (result != RefUpdate.Result.FAST_FORWARD && result != RefUpdate.Result.FORCED
+ && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE) {
+ throw new RefUpdateException(result);
+ }
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static void linkRef(RefUpdate refUpdate, String target) {
+ try {
+ RefUpdate.Result result = refUpdate.link(target);
+ if (result != RefUpdate.Result.FORCED && result != RefUpdate.Result.NEW && result != RefUpdate.Result.NO_CHANGE)
+ throw new RefUpdateException(result);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public static List<String> readLines(Repository repository, RevCommit commit, String path,
+ WhitespaceOption whitespaceOption) {
+ try {
+ TreeWalk treeWalk = Preconditions.checkNotNull(TreeWalk.forPath(repository, path, commit.getTree()));
+ ObjectId blobId = treeWalk.getObjectId(0);
+ ObjectReader objectReader = treeWalk.getObjectReader();
+ BlobIdent blobIdent = new BlobIdent(commit.name(), path, FileMode.REGULAR_FILE.getBits());
+ Blob blob = new Blob(blobIdent, blobId, objectReader);
+ List<String> normalizedLines = new ArrayList<>();
+ for (String line: Preconditions.checkNotNull(blob.getText()).getLines()) {
+ normalizedLines.add(whitespaceOption.process(line));
+ }
+ return normalizedLines;
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java b/core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java
new file mode 100644
index 0000000000..503b151b54
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/git/command/CheckoutCommand.java
@@ -0,0 +1,53 @@
+package io.onedev.server.git.command;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class CheckoutCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(CheckoutCommand.class);
+
+ private String refspec;
+
+ public CheckoutCommand(final File gitDir) {
+ super(gitDir);
+ }
+
+ public CheckoutCommand refspec(String refspec) {
+ this.refspec = refspec;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(refspec, "refspec param has to be specified.");
+
+ Commandline cmd = cmd().addArgs("checkout", "--quiet", refspec);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/FetchCommand.java b/core/src/main/java/io/onedev/server/git/command/FetchCommand.java
index ffc3d6209e..3da8bfd9b0 100644
--- a/core/src/main/java/io/onedev/server/git/command/FetchCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/FetchCommand.java
@@ -1,72 +1,74 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Preconditions;
-
-import io.onedev.commons.utils.command.Commandline;
-import io.onedev.commons.utils.command.LineConsumer;
-
-public class FetchCommand extends GitCommand<Void> {
-
- private static final Logger logger = LoggerFactory.getLogger(FetchCommand.class);
-
- private String from;
-
- private String[] refspec = new String[0];
-
- public FetchCommand(final File gitDir) {
- super(gitDir);
- }
-
- public FetchCommand from(String from) {
- this.from = from;
- return this;
- }
-
- public FetchCommand refspec(String... refspec) {
- this.refspec = refspec;
- return this;
- }
-
- @Override
- public Void call() {
- Preconditions.checkNotNull(from, "from param has to be specified.");
-
- Commandline cmd = cmd().addArgs("fetch");
- cmd.addArgs(from);
- cmd.addArgs("--force");
-
- for (String each: refspec)
- cmd.addArgs(each);
-
- cmd.execute(new LineConsumer() {
-
- @Override
- public void consume(String line) {
- logger.trace(line);
- }
-
- }, new LineConsumer() {
-
- @Override
- public void consume(String line) {
- if (line.startsWith("From ")
- || line.startsWith(" * branch")
- || line.startsWith(" * [new ref]")
- || line.contains("..") && line.contains("->")) {
- logger.info(line);
- } else {
- logger.error(line);
- }
- }
-
- }).checkReturnCode();
-
- return null;
- }
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class FetchCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(FetchCommand.class);
+
+ private String from;
+
+ private int depth;
+
+ private String[] refspec = new String[0];
+
+ public FetchCommand(final File gitDir) {
+ super(gitDir);
+ }
+
+ public FetchCommand from(String from) {
+ this.from = from;
+ return this;
+ }
+
+ public FetchCommand refspec(String... refspec) {
+ this.refspec = refspec;
+ return this;
+ }
+
+ public FetchCommand depth(int depth) {
+ this.depth = depth;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(from, "from param has to be specified.");
+
+ Commandline cmd = cmd().addArgs("fetch");
+ cmd.addArgs(from);
+ cmd.addArgs("--force", "--quiet");
+ if (depth != 0)
+ cmd.addArgs("--depth", String.valueOf(depth));
+
+ for (String each: refspec)
+ cmd.addArgs(each);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/GitCommand.java b/core/src/main/java/io/onedev/server/git/command/GitCommand.java
index a327e702bd..706e1890cb 100644
--- a/core/src/main/java/io/onedev/server/git/command/GitCommand.java
+++ b/core/src/main/java/io/onedev/server/git/command/GitCommand.java
@@ -1,107 +1,107 @@
-package io.onedev.server.git.command;
-
-import java.io.File;
-import java.util.Map;
-import java.util.concurrent.Callable;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.exception.ExceptionUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-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> implements Callable<V> {
-
- private static final Logger logger = LoggerFactory.getLogger(GitCommand.class);
-
- private static final String MIN_VERSION = "1.8.0";
-
- protected final File gitDir;
-
- private final Map<String, String> environments;
-
- public GitCommand(File gitDir, @Nullable Map<String, String> environments) {
- this.gitDir = gitDir;
- this.environments = environments;
-
- if (!gitDir.exists())
- FileUtils.createDir(gitDir);
- }
-
- public GitCommand(File gitDir) {
- this(gitDir, null);
- }
-
- /**
- * Check if there are any errors with git command line.
- *
- * @return
- * error message if failed to check git command line,
- * or <tt>null</tt> otherwise
- *
- */
- 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;
- }
- }
-
- public Commandline cmd() {
- String gitExe = getGitExe();
- Commandline cmd = new Commandline(gitExe).workingDir(gitDir);
- if (environments != null)
- cmd.environments(environments);
- return cmd;
- }
-
- protected String getGitExe() {
- return AppLoader.getInstance(GitConfig.class).getExecutable();
- }
-
- @Override
- public abstract V call();
-
-}
+package io.onedev.server.git.command;
+
+import java.io.File;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.exception.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+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> implements Callable<V> {
+
+ private static final Logger logger = LoggerFactory.getLogger(GitCommand.class);
+
+ private static final String MIN_VERSION = "1.8.0";
+
+ protected final File gitDir;
+
+ private final Map<String, String> environments;
+
+ public GitCommand(File gitDir, @Nullable Map<String, String> environments) {
+ this.gitDir = gitDir;
+ this.environments = environments;
+
+ if (!gitDir.exists())
+ FileUtils.createDir(gitDir);
+ }
+
+ public GitCommand(File gitDir) {
+ this(gitDir, null);
+ }
+
+ /**
+ * Check if there are any errors with git command line.
+ *
+ * @return
+ * error message if failed to check git command line,
+ * or <tt>null</tt> otherwise
+ *
+ */
+ 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;
+ }
+ }
+
+ public Commandline cmd() {
+ String gitExe = getGitExe();
+ Commandline cmd = new Commandline(gitExe).workingDir(gitDir);
+ if (environments != null)
+ cmd.environments(environments);
+ return cmd;
+ }
+
+ protected String getGitExe() {
+ return AppLoader.getInstance(GitConfig.class).getExecutable();
+ }
+
+ @Override
+ public abstract V call();
+
+}
diff --git a/core/src/main/java/io/onedev/server/git/command/InitCommand.java b/core/src/main/java/io/onedev/server/git/command/InitCommand.java
new file mode 100644
index 0000000000..777cfadb14
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/git/command/InitCommand.java
@@ -0,0 +1,72 @@
+package io.onedev.server.git.command;
+
+import java.io.File;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+
+public class InitCommand extends GitCommand<Void> {
+
+ private static final Logger logger = LoggerFactory.getLogger(InitCommand.class);
+
+ private String from;
+
+ private String[] refspec = new String[0];
+
+ public InitCommand(final File gitDir) {
+ super(gitDir);
+ }
+
+ public InitCommand from(String from) {
+ this.from = from;
+ return this;
+ }
+
+ public InitCommand refspec(String... refspec) {
+ this.refspec = refspec;
+ return this;
+ }
+
+ @Override
+ public Void call() {
+ Preconditions.checkNotNull(from, "from param has to be specified.");
+
+ Commandline cmd = cmd().addArgs("fetch");
+ cmd.addArgs(from);
+ cmd.addArgs("--force");
+
+ for (String each: refspec)
+ cmd.addArgs(each);
+
+ cmd.execute(new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ logger.trace(line);
+ }
+
+ }, new LineConsumer() {
+
+ @Override
+ public void consume(String line) {
+ if (line.startsWith("From ")
+ || line.startsWith(" * branch")
+ || line.startsWith(" * [new ref]")
+ || line.contains("..") && line.contains("->")) {
+ logger.info(line);
+ } else {
+ logger.error(line);
+ }
+ }
+
+ }).checkReturnCode();
+
+ return null;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/Build2.java b/core/src/main/java/io/onedev/server/model/Build2.java
index edc736e7ad..caad431beb 100644
--- a/core/src/main/java/io/onedev/server/model/Build2.java
+++ b/core/src/main/java/io/onedev/server/model/Build2.java
@@ -1,244 +1,240 @@
-package io.onedev.server.model;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-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.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-import javax.persistence.UniqueConstraint;
-
-import com.fasterxml.jackson.annotation.JsonView;
-
-import io.onedev.server.util.jackson.DefaultView;
-
-@Entity
-@Table(
- indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id"), @Index(columnList="commitHash"),
- @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),
- @Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),
- @Index(columnList="runningDate"), @Index(columnList="finishDate"),
- @Index(columnList="jobInstance")},
- uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})}
-)
-public class Build2 extends AbstractEntity {
-
- private static final long serialVersionUID = 1L;
-
- public static final String STATUS = "status";
-
- public enum Status {
- WAITING, PENDING, RUNNING, SUCCESSFUL, FAILED, IN_ERROR, CANCELLED
- };
-
- @ManyToOne(fetch=FetchType.LAZY)
- @JoinColumn(nullable=false)
- private Project project;
-
- @ManyToOne(fetch=FetchType.LAZY)
- private User user;
-
- @Column(nullable=false)
- private String jobName;
-
- private long number;
-
- // used for number search in markdown editor
- @Column(nullable=false)
- @JsonView(DefaultView.class)
- private String numberStr;
-
- @Column(nullable=false)
- private String commitHash;
-
- @Column(nullable=false)
- private Status status;
-
- @Column(nullable=false)
- private Date submitDate;
-
- private Date pendingDate;
-
- private Date runningDate;
-
- private Date finishDate;
-
- private String jobInstance;
-
- private String statusMessage;
-
- @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)
- private Collection<BuildParam> params = new ArrayList<>();
-
- @OneToMany(mappedBy="dependent", cascade=CascadeType.REMOVE)
- private Collection<BuildDependence> dependencies = new ArrayList<>();
-
- @OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)
- private Collection<BuildDependence> dependents= new ArrayList<>();
-
- private transient Map<String, String> paramMap;
-
- public Project getProject() {
- return project;
- }
-
- public void setProject(Project project) {
- this.project = project;
- }
-
- @Nullable
- public User getUser() {
- return user;
- }
-
- public void setUser(User user) {
- this.user = user;
- }
-
- public String getJobName() {
- return jobName;
- }
-
- public void setJobName(String jobName) {
- this.jobName = jobName;
- }
-
- public long getNumber() {
- return number;
- }
-
- public void setNumber(long number) {
- this.number = number;
- numberStr = String.valueOf(number);
- }
-
- public String getNumberStr() {
- return numberStr;
- }
-
- public void setNumberStr(String numberStr) {
- this.numberStr = numberStr;
- }
-
- public String getCommitHash() {
- return commitHash;
- }
-
- public void setCommitHash(String commitHash) {
- this.commitHash = commitHash;
- }
-
- public Status getStatus() {
- return status;
- }
-
- public void setStatus(Status status) {
- setStatus(status, null);
- }
-
- public void setStatus(Status status, @Nullable String statusMessage) {
- this.status = status;
- this.statusMessage = statusMessage;
- }
-
- public boolean isFinished() {
- return status == Status.IN_ERROR || status == Status.FAILED
- || status == Status.CANCELLED || status == Status.SUCCESSFUL;
- }
-
- public Date getSubmitDate() {
- return submitDate;
- }
-
- public void setSubmitDate(Date submitDate) {
- this.submitDate = submitDate;
- }
-
- public Date getPendingDate() {
- return pendingDate;
- }
-
- public void setPendingDate(Date pendingDate) {
- this.pendingDate = pendingDate;
- }
-
- public Date getRunningDate() {
- return runningDate;
- }
-
- public void setRunningDate(Date runningDate) {
- this.runningDate = runningDate;
- }
-
- public Date getFinishDate() {
- return finishDate;
- }
-
- public void setFinishDate(Date finishDate) {
- this.finishDate = finishDate;
- }
-
- public Collection<BuildParam> getParams() {
- return params;
- }
-
- public void setParams(Collection<BuildParam> params) {
- this.params = params;
- }
-
- public Collection<BuildDependence> getDependencies() {
- return dependencies;
- }
-
- public void setDependencies(Collection<BuildDependence> dependencies) {
- this.dependencies = dependencies;
- }
-
- public Collection<BuildDependence> getDependents() {
- return dependents;
- }
-
- public void setDependents(Collection<BuildDependence> dependents) {
- this.dependents = dependents;
- }
-
- public String getJobInstance() {
- return jobInstance;
- }
-
- public void setJobInstance(String jobInstance) {
- this.jobInstance = jobInstance;
- }
-
- public String getStatusMessage() {
- return statusMessage;
- }
-
- public void setStatusMessage(String statusMessage) {
- this.statusMessage = statusMessage;
- }
-
- public Map<String, String> getParamMap() {
- if (paramMap == null) {
- paramMap = new HashMap<>();
- for (BuildParam param: getParams())
- paramMap.put(param.getName(), param.getValue());
- }
- return paramMap;
- }
-
- public static String getLogWebSocketObservable(Long buildId) {
- return "build-log:" + buildId;
- }
-
-}
+package io.onedev.server.model;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+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.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.fasterxml.jackson.annotation.JsonView;
+
+import io.onedev.server.util.jackson.DefaultView;
+
+@Entity
+@Table(
+ indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id"), @Index(columnList="commitHash"),
+ @Index(columnList="number"), @Index(columnList="jobName"), @Index(columnList="numberStr"),
+ @Index(columnList="status"), @Index(columnList="submitDate"), @Index(columnList="pendingDate"),
+ @Index(columnList="runningDate"), @Index(columnList="finishDate")},
+ uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "number"})}
+)
+public class Build2 extends AbstractEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String STATUS = "status";
+
+ private static final int MAX_STATUS_MESSAGE = 1024;
+
+ public enum Status {
+ WAITING, PENDING, RUNNING, SUCCESSFUL, FAILED, IN_ERROR, CANCELLED
+ };
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ @JoinColumn(nullable=false)
+ private Project project;
+
+ @ManyToOne(fetch=FetchType.LAZY)
+ private User user;
+
+ @Column(nullable=false)
+ private String jobName;
+
+ private long number;
+
+ // used for number search in markdown editor
+ @Column(nullable=false)
+ @JsonView(DefaultView.class)
+ private String numberStr;
+
+ @Column(nullable=false)
+ private String commitHash;
+
+ @Column(nullable=false)
+ private Status status;
+
+ @Column(nullable=false)
+ private Date submitDate;
+
+ private Date pendingDate;
+
+ private Date runningDate;
+
+ private Date finishDate;
+
+ @Column(length=MAX_STATUS_MESSAGE)
+ private String statusMessage;
+
+ @OneToMany(mappedBy="build", cascade=CascadeType.REMOVE)
+ private Collection<BuildParam> params = new ArrayList<>();
+
+ @OneToMany(mappedBy="dependent", cascade=CascadeType.REMOVE)
+ private Collection<BuildDependence> dependencies = new ArrayList<>();
+
+ @OneToMany(mappedBy="dependency", cascade=CascadeType.REMOVE)
+ private Collection<BuildDependence> dependents= new ArrayList<>();
+
+ private transient Map<String, String> paramMap;
+
+ public Project getProject() {
+ return project;
+ }
+
+ public void setProject(Project project) {
+ this.project = project;
+ }
+
+ @Nullable
+ public User getUser() {
+ return user;
+ }
+
+ public void setUser(User user) {
+ this.user = user;
+ }
+
+ public String getJobName() {
+ return jobName;
+ }
+
+ public void setJobName(String jobName) {
+ this.jobName = jobName;
+ }
+
+ public long getNumber() {
+ return number;
+ }
+
+ public void setNumber(long number) {
+ this.number = number;
+ numberStr = String.valueOf(number);
+ }
+
+ public String getNumberStr() {
+ return numberStr;
+ }
+
+ public void setNumberStr(String numberStr) {
+ this.numberStr = numberStr;
+ }
+
+ public String getCommitHash() {
+ return commitHash;
+ }
+
+ public void setCommitHash(String commitHash) {
+ this.commitHash = commitHash;
+ }
+
+ public Status getStatus() {
+ return status;
+ }
+
+ public void setStatus(Status status) {
+ setStatus(status, null);
+ }
+
+ public void setStatus(Status status, @Nullable String statusMessage) {
+ this.status = status;
+ setStatusMessage(statusMessage);
+ }
+
+ public boolean isFinished() {
+ return status == Status.IN_ERROR || status == Status.FAILED
+ || status == Status.CANCELLED || status == Status.SUCCESSFUL;
+ }
+
+ public Date getSubmitDate() {
+ return submitDate;
+ }
+
+ public void setSubmitDate(Date submitDate) {
+ this.submitDate = submitDate;
+ }
+
+ public Date getPendingDate() {
+ return pendingDate;
+ }
+
+ public void setPendingDate(Date pendingDate) {
+ this.pendingDate = pendingDate;
+ }
+
+ public Date getRunningDate() {
+ return runningDate;
+ }
+
+ public void setRunningDate(Date runningDate) {
+ this.runningDate = runningDate;
+ }
+
+ public Date getFinishDate() {
+ return finishDate;
+ }
+
+ public void setFinishDate(Date finishDate) {
+ this.finishDate = finishDate;
+ }
+
+ public Collection<BuildParam> getParams() {
+ return params;
+ }
+
+ public void setParams(Collection<BuildParam> params) {
+ this.params = params;
+ }
+
+ public Collection<BuildDependence> getDependencies() {
+ return dependencies;
+ }
+
+ public void setDependencies(Collection<BuildDependence> dependencies) {
+ this.dependencies = dependencies;
+ }
+
+ public Collection<BuildDependence> getDependents() {
+ return dependents;
+ }
+
+ public void setDependents(Collection<BuildDependence> dependents) {
+ this.dependents = dependents;
+ }
+
+ public String getStatusMessage() {
+ return statusMessage;
+ }
+
+ public void setStatusMessage(String statusMessage) {
+ if (statusMessage != null)
+ statusMessage = StringUtils.abbreviate(statusMessage, MAX_STATUS_MESSAGE);
+ this.statusMessage = statusMessage;
+ }
+
+ public Map<String, String> getParamMap() {
+ if (paramMap == null) {
+ paramMap = new HashMap<>();
+ for (BuildParam param: getParams())
+ paramMap.put(param.getName(), param.getValue());
+ }
+ return paramMap;
+ }
+
+ public static String getLogWebSocketObservable(Long buildId) {
+ return "build-log:" + buildId;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
index c389eef514..70219c063a 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/JobExecutor.java
@@ -1,92 +1,143 @@
-package io.onedev.server.model.support.jobexecutor;
-
-import java.io.Serializable;
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import io.onedev.server.ci.job.JobCallback;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.editable.annotation.ProjectPatterns;
-
-@Editable
-public abstract class JobExecutor implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private boolean enabled = true;
-
- private String projects;
-
- private String branches;
-
- private String jobs;
-
- private String environments;
-
- public boolean isEnabled() {
- return enabled;
- }
-
- public void setEnabled(boolean enabled) {
- this.enabled = enabled;
- }
-
- @Editable(order=100, name="Applicable Projects",
- description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match. "
- + "Leave empty to match all projects")
- @ProjectPatterns
- public String getProjects() {
- return projects;
- }
-
- public void setProjects(String projects) {
- this.projects = projects;
- }
-
- @Editable(order=200, name="Applicable Branches",
- description="Optionally specify space-separated branches applicable for this executor. When run a job "
- + "against a particular commit, all branches able to reaching the commit will be checked. "
- + "Use * or ? for wildcard match. Leave empty to match all branches.")
- @Patterns
- public String getBranches() {
- return branches;
- }
-
- public void setBranches(String branches) {
- this.branches = branches;
- }
-
- @Editable(order=300, name="Applicable Jobs",
- description="Optionally specify space-separated jobs applicable for this executor. Use * or ? for wildcard match. "
- + "Leave empty to match all jobs")
- @Patterns
- public String getJobs() {
- return jobs;
- }
-
- public void setJobs(String jobs) {
- this.jobs = jobs;
- }
-
- @Editable(order=400, name="Applicable Environments",
- description="Optionally specify space-separated environments applicable for this executor. Use * or ? for wildcard match. "
- + "Leave empty to match all images")
- @Patterns
- public String getEnvironments() {
- return environments;
- }
-
- public void setEnvironments(String environments) {
- this.environments = environments;
- }
-
- @Nullable
- public abstract String run(String environment, List<String> commands, JobCallback callback);
-
- public abstract boolean isRunning(String runningInstance);
-
- public abstract void stop(String runningInstance);
-
-}
+package io.onedev.server.model.support.jobexecutor;
+
+import java.io.File;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.eclipse.jgit.lib.ObjectId;
+import org.slf4j.Logger;
+
+import com.google.common.base.Preconditions;
+import com.google.common.collect.Sets;
+
+import io.onedev.commons.launcher.bootstrap.Bootstrap;
+import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
+import io.onedev.commons.utils.stringmatch.Matcher;
+import io.onedev.server.OneDev;
+import io.onedev.server.cache.CommitInfoManager;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.RefInfo;
+import io.onedev.server.model.Project;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
+import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.web.editable.annotation.ProjectPatterns;
+
+@Editable
+public abstract class JobExecutor implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public static final String ENVIRONMENT_WORKSPACE = "onedev-workspace";
+
+ private boolean enabled = true;
+
+ private String projects;
+
+ private String branches;
+
+ private String jobs;
+
+ private String environments;
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public void setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ }
+
+ @Editable(order=100, name="Applicable Projects",
+ description="Optionally specify space-separated projects applicable for this executor. Use * or ? for wildcard match. "
+ + "Leave empty to match all projects")
+ @ProjectPatterns
+ @NameOfEmptyValue("All")
+ public String getProjects() {
+ return projects;
+ }
+
+ public void setProjects(String projects) {
+ this.projects = projects;
+ }
+
+ @Editable(order=200, name="Applicable Branches",
+ description="Optionally specify space-separated branches applicable for this executor. When run a job "
+ + "against a particular commit, all branches able to reaching the commit will be checked. "
+ + "Use * or ? for wildcard match. Leave empty to match all branches.")
+ @Patterns
+ @NameOfEmptyValue("All")
+ public String getBranches() {
+ return branches;
+ }
+
+ public void setBranches(String branches) {
+ this.branches = branches;
+ }
+
+ @Editable(order=300, name="Applicable Jobs",
+ description="Optionally specify space-separated jobs applicable for this executor. Use * or ? for wildcard match. "
+ + "Leave empty to match all jobs")
+ @Patterns
+ @NameOfEmptyValue("All")
+ public String getJobs() {
+ return jobs;
+ }
+
+ public void setJobs(String jobs) {
+ this.jobs = jobs;
+ }
+
+ @Editable(order=400, name="Applicable Environments",
+ description="Optionally specify space-separated environments applicable for this executor. Use * or ? for wildcard match. "
+ + "Leave empty to match all images")
+ @Patterns
+ @NameOfEmptyValue("All")
+ public String getEnvironments() {
+ return environments;
+ }
+
+ public void setEnvironments(String environments) {
+ this.environments = environments;
+ }
+
+ public File createWorkspace() {
+ return Bootstrap.createTempDir("workspace");
+ }
+
+ public abstract void execute(String environment, List<String> commands,
+ @Nullable SourceSnapshot snapshot, Logger logger);
+
+ public final boolean isApplicable(Project project, ObjectId commitId, String jobName, String image) {
+ Matcher matcher = new ChildAwareMatcher();
+
+ if (isEnabled()
+ && (getProjects() == null || PatternSet.fromString(getProjects()).matches(matcher, project.getName()))
+ && (getJobs() == null || PatternSet.fromString(getJobs()).matches(matcher, jobName))
+ && (getEnvironments() == null || PatternSet.fromString(getEnvironments()).matches(matcher, image))) {
+ if (getBranches() == null)
+ return true;
+
+ CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
+ Collection<ObjectId> descendants = commitInfoManager.getDescendants(project, Sets.newHashSet(commitId));
+ descendants.add(commitId);
+
+ PatternSet branchPatterns = PatternSet.fromString(getBranches());
+ for (RefInfo ref: project.getBranches()) {
+ String branchName = Preconditions.checkNotNull(GitUtils.ref2branch(ref.getRef().getName()));
+ if (descendants.contains(ref.getPeeledObj()) && branchPatterns.matches(matcher, branchName))
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public boolean hasCapacity() {
+ return true;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
new file mode 100644
index 0000000000..b1373761ab
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/KubernetesExecutor.java
@@ -0,0 +1,21 @@
+package io.onedev.server.model.support.jobexecutor;
+
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.slf4j.Logger;
+
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable(order=300)
+public class KubernetesExecutor extends JobExecutor {
+
+ private static final long serialVersionUID = 1L;
+
+ public void execute(String environment, List<String> commands,
+ @Nullable SourceSnapshot snapshot, Logger logger) {
+ throw new UnsupportedOperationException();
+ }
+
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java
index 3f73c09810..9b0ed5986b 100644
--- a/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/LocalDockerExecutor.java
@@ -1,75 +1,400 @@
-package io.onedev.server.model.support.jobexecutor;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-import io.onedev.server.ci.job.JobCallback;
-import io.onedev.server.ci.job.JobResult;
-import io.onedev.server.web.editable.annotation.Editable;
-
-@Editable(order=100)
-public class LocalDockerExecutor extends JobExecutor {
-
- private static final long serialVersionUID = 1L;
-
- private static final int MAX_JOBS = 5;
-
- private static final Map<String, Thread> threads = new HashMap<>();
-
- @Override
- public String run(String environment, List<String> commands, JobCallback callback) {
- synchronized (threads) {
- if (threads.size() < MAX_JOBS) {
- String jobInstance = UUID.randomUUID().toString();
- Thread thread = new Thread(new Runnable() {
-
- @Override
- public void run() {
- JobResult result = JobResult.SUCCESSFUL;
- try {
- callback.getJobLogger().info("hello world");
- callback.getJobLogger().error("may i help u");
- callback.getJobLogger().debug("just do it");
- callback.getJobLogger().trace("I am a grace");
- callback.getJobLogger().warn("wow\nyou are clever");
- callback.getJobLogger().warn(""
- + "wow2\n"
- + " you are clever\n"
- + " don't you?");
- } finally {
- synchronized (threads) {
- threads.remove(jobInstance);
- }
- callback.jobFinished(result, null);
- }
- }
-
- });
- threads.put(jobInstance, thread);
- thread.start();
- return jobInstance;
- } else {
- return null;
- }
- }
- }
-
- @Override
- public boolean isRunning(String jobInstance) {
- synchronized (threads) {
- return threads.containsKey(jobInstance);
- }
- }
-
- @Override
- public void stop(String jobInstance) {
- synchronized (threads) {
- Thread thread = threads.get(jobInstance);
- if (thread != null)
- thread.interrupt();
- }
- }
-
+package io.onedev.server.model.support.jobexecutor;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+import javax.validation.ConstraintValidatorContext;
+
+import org.apache.commons.codec.Charsets;
+import org.hibernate.validator.constraints.NotEmpty;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.base.Joiner;
+
+import io.onedev.commons.utils.FileUtils;
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.commons.utils.command.Commandline;
+import io.onedev.commons.utils.command.LineConsumer;
+import io.onedev.commons.utils.command.ProcessKiller;
+import io.onedev.commons.utils.concurrent.ConstrainedRunner;
+import io.onedev.server.model.support.jobexecutor.LocalDockerExecutor.TestData;
+import io.onedev.server.util.OneContext;
+import io.onedev.server.util.validation.Validatable;
+import io.onedev.server.util.validation.annotation.ClassValidating;
+import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.web.editable.annotation.Password;
+import io.onedev.server.web.editable.annotation.ShowCondition;
+import io.onedev.server.web.util.Testable;
+
+@Editable(order=100)
+@ClassValidating
+public class LocalDockerExecutor extends JobExecutor implements Testable<TestData>, Validatable {
+
+ private static final long serialVersionUID = 1L;
+
+ private static final Logger logger = LoggerFactory.getLogger(LocalDockerExecutor.class);
+
+ private String dockerExecutable;
+
+ private String dockerRegistry;
+
+ private boolean authenticateToRegistry;
+
+ private String userName;
+
+ private String password;
+
+ private String runOptions;
+
+ private int capability = Runtime.getRuntime().availableProcessors();
+
+ private transient ConstrainedRunner runner;
+
+ @Editable(order=1000, description="Optionally specify docker executable, for instance <i>/usr/local/bin/docker</i>. "
+ + "Leave empty to use docker executable in PATH")
+ public String getDockerExecutable() {
+ return dockerExecutable;
+ }
+
+ public void setDockerExecutable(String dockerExecutable) {
+ this.dockerExecutable = dockerExecutable;
+ }
+
+ @Editable(order=1100, description="Optionally specify a docker registry to use. Leave empty to use the official registry")
+ public String getDockerRegistry() {
+ return dockerRegistry;
+ }
+
+ public void setDockerRegistry(String dockerRegistry) {
+ this.dockerRegistry = dockerRegistry;
+ }
+
+ @Editable(order=1150)
+ public boolean isAuthenticateToRegistry() {
+ return authenticateToRegistry;
+ }
+
+ public void setAuthenticateToRegistry(boolean authenticateToRegistry) {
+ this.authenticateToRegistry = authenticateToRegistry;
+ }
+
+ @Editable(order=1200, description="Specify user name to access docker registry")
+ @NotEmpty
+ @ShowCondition("isRegistryAuthenticationRequired")
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ @Editable(order=1300, description="Specify password to access docker registry")
+ @Password
+ @NotEmpty
+ @ShowCondition("isRegistryAuthenticationRequired")
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ @Editable(order=1400, description="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() {
+ return runOptions;
+ }
+
+ public void setRunOptions(String runOptions) {
+ this.runOptions = runOptions;
+ }
+
+ public static boolean isRegistryAuthenticationRequired() {
+ return (boolean) OneContext.get().getEditContext().getInputValue("authenticateToRegistry");
+ }
+
+ @Editable(order=1400, 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 getCapability() {
+ return capability;
+ }
+
+ public void setCapability(int capability) {
+ this.capability = capability;
+ }
+
+ private Commandline getDockerCmd() {
+ if (getDockerExecutable() != null)
+ return new Commandline(getDockerExecutable());
+ else
+ return new Commandline("docker");
+ }
+
+ private String getPullImage(String image) {
+ if (getDockerRegistry() != null) {
+ if (image.contains("/"))
+ return getDockerRegistry() + "/" + image;
+ else
+ return getDockerRegistry() + "/library/" + image;
+ } else {
+ return image;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ private String getImageOS(Logger logger, String image) {
+ logger.info("Checking image OS...");
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("inspect", image);
+
+ StringBuilder output = new StringBuilder();
+ cmd.execute(new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ logger.debug(line);
+ output.append(line).append("\n");
+ }
+
+ }, newErrorLogger(logger)).checkReturnCode();
+
+ Map<String, Object> map;
+ try {
+ map = (Map<String, Object>) new ObjectMapper()
+ .readValue(output.toString(), List.class).iterator().next();
+ return (String) map.get("Os");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ private synchronized ConstrainedRunner getRunner() {
+ if (runner == null)
+ runner = new ConstrainedRunner(capability);
+ return runner;
+ }
+
+ @Override
+ public boolean hasCapacity() {
+ return getRunner().hasCapacity();
+ }
+
+ @Override
+ public void execute(String environment, List<String> commands,
+ @Nullable SourceSnapshot snapshot, Logger logger) {
+ getRunner().run(new Runnable() {
+
+ @Override
+ public void run() {
+ String jobInstance = UUID.randomUUID().toString();
+ File workspace = createWorkspace();
+ try {
+ if (snapshot != null) {
+ logger.info("Cloning source code...");
+ snapshot.checkout(workspace);
+ }
+
+ login(logger);
+
+ logger.info("Pulling image...") ;
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("pull", getPullImage(environment));
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
+
+ cmd.clearArgs();
+ cmd.addArgs("run", "--rm", "--name", jobInstance);
+ if (getRunOptions() != null)
+ cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+
+ String imageOS = getImageOS(logger, environment);
+
+ if (imageOS.equals("windows")) {
+ logger.info("Image OS is windows, run commands with cmd.exe...");
+ String environmentWorkspacePath = "C:\\" + ENVIRONMENT_WORKSPACE;
+ File scriptFile = new File(workspace, "onedev-job-commands.bat");
+ FileUtils.writeLines(scriptFile, commands, "\r\n");
+ cmd.addArgs("-v", workspace.getAbsolutePath() + ":" + environmentWorkspacePath);
+ cmd.addArgs("-w", environmentWorkspacePath);
+ cmd.addArgs(environment);
+ cmd.addArgs("cmd", "/c", environmentWorkspacePath + "\\onedev-job-commands.bat");
+ } else {
+ logger.info("Image OS is " + imageOS + ", run commands with sh...");
+ String environmentWorkspacePath = "/" + ENVIRONMENT_WORKSPACE;
+ File scriptFile = new File(workspace, "onedev-job-commands.sh");
+ FileUtils.writeLines(scriptFile, commands, "\n");
+ cmd.addArgs("-v", workspace.getAbsolutePath() + ":" + environmentWorkspacePath);
+ cmd.addArgs("-w", environmentWorkspacePath);
+ cmd.addArgs(environment);
+ cmd.addArgs("sh", "-c", environmentWorkspacePath + "/onedev-job-commands.sh");
+ }
+
+ logger.info("Running container to execute job...");
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger), null, new ProcessKiller() {
+
+ @Override
+ public void kill(Process process) {
+ logger.info("Stopping container...");
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("stop", jobInstance);
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger));
+ }
+
+ }).checkReturnCode();
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ } finally {
+ logger.info("Deleting workspace...");
+ FileUtils.deleteDir(workspace);
+ }
+ }
+
+ });
+ }
+
+ private LineConsumer newInfoLogger(Logger logger) {
+ return new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ logger.info(line);
+ }
+
+ };
+ }
+
+ private LineConsumer newErrorLogger(Logger logger) {
+ return new LineConsumer(Charsets.UTF_8.name()) {
+
+ @Override
+ public void consume(String line) {
+ logger.error(line);
+ }
+
+ };
+ }
+
+ private void login(Logger logger) {
+ if (isAuthenticateToRegistry()) {
+ logger.info("Login to docker registry...");
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("login", "-u", getUserName(), "--password-stdin");
+ if (getDockerRegistry() != null)
+ cmd.addArgs(getDockerRegistry());
+ ByteArrayInputStream input;
+ try {
+ input = new ByteArrayInputStream(getPassword().getBytes(Charsets.UTF_8.name()));
+ } catch (UnsupportedEncodingException e) {
+ throw new RuntimeException(e);
+ }
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger), input).checkReturnCode();
+ }
+ }
+
+ private boolean hasOptions(String[] arguments, String... options) {
+ for (String argument: arguments) {
+ for (String option: options) {
+ if (option.startsWith("--")) {
+ if (argument.startsWith(option + "=") || argument.equals(option))
+ return true;
+ } else if (option.startsWith("-")) {
+ if (argument.startsWith(option))
+ return true;
+ } else {
+ throw new RuntimeException("Invalid option: " + option);
+ }
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public boolean isValid(ConstraintValidatorContext context) {
+ if (getRunOptions() != null) {
+ String[] arguments = StringUtils.parseQuoteTokens(getRunOptions());
+ String invalidOptions[] = new String[] {"-w", "--workdir", "-d", "--detach", "-a", "--attach", "-t", "--tty",
+ "-i", "--interactive", "--rm", "--restart", "--name"};
+ if (hasOptions(arguments, invalidOptions)) {
+ context.disableDefaultConstraintViolation();
+ StringBuilder errorMessage = new StringBuilder("Can not use options: "
+ + Joiner.on(", ").join(invalidOptions));
+ context.buildConstraintViolationWithTemplate(errorMessage.toString())
+ .addPropertyNode("runOptions").addConstraintViolation();
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public void test(TestData testData) {
+ logger.info("Testing local docker executor...");
+
+ login(logger);
+
+ logger.info("Pulling image...");
+
+ Commandline cmd = getDockerCmd();
+ cmd.addArgs("pull", getPullImage(testData.getDockerImage()));
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
+
+ String imageOS = getImageOS(logger, testData.getDockerImage());
+
+ logger.info("Running container...");
+ File workspaceDir = FileUtils.createTempDir("workspace");
+ try {
+ cmd.clearArgs();
+ cmd.addArgs("run", "--rm");
+ if (getRunOptions() != null)
+ cmd.addArgs(StringUtils.parseQuoteTokens(getRunOptions()));
+ if (imageOS.equals("windows")) {
+ String environmentWorkspacePath = "C:\\" + ENVIRONMENT_WORKSPACE;
+ cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + environmentWorkspacePath);
+ cmd.addArgs("-w", environmentWorkspacePath);
+ cmd.addArgs(testData.getDockerImage());
+ cmd.addArgs("cmd", "/c", "echo this is a test");
+ } else {
+ String environmentWorkspacePath = "/" + ENVIRONMENT_WORKSPACE;
+ cmd.addArgs("-v", workspaceDir.getAbsolutePath() + ":" + environmentWorkspacePath);
+ cmd.addArgs("-w", environmentWorkspacePath);
+ cmd.addArgs(testData.getDockerImage());
+ cmd.addArgs("sh", "-c", "echo this is a test");
+ }
+ cmd.execute(newInfoLogger(logger), newErrorLogger(logger)).checkReturnCode();
+ } finally {
+ FileUtils.deleteDir(workspaceDir);
+ }
+ }
+
+ @Editable(name="Specify a Docker Image to Test Against")
+ public static class TestData implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private String dockerImage;
+
+ @Editable
+ @OmitName
+ @NotEmpty
+ public String getDockerImage() {
+ return dockerImage;
+ }
+
+ public void setDockerImage(String dockerImage) {
+ this.dockerImage = dockerImage;
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java
new file mode 100644
index 0000000000..a5601145a7
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/jobexecutor/SourceSnapshot.java
@@ -0,0 +1,41 @@
+package io.onedev.server.model.support.jobexecutor;
+
+import java.io.File;
+
+import org.eclipse.jgit.api.Git;
+import org.eclipse.jgit.lib.ObjectId;
+
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.server.git.command.CheckoutCommand;
+import io.onedev.server.git.command.FetchCommand;
+import io.onedev.server.model.Project;
+
+public class SourceSnapshot {
+
+ private final Project project;
+
+ private final ObjectId commitId;
+
+ public SourceSnapshot(Project project, ObjectId commitId) {
+ this.project = project;
+ this.commitId = commitId;
+ }
+
+ public Project getProject() {
+ return project;
+ }
+
+ public ObjectId getCommitId() {
+ return commitId;
+ }
+
+ public void checkout(File dir) {
+ try (Git git = Git.init().setDirectory(dir).call()) {
+ new FetchCommand(dir).depth(1).from(project.getGitDir().getAbsolutePath()).refspec(commitId.name()).call();
+ new CheckoutCommand(dir).refspec(commitId.name()).call();
+ } catch (Exception e) {
+ throw ExceptionUtils.unchecked(e);
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index ed393b3c5a..7682e9c19d 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -1,256 +1,256 @@
-package io.onedev.server.web;
-
-import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
-import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
-import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
-import org.apache.wicket.core.request.mapper.ResourceMapper;
-import org.apache.wicket.markup.html.pages.BrowserInfoPage;
-import org.apache.wicket.protocol.http.WebApplication;
-import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.Url;
-import org.apache.wicket.request.mapper.CompoundRequestMapper;
-
-import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
-import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
-import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;
-import io.onedev.server.web.page.admin.group.GroupListPage;
-import io.onedev.server.web.page.admin.group.GroupMembershipsPage;
-import io.onedev.server.web.page.admin.group.GroupProfilePage;
-import io.onedev.server.web.page.admin.group.NewGroupPage;
-import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;
-import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;
-import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;
-import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
-import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;
-import io.onedev.server.web.page.admin.jobexecutors.JobExecutorPage;
-import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
-import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
-import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
-import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
-import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
-import io.onedev.server.web.page.admin.user.NewUserPage;
-import io.onedev.server.web.page.admin.user.UserAuthorizationsPage;
-import io.onedev.server.web.page.admin.user.UserAvatarPage;
-import io.onedev.server.web.page.admin.user.UserListPage;
-import io.onedev.server.web.page.admin.user.UserMembershipsPage;
-import io.onedev.server.web.page.admin.user.UserPasswordPage;
-import io.onedev.server.web.page.admin.user.UserProfilePage;
-import io.onedev.server.web.page.admin.user.UserTokenPage;
-import io.onedev.server.web.page.init.ServerInitPage;
-import io.onedev.server.web.page.my.MyAvatarPage;
-import io.onedev.server.web.page.my.MyPasswordPage;
-import io.onedev.server.web.page.my.MyProfilePage;
-import io.onedev.server.web.page.my.MyTokenPage;
-import io.onedev.server.web.page.project.NewProjectPage;
-import io.onedev.server.web.page.project.NoCommitsPage;
-import io.onedev.server.web.page.project.ProjectListPage;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
-import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;
-import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
-import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
-import io.onedev.server.web.page.project.issues.create.NewIssuePage;
-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
-import io.onedev.server.web.page.project.issues.list.IssueListPage;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
-import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
-import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;
-import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;
-import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
-import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
-import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
-import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
-import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
-import io.onedev.server.web.page.project.pullrequests.list.PullRequestListPage;
-import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;
-import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
-import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;
-import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;
-import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;
-import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;
-import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;
-import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
-import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;
-import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;
-import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;
-import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
-import io.onedev.server.web.page.project.stats.ProjectContribsPage;
-import io.onedev.server.web.page.project.stats.SourceLinesPage;
-import io.onedev.server.web.page.project.tags.ProjectTagsPage;
-import io.onedev.server.web.page.security.ForgetPage;
-import io.onedev.server.web.page.security.LoginPage;
-import io.onedev.server.web.page.security.LogoutPage;
-import io.onedev.server.web.page.security.RegisterPage;
-import io.onedev.server.web.stream.ArchiveStreamResourceReference;
-import io.onedev.server.web.stream.AttachmentStreamResourceReference;
-import io.onedev.server.web.stream.BuildLogStreamResourceReference;
-import io.onedev.server.web.stream.RawBlobStreamResourceReference;
-import io.onedev.server.web.stream.ServerLogStreamResourceReference;
-import io.onedev.server.web.util.mapper.OnePageMapper;
-import io.onedev.server.web.util.mapper.OneResourceMapper;
-
-public class OneUrlMapper extends CompoundRequestMapper {
-
- public OneUrlMapper(WebApplication app) {
- add(new OnePageMapper("init", ServerInitPage.class));
- add(new OnePageMapper("loading", BrowserInfoPage.class));
- addProjectPages();
- addMyPages();
- addAdministrationPages();
- addSecurityPages();
-
- addResources();
- }
-
- private void addMyPages() {
- add(new OnePageMapper("my/profile", MyProfilePage.class));
- add(new OnePageMapper("my/avatar", MyAvatarPage.class));
- add(new OnePageMapper("my/password", MyPasswordPage.class));
- add(new OnePageMapper("my/token", MyTokenPage.class));
- }
-
- private void addResources() {
- add(new ResourceMapper("server-log-stream", new ServerLogStreamResourceReference()));
- add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveStreamResourceReference()));
- add(new ResourceMapper("projects/${project}/builds/${build}/log-stream", new BuildLogStreamResourceReference()));
-
- add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobStreamResourceReference()));
- add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}",
- new AttachmentStreamResourceReference()));
- }
-
- private void addSecurityPages() {
- add(new OnePageMapper("login", LoginPage.class));
- add(new OnePageMapper("logout", LogoutPage.class));
- add(new OnePageMapper("register", RegisterPage.class));
- add(new OnePageMapper("forget", ForgetPage.class));
- }
-
- private void addAdministrationPages() {
- add(new OnePageMapper("administration/users", UserListPage.class));
- add(new OnePageMapper("administration/users/new", NewUserPage.class));
- add(new OnePageMapper("administration/users/${user}/profile", UserProfilePage.class));
- add(new OnePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));
- add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));
- add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));
- add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));
- add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));
-
- add(new OnePageMapper("administration/groups", GroupListPage.class));
- add(new OnePageMapper("administration/groups/new", NewGroupPage.class));
- add(new OnePageMapper("administration/groups/${group}/profile", GroupProfilePage.class));
- add(new OnePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));
- add(new OnePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));
-
- add(new OnePageMapper("administration/settings/system", SystemSettingPage.class));
- add(new OnePageMapper("administration/settings/mail", MailSettingPage.class));
- add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));
- add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));
- add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));
-
- add(new OnePageMapper("administration/settings/job-executor", JobExecutorPage.class));
-
- add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));
- add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));
- add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));
- add(new OnePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));
- add(new OnePageMapper("administration/settings/default-issue-queries", DefaultQueryListPage.class));
-
- add(new OnePageMapper("administration/server-log", ServerLogPage.class));
- add(new OnePageMapper("administration/server-information", ServerInformationPage.class));
- }
-
- private void addProjectPages() {
- add(new OnePageMapper("projects", ProjectListPage.class) {
-
- /*
- * This logic is added to prevent url "/" from being redirected to "/projects"
- */
- @Override
- public Url mapHandler(IRequestHandler requestHandler) {
- if (requestHandler instanceof BookmarkablePageRequestHandler
- || requestHandler instanceof RenderPageRequestHandler) {
- IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;
- if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) {
- return null;
- }
- }
- return super.mapHandler(requestHandler);
- }
-
- });
- add(new OnePageMapper("projects/new", NewProjectPage.class));
- add(new OnePageMapper("projects/${project}", ProjectBlobPage.class));
-
- add(new OnePageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {
-
- /*
- * This logic is added to prevent url "/projects/<project>" from being redirected to
- * "/projects/<project>/blob"
- */
- @Override
- public Url mapHandler(IRequestHandler requestHandler) {
- if (requestHandler instanceof BookmarkablePageRequestHandler
- || requestHandler instanceof RenderPageRequestHandler) {
- IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;
- if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class
- && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {
- return null;
- }
- }
- return super.mapHandler(requestHandler);
- }
-
- });
- add(new OnePageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));
- add(new OnePageMapper("projects/${project}/commits", ProjectCommitsPage.class));
- add(new OnePageMapper("projects/${project}/compare", RevisionComparePage.class));
- add(new OnePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));
- add(new OnePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));
-
- add(new OnePageMapper("projects/${project}/branches", ProjectBranchesPage.class));
- add(new OnePageMapper("projects/${project}/tags", ProjectTagsPage.class));
- add(new OnePageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class));
-
- add(new OnePageMapper("projects/${project}/pulls", PullRequestListPage.class));
- add(new OnePageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));
- add(new OnePageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));
- add(new OnePageMapper("projects/${project}/pulls/${request}/activities", PullRequestActivitiesPage.class));
- add(new OnePageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));
- add(new OnePageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));
- add(new OnePageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));
- add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidRequestPage.class));
-
- add(new OnePageMapper("projects/${project}/issue-boards", IssueBoardsPage.class));
- add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));
- add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));
- add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
- add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
- add(new OnePageMapper("projects/${project}/builds/${build}", BuildDetailPage.class));
- add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));
- add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));
- add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));
- add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));
-
- add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
- add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));
- add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));
- add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));
- add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));
- add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));
- add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",
- PromptFieldsUponIssueOpenSettingPage.class));
- add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));
- add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
- add(new OnePageMapper("projects/${project}/settings/configurations", ConfigurationListPage.class));
- add(new OnePageMapper("projects/${project}/settings/configurations/new", NewConfigurationPage.class));
- add(new OnePageMapper("projects/${project}/settings/configurations/${configuration}", ConfigurationEditPage.class));
-
- add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.class));
- }
-
-}
+package io.onedev.server.web;
+
+import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
+import org.apache.wicket.core.request.handler.IPageClassRequestHandler;
+import org.apache.wicket.core.request.handler.RenderPageRequestHandler;
+import org.apache.wicket.core.request.mapper.ResourceMapper;
+import org.apache.wicket.markup.html.pages.BrowserInfoPage;
+import org.apache.wicket.protocol.http.WebApplication;
+import org.apache.wicket.request.IRequestHandler;
+import org.apache.wicket.request.Url;
+import org.apache.wicket.request.mapper.CompoundRequestMapper;
+
+import io.onedev.server.web.page.admin.authenticator.AuthenticatorPage;
+import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
+import io.onedev.server.web.page.admin.group.GroupAuthorizationsPage;
+import io.onedev.server.web.page.admin.group.GroupListPage;
+import io.onedev.server.web.page.admin.group.GroupMembershipsPage;
+import io.onedev.server.web.page.admin.group.GroupProfilePage;
+import io.onedev.server.web.page.admin.group.NewGroupPage;
+import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;
+import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;
+import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;
+import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;
+import io.onedev.server.web.page.admin.jobexecutors.JobExecutorPage;
+import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
+import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
+import io.onedev.server.web.page.admin.serverinformation.ServerInformationPage;
+import io.onedev.server.web.page.admin.serverlog.ServerLogPage;
+import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
+import io.onedev.server.web.page.admin.user.NewUserPage;
+import io.onedev.server.web.page.admin.user.UserAuthorizationsPage;
+import io.onedev.server.web.page.admin.user.UserAvatarPage;
+import io.onedev.server.web.page.admin.user.UserListPage;
+import io.onedev.server.web.page.admin.user.UserMembershipsPage;
+import io.onedev.server.web.page.admin.user.UserPasswordPage;
+import io.onedev.server.web.page.admin.user.UserProfilePage;
+import io.onedev.server.web.page.admin.user.UserTokenPage;
+import io.onedev.server.web.page.init.ServerInitPage;
+import io.onedev.server.web.page.my.MyAvatarPage;
+import io.onedev.server.web.page.my.MyPasswordPage;
+import io.onedev.server.web.page.my.MyProfilePage;
+import io.onedev.server.web.page.my.MyTokenPage;
+import io.onedev.server.web.page.project.NewProjectPage;
+import io.onedev.server.web.page.project.NoCommitsPage;
+import io.onedev.server.web.page.project.ProjectListPage;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.branches.ProjectBranchesPage;
+import io.onedev.server.web.page.project.builds2.detail.BuildDetailPage;
+import io.onedev.server.web.page.project.comments.ProjectCodeCommentsPage;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
+import io.onedev.server.web.page.project.compare.RevisionComparePage;
+import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;
+import io.onedev.server.web.page.project.issues.create.NewIssuePage;
+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
+import io.onedev.server.web.page.project.issues.list.IssueListPage;
+import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
+import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;
+import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;
+import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;
+import io.onedev.server.web.page.project.pullrequests.InvalidRequestPage;
+import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
+import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
+import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;
+import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
+import io.onedev.server.web.page.project.pullrequests.detail.mergepreview.MergePreviewPage;
+import io.onedev.server.web.page.project.pullrequests.list.PullRequestListPage;
+import io.onedev.server.web.page.project.setting.authorization.ProjectAuthorizationsPage;
+import io.onedev.server.web.page.project.setting.avatar.AvatarEditPage;
+import io.onedev.server.web.page.project.setting.branchprotection.BranchProtectionPage;
+import io.onedev.server.web.page.project.setting.commitmessagetransform.CommitMessageTransformPage;
+import io.onedev.server.web.page.project.setting.configuration.ConfigurationEditPage;
+import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;
+import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;
+import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
+import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;
+import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;
+import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;
+import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
+import io.onedev.server.web.page.project.stats.ProjectContribsPage;
+import io.onedev.server.web.page.project.stats.SourceLinesPage;
+import io.onedev.server.web.page.project.tags.ProjectTagsPage;
+import io.onedev.server.web.page.security.ForgetPage;
+import io.onedev.server.web.page.security.LoginPage;
+import io.onedev.server.web.page.security.LogoutPage;
+import io.onedev.server.web.page.security.RegisterPage;
+import io.onedev.server.web.stream.ArchiveStreamResourceReference;
+import io.onedev.server.web.stream.AttachmentStreamResourceReference;
+import io.onedev.server.web.stream.BuildLogStreamResourceReference;
+import io.onedev.server.web.stream.RawBlobStreamResourceReference;
+import io.onedev.server.web.stream.ServerLogStreamResourceReference;
+import io.onedev.server.web.util.mapper.OnePageMapper;
+import io.onedev.server.web.util.mapper.OneResourceMapper;
+
+public class OneUrlMapper extends CompoundRequestMapper {
+
+ public OneUrlMapper(WebApplication app) {
+ add(new OnePageMapper("init", ServerInitPage.class));
+ add(new OnePageMapper("loading", BrowserInfoPage.class));
+ addProjectPages();
+ addMyPages();
+ addAdministrationPages();
+ addSecurityPages();
+
+ addResources();
+ }
+
+ private void addMyPages() {
+ add(new OnePageMapper("my/profile", MyProfilePage.class));
+ add(new OnePageMapper("my/avatar", MyAvatarPage.class));
+ add(new OnePageMapper("my/password", MyPasswordPage.class));
+ add(new OnePageMapper("my/token", MyTokenPage.class));
+ }
+
+ private void addResources() {
+ add(new ResourceMapper("server-log-stream", new ServerLogStreamResourceReference()));
+ add(new ResourceMapper("projects/${project}/archive/${revision}", new ArchiveStreamResourceReference()));
+ add(new ResourceMapper("projects/${project}/builds/${build}/log-stream", new BuildLogStreamResourceReference()));
+
+ add(new OneResourceMapper("projects/${project}/raw/${revision}/${path}", new RawBlobStreamResourceReference()));
+ add(new ResourceMapper("projects/${project}/attachment/${uuid}/${attachment}",
+ new AttachmentStreamResourceReference()));
+ }
+
+ private void addSecurityPages() {
+ add(new OnePageMapper("login", LoginPage.class));
+ add(new OnePageMapper("logout", LogoutPage.class));
+ add(new OnePageMapper("register", RegisterPage.class));
+ add(new OnePageMapper("forget", ForgetPage.class));
+ }
+
+ private void addAdministrationPages() {
+ add(new OnePageMapper("administration/users", UserListPage.class));
+ add(new OnePageMapper("administration/users/new", NewUserPage.class));
+ add(new OnePageMapper("administration/users/${user}/profile", UserProfilePage.class));
+ add(new OnePageMapper("administration/users/${user}/groups", UserMembershipsPage.class));
+ add(new OnePageMapper("administration/users/${user}/authorizations", UserAuthorizationsPage.class));
+ add(new OnePageMapper("administration/users/${user}/avatar", UserAvatarPage.class));
+ add(new OnePageMapper("administration/users/${user}/password", UserPasswordPage.class));
+ add(new OnePageMapper("administration/users/${user}/token", UserTokenPage.class));
+
+ add(new OnePageMapper("administration/groups", GroupListPage.class));
+ add(new OnePageMapper("administration/groups/new", NewGroupPage.class));
+ add(new OnePageMapper("administration/groups/${group}/profile", GroupProfilePage.class));
+ add(new OnePageMapper("administration/groups/${group}/members", GroupMembershipsPage.class));
+ add(new OnePageMapper("administration/groups/${group}/authorizations", GroupAuthorizationsPage.class));
+
+ add(new OnePageMapper("administration/settings/system", SystemSettingPage.class));
+ add(new OnePageMapper("administration/settings/mail", MailSettingPage.class));
+ add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));
+ add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));
+ add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));
+
+ add(new OnePageMapper("administration/settings/job-executors", JobExecutorPage.class));
+
+ add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));
+ add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));
+ add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));
+ add(new OnePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));
+ add(new OnePageMapper("administration/settings/default-issue-queries", DefaultQueryListPage.class));
+
+ add(new OnePageMapper("administration/server-log", ServerLogPage.class));
+ add(new OnePageMapper("administration/server-information", ServerInformationPage.class));
+ }
+
+ private void addProjectPages() {
+ add(new OnePageMapper("projects", ProjectListPage.class) {
+
+ /*
+ * This logic is added to prevent url "/" from being redirected to "/projects"
+ */
+ @Override
+ public Url mapHandler(IRequestHandler requestHandler) {
+ if (requestHandler instanceof BookmarkablePageRequestHandler
+ || requestHandler instanceof RenderPageRequestHandler) {
+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;
+ if (pageClassRequestHandler.getPageClass() == ProjectListPage.class) {
+ return null;
+ }
+ }
+ return super.mapHandler(requestHandler);
+ }
+
+ });
+ add(new OnePageMapper("projects/new", NewProjectPage.class));
+ add(new OnePageMapper("projects/${project}", ProjectBlobPage.class));
+
+ add(new OnePageMapper("projects/${project}/blob/#{revision}/#{path}", ProjectBlobPage.class) {
+
+ /*
+ * This logic is added to prevent url "/projects/<project>" from being redirected to
+ * "/projects/<project>/blob"
+ */
+ @Override
+ public Url mapHandler(IRequestHandler requestHandler) {
+ if (requestHandler instanceof BookmarkablePageRequestHandler
+ || requestHandler instanceof RenderPageRequestHandler) {
+ IPageClassRequestHandler pageClassRequestHandler = (IPageClassRequestHandler) requestHandler;
+ if (pageClassRequestHandler.getPageClass() == ProjectBlobPage.class
+ && pageClassRequestHandler.getPageParameters().get("revision").toString() == null) {
+ return null;
+ }
+ }
+ return super.mapHandler(requestHandler);
+ }
+
+ });
+ add(new OnePageMapper("projects/${project}/commits/${revision}", CommitDetailPage.class));
+ add(new OnePageMapper("projects/${project}/commits", ProjectCommitsPage.class));
+ add(new OnePageMapper("projects/${project}/compare", RevisionComparePage.class));
+ add(new OnePageMapper("projects/${project}/stats/contribs", ProjectContribsPage.class));
+ add(new OnePageMapper("projects/${project}/stats/lines", SourceLinesPage.class));
+
+ add(new OnePageMapper("projects/${project}/branches", ProjectBranchesPage.class));
+ add(new OnePageMapper("projects/${project}/tags", ProjectTagsPage.class));
+ add(new OnePageMapper("projects/${project}/codecomments", ProjectCodeCommentsPage.class));
+
+ add(new OnePageMapper("projects/${project}/pulls", PullRequestListPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/new", NewPullRequestPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/${request}", PullRequestActivitiesPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/${request}/activities", PullRequestActivitiesPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/${request}/code-comments", PullRequestCodeCommentsPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/${request}/changes", PullRequestChangesPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/${request}/merge-preview", MergePreviewPage.class));
+ add(new OnePageMapper("projects/${project}/pulls/${request}/invalid", InvalidRequestPage.class));
+
+ add(new OnePageMapper("projects/${project}/issue-boards", IssueBoardsPage.class));
+ add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));
+ add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));
+ add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));
+ add(new OnePageMapper("projects/${project}/issues/new", NewIssuePage.class));
+ add(new OnePageMapper("projects/${project}/builds/${build}", BuildDetailPage.class));
+ add(new OnePageMapper("projects/${project}/milestones", MilestoneListPage.class));
+ add(new OnePageMapper("projects/${project}/milestones/${milestone}", MilestoneDetailPage.class));
+ add(new OnePageMapper("projects/${project}/milestones/${milestone}/edit", MilestoneEditPage.class));
+ add(new OnePageMapper("projects/${project}/milestones/new", NewMilestonePage.class));
+
+ add(new OnePageMapper("projects/${project}/settings/general", GeneralSettingPage.class));
+ add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));
+ add(new OnePageMapper("projects/${project}/settings/avatar-edit", AvatarEditPage.class));
+ add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));
+ add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));
+ add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));
+ add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",
+ PromptFieldsUponIssueOpenSettingPage.class));
+ add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));
+ add(new OnePageMapper("projects/${project}/settings/web-hooks", WebHooksPage.class));
+ add(new OnePageMapper("projects/${project}/settings/configurations", ConfigurationListPage.class));
+ add(new OnePageMapper("projects/${project}/settings/configurations/new", NewConfigurationPage.class));
+ add(new OnePageMapper("projects/${project}/settings/configurations/${configuration}", ConfigurationEditPage.class));
+
+ add(new OnePageMapper("projects/${project}/no-commits", NoCommitsPage.class));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html
new file mode 100644
index 0000000000..cddd895033
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <form wicket:id="form" class="bean-edit">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 wicket:id="title" class="modal-title"></h4>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <button wicket:id="ok" class="btn btn-primary">Ok</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
new file mode 100644
index 0000000000..a711990e50
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditContentPanel.java
@@ -0,0 +1,76 @@
+package io.onedev.server.web.component.beaneditmodal;
+
+import java.io.Serializable;
+
+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.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.EditableUtils;
+
+@SuppressWarnings("serial")
+abstract class BeanEditContentPanel extends Panel {
+
+ private final Serializable bean;
+
+ public BeanEditContentPanel(String id, Serializable bean) {
+ super(id);
+ this.bean = bean;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+ form.setOutputMarkupId(true);
+
+ form.add(new Label("title", EditableUtils.getDisplayName(bean.getClass())));
+
+ form.add(BeanContext.editBean("editor", bean));
+
+ form.add(new AjaxButton("ok") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target, bean);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ BeanEditContentPanel.this.onCancel(target);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ BeanEditContentPanel.this.onCancel(target);
+ }
+
+ });
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, Serializable bean);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
new file mode 100644
index 0000000000..3befac4da4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/beaneditmodal/BeanEditModalPanel.java
@@ -0,0 +1,38 @@
+package io.onedev.server.web.component.beaneditmodal;
+
+import java.io.Serializable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.web.component.modal.ModalPanel;
+
+@SuppressWarnings("serial")
+public abstract class BeanEditModalPanel extends ModalPanel {
+
+ public BeanEditModalPanel(AjaxRequestTarget target, Serializable bean) {
+ super(target, Model.of(bean));
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new BeanEditContentPanel(id, (Serializable)getDefaultModelObject()) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Serializable bean) {
+ close();
+ BeanEditModalPanel.this.onSave(target, bean);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ }
+
+ };
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, Serializable bean);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css b/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
index fd6267fc7d..63ae839b16 100644
--- a/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
+++ b/core/src/main/java/io/onedev/server/web/component/build/log/build-log.css
@@ -1,34 +1,30 @@
-.build-log {
- overflow: auto;
- height: 600px;
- background: black;
- color: white;
- border-radius: 4px;
-}
-.build-log>.log-entry {
- display: table-row;
-}
-.build-log>.log-entry.ERROR {
- color: red;
-}
-.build-log>.log-entry.WARN {
- color: yellow;
-}
-.build-log>.log-entry.DEBUG {
- color: lightgray;
-}
-.build-log>.log-entry.TRACE {
- color: darkgray;
-}
-.build-log>.log-entry>* {
- display: table-cell;
- padding-right: 8px;
-}
-.build-log>.log-entry>.message {
- padding-right: 0;
-}
-.build-log>.too-many-entries {
- color: red;
- font-size: 16px;
- font-weight: bold;
+.build-log {
+ overflow: auto;
+ height: 600px;
+ background: black;
+ color: white;
+ border-radius: 4px;
+}
+.build-log>.log-entry.ERROR {
+ color: red;
+}
+.build-log>.log-entry.WARN {
+ color: yellow;
+}
+.build-log>.log-entry.DEBUG {
+ color: lightgray;
+}
+.build-log>.log-entry.TRACE {
+ color: darkgray;
+}
+.build-log>.log-entry>* {
+ padding-right: 8px;
+}
+.build-log>.log-entry>.message {
+ padding-right: 0;
+}
+.build-log>.too-many-entries {
+ color: red;
+ font-size: 16px;
+ font-weight: bold;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java b/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java
index 5c1637abc1..242d35df74 100644
--- a/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/modal/ModalPanel.java
@@ -1,95 +1,100 @@
-package io.onedev.server.web.component.modal;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-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.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.page.base.BasePage;
-
-@SuppressWarnings("serial")
-public abstract class ModalPanel extends Panel {
-
- private static final String CONTENT_ID = "content";
-
- public ModalPanel(AjaxRequestTarget target) {
- super(((BasePage)target.getPage()).getRootComponents().newChildId());
-
- BasePage page = (BasePage) target.getPage();
- page.getRootComponents().add(this);
- target.prependJavaScript(String.format("$('body').append(\"<div id='%s'></div>\");", getMarkupId()));
- target.add(this);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- WebMarkupContainer dialog = new WebMarkupContainer("dialog");
- add(dialog);
-
- dialog.add(newContent(CONTENT_ID));
-
- String cssClass = getCssClass();
- if (cssClass != null)
- dialog.add(AttributeAppender.append("class", cssClass));
-
- add(new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- ModalPanel.this.remove();
- onClosed();
- }
-
- @Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
-
- response.render(JavaScriptHeaderItem.forReference(new ModalResourceReference()));
-
- String script = String.format("onedev.server.modal.onDomReady('%s', %s);",
- getMarkupId(true), getCallbackFunction());
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- });
-
- add(AttributeAppender.append("class", "modal"));
- setOutputMarkupId(true);
- }
-
- protected abstract Component newContent(String id);
-
- @Nullable
- protected String getCssClass() {
- return null;
- }
-
- public Component getContent() {
- return get(CONTENT_ID);
- }
-
- public final void close() {
- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
-
- if (target != null) {
- String script = String.format("onedev.server.modal.close($('#%s'), false);", getMarkupId(true));
- target.appendJavaScript(script);
- }
- remove();
- onClosed();
- }
-
- protected void onClosed() {
- }
-
+package io.onedev.server.web.component.modal;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+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.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.page.base.BasePage;
+
+@SuppressWarnings("serial")
+public abstract class ModalPanel extends Panel {
+
+ private static final String CONTENT_ID = "content";
+
+ public ModalPanel(AjaxRequestTarget target) {
+ this(target, null);
+ }
+
+ public ModalPanel(AjaxRequestTarget target, IModel<?> model) {
+ super(((BasePage)target.getPage()).getRootComponents().newChildId(), model);
+
+ BasePage page = (BasePage) target.getPage();
+ page.getRootComponents().add(this);
+ target.prependJavaScript(String.format("$('body').append(\"<div id='%s'></div>\");", getMarkupId()));
+ target.add(this);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebMarkupContainer dialog = new WebMarkupContainer("dialog");
+ add(dialog);
+
+ dialog.add(newContent(CONTENT_ID));
+
+ String cssClass = getCssClass();
+ if (cssClass != null)
+ dialog.add(AttributeAppender.append("class", cssClass));
+
+ add(new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ ModalPanel.this.remove();
+ onClosed();
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+
+ response.render(JavaScriptHeaderItem.forReference(new ModalResourceReference()));
+
+ String script = String.format("onedev.server.modal.onDomReady('%s', %s);",
+ getMarkupId(true), getCallbackFunction());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ });
+
+ add(AttributeAppender.append("class", "modal"));
+ setOutputMarkupId(true);
+ }
+
+ protected abstract Component newContent(String id);
+
+ @Nullable
+ protected String getCssClass() {
+ return null;
+ }
+
+ public Component getContent() {
+ return get(CONTENT_ID);
+ }
+
+ public final void close() {
+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+
+ if (target != null) {
+ String script = String.format("onedev.server.modal.close($('#%s'), false);", getMarkupId(true));
+ target.appendJavaScript(script);
+ }
+ remove();
+ onClosed();
+ }
+
+ protected void onClosed() {
+ }
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
index 7bf4f53325..8869d97a46 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/authenticator/AuthenticatorPage.java
@@ -1,223 +1,223 @@
-package io.onedev.server.web.page.admin.authenticator;
-
-import java.io.Serializable;
-
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.wicket.Component;
-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.event.IEvent;
-import org.apache.wicket.markup.html.form.Button;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.util.visit.IVisit;
-import org.apache.wicket.util.visit.IVisitor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.base.Joiner;
-
-import io.onedev.commons.utils.ExceptionUtils;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.authenticator.Authenticated;
-import io.onedev.server.web.behavior.testform.TestFormBehavior;
-import io.onedev.server.web.behavior.testform.TestResult;
-import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.editable.PropertyUpdating;
-import io.onedev.server.web.editable.PropertyContext;
-import io.onedev.server.web.editable.PropertyEditor;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class AuthenticatorPage extends AdministrationPage {
-
- private static final Logger logger = LoggerFactory.getLogger(AuthenticatorPage.class);
-
- private AuthenticationToken token = new AuthenticationToken();
-
- public AuthenticatorPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- AuthenticatorBean bean = new AuthenticatorBean();
- bean.setAuthenticator(OneDev.getInstance(SettingManager.class).getAuthenticator());
-
- PropertyEditor<Serializable> editor =
- PropertyContext.editBean("editor", bean, "authenticator");
- editor.setOutputMarkupId(true);
- Button saveButton = new Button("save") {
-
- @Override
- public void onSubmit() {
- super.onSubmit();
-
- OneDev.getInstance(SettingManager.class).saveAuthenticator(bean.getAuthenticator());
- getSession().success("External authentication setting has been saved");
- }
-
- };
- AjaxButton testButton = new AjaxButton("test") {
-
- private TestFormBehavior testBehavior;
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(testBehavior = new TestFormBehavior() {
-
- @Override
- protected TestResult test() {
- try {
- Authenticated authenticated = bean.getAuthenticator().authenticate(
- new UsernamePasswordToken(token.getUserName(), token.getPassword()));
- StringBuilder retrievedInfoBuilder = new StringBuilder();
- if (authenticated.getFullName() != null) {
- retrievedInfoBuilder.append("Full name: ")
- .append(authenticated.getFullName())
- .append("\n");
- }
- if (authenticated.getEmail() != null) {
- retrievedInfoBuilder.append("Email: ")
- .append(authenticated.getEmail())
- .append("\n");
- }
- if (authenticated.getGroupNames() != null) {
- retrievedInfoBuilder.append("Groups: ")
- .append(Joiner.on(", ").join(authenticated.getGroupNames()))
- .append("\n");
- }
- StringBuilder messageBuilder =
- new StringBuilder("Test successful: authentication passed");
- if (retrievedInfoBuilder.length() != 0) {
- messageBuilder.append(" with below information retrieved:\n")
- .append(retrievedInfoBuilder);
- }
- return new TestResult.Successful(messageBuilder.toString());
- } catch (AuthenticationException e) {
- return new TestResult.Successful("Test successful: authentication not passed: " + e.getMessage());
- } catch (Exception e) {
- logger.error("Error testing external authentication", e);
- String suggestedSolution = ExceptionUtils.suggestSolution(e);
- if (suggestedSolution != null)
- logger.warn("!!! " + suggestedSolution);
- return new TestResult.Failed("Error testing external authentication: "
- + e.getMessage() + ", check server log for details.");
- }
- }
-
- });
- setOutputMarkupPlaceholderTag(true);
- }
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
-
- BeanEditor beanEditor = editor.visitChildren(BeanEditor.class,
- new IVisitor<BeanEditor, BeanEditor>() {
-
- public void component(BeanEditor component, IVisit<BeanEditor> visit) {
- visit.stop(component);
- }
-
- });
- setVisible(beanEditor != null && beanEditor.isVisibleInHierarchy());
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- new ModalPanel(target) {
-
- @Override
- protected Component newContent(String id) {
- Fragment fragment = new Fragment(id, "testFrag", AuthenticatorPage.this);
- BeanEditor tokenEditor = BeanContext.editBean("editor", token);
- tokenEditor.setOutputMarkupId(true);
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onError() {
- super.onError();
- RequestCycle.get().find(AjaxRequestTarget.class).add(tokenEditor);
- }
-
- @Override
- protected void onSubmit() {
- super.onSubmit();
- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
- target.add(tokenEditor);
- target.focusComponent(null);
- close();
- testBehavior.requestTest(target);
- }
-
- };
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- close();
- }
-
- });
- form.add(tokenEditor);
- form.add(new AjaxButton("ok") {});
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- close();
- }
-
- });
- fragment.add(form);
- return fragment;
- }
-
- };
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- target.add(editor);
- }
-
- };
-
- Form<?> form = new Form<Void>("authenticator") {
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
-
- if (event.getPayload() instanceof PropertyUpdating) {
- PropertyUpdating propertyChanged = (PropertyUpdating) event.getPayload();
- propertyChanged.getHandler().add(testButton);
- }
-
- }
-
- };
-
- form.add(editor);
- form.add(saveButton);
- form.add(testButton);
-
- add(form);
- }
-
+package io.onedev.server.web.page.admin.authenticator;
+
+import java.io.Serializable;
+
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.wicket.Component;
+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.event.IEvent;
+import org.apache.wicket.markup.html.form.Button;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Joiner;
+
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.authenticator.Authenticated;
+import io.onedev.server.web.behavior.testform.TestFormBehavior;
+import io.onedev.server.web.behavior.testform.TestResult;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class AuthenticatorPage extends AdministrationPage {
+
+ private static final Logger logger = LoggerFactory.getLogger(AuthenticatorPage.class);
+
+ private AuthenticationToken token = new AuthenticationToken();
+
+ public AuthenticatorPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ AuthenticatorBean bean = new AuthenticatorBean();
+ bean.setAuthenticator(OneDev.getInstance(SettingManager.class).getAuthenticator());
+
+ PropertyEditor<Serializable> editor =
+ PropertyContext.editBean("editor", bean, "authenticator");
+ editor.setOutputMarkupId(true);
+ Button saveButton = new Button("save") {
+
+ @Override
+ public void onSubmit() {
+ super.onSubmit();
+
+ OneDev.getInstance(SettingManager.class).saveAuthenticator(bean.getAuthenticator());
+ getSession().success("External authentication setting has been saved");
+ }
+
+ };
+ AjaxButton testButton = new AjaxButton("test") {
+
+ private TestFormBehavior testBehavior;
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(testBehavior = new TestFormBehavior() {
+
+ @Override
+ protected TestResult test() {
+ try {
+ Authenticated authenticated = bean.getAuthenticator().authenticate(
+ new UsernamePasswordToken(token.getUserName(), token.getPassword()));
+ StringBuilder retrievedInfoBuilder = new StringBuilder();
+ if (authenticated.getFullName() != null) {
+ retrievedInfoBuilder.append("Full name: ")
+ .append(authenticated.getFullName())
+ .append("\n");
+ }
+ if (authenticated.getEmail() != null) {
+ retrievedInfoBuilder.append("Email: ")
+ .append(authenticated.getEmail())
+ .append("\n");
+ }
+ if (authenticated.getGroupNames() != null) {
+ retrievedInfoBuilder.append("Groups: ")
+ .append(Joiner.on(", ").join(authenticated.getGroupNames()))
+ .append("\n");
+ }
+ StringBuilder messageBuilder =
+ new StringBuilder("Test successful: authentication passed");
+ if (retrievedInfoBuilder.length() != 0) {
+ messageBuilder.append(" with below information retrieved:\n")
+ .append(retrievedInfoBuilder);
+ }
+ return new TestResult.Successful(messageBuilder.toString());
+ } catch (AuthenticationException e) {
+ return new TestResult.Successful("Test successful: authentication not passed: " + e.getMessage());
+ } catch (Exception e) {
+ logger.error("Error testing external authentication", e);
+ String suggestedSolution = ExceptionUtils.suggestSolution(e);
+ if (suggestedSolution != null)
+ logger.warn("!!! " + suggestedSolution);
+ return new TestResult.Failed("Error testing external authentication: "
+ + e.getMessage() + ", check server log for details.");
+ }
+ }
+
+ });
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ BeanEditor beanEditor = editor.visitChildren(BeanEditor.class,
+ new IVisitor<BeanEditor, BeanEditor>() {
+
+ public void component(BeanEditor component, IVisit<BeanEditor> visit) {
+ visit.stop(component);
+ }
+
+ });
+ setVisible(beanEditor != null && beanEditor.isVisibleInHierarchy());
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ new ModalPanel(target) {
+
+ @Override
+ protected Component newContent(String id) {
+ Fragment fragment = new Fragment(id, "testFrag", AuthenticatorPage.this);
+ BeanEditor tokenEditor = BeanContext.editBean("editor", token);
+ tokenEditor.setOutputMarkupId(true);
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(tokenEditor);
+ }
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(tokenEditor);
+ target.focusComponent(null);
+ close();
+ testBehavior.requestTest(target);
+ }
+
+ };
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ close();
+ }
+
+ });
+ form.add(tokenEditor);
+ form.add(new AjaxButton("ok") {});
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ close();
+ }
+
+ });
+ fragment.add(form);
+ return fragment;
+ }
+
+ };
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ target.add(editor);
+ }
+
+ };
+
+ Form<?> form = new Form<Void>("authenticator") {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ PropertyUpdating propertyChanged = (PropertyUpdating) event.getPayload();
+ propertyChanged.getHandler().add(testButton);
+ }
+
+ }
+
+ };
+
+ form.add(editor);
+ form.add(saveButton);
+ form.add(testButton);
+
+ add(form);
+ }
+
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.html
similarity index 69%
rename from core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.html
rename to core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.html
index 686f19ab1c..3eef829ce8 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.html
@@ -1,10 +1,11 @@
-<wicket:panel>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> &nbsp;
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
- </form>
+<wicket:panel>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button>
+ <input wicket:id="test" type="submit" class="btn btn-primary" value="Test">
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </form>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.java
new file mode 100644
index 0000000000..1ae453a129
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditPanel.java
@@ -0,0 +1,206 @@
+package io.onedev.server.web.page.admin.jobexecutors;
+
+import java.io.Serializable;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+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.event.IEvent;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.util.visit.IVisit;
+import org.apache.wicket.util.visit.IVisitor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.commons.utils.ExceptionUtils;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.behavior.testform.TestFormBehavior;
+import io.onedev.server.web.behavior.testform.TestResult;
+import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PropertyContext;
+import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+import io.onedev.server.web.util.Testable;
+
+@SuppressWarnings("serial")
+abstract class JobExecutorEditPanel extends Panel {
+
+ private static final Logger logger = LoggerFactory.getLogger(JobExecutorEditPanel.class);
+
+ private final JobExecutor executor;
+
+ public JobExecutorEditPanel(String id, JobExecutor executor) {
+ super(id);
+
+ this.executor = executor;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ JobExecutorBean bean = new JobExecutorBean();
+ bean.setJobExecutor(executor);
+
+ PropertyEditor<Serializable> editor = PropertyContext.editBean("editor", bean, "jobExecutor");
+ editor.setOutputMarkupId(true);
+
+ AjaxButton saveButton = new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target, bean.getJobExecutor());
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ };
+ AjaxLink<Void> cancelButton = new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ };
+
+ AjaxButton testButton = new AjaxButton("test") {
+
+ private TestFormBehavior testBehavior;
+
+ private Serializable testData;
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(testBehavior = new TestFormBehavior() {
+
+ @SuppressWarnings({ "unchecked", "rawtypes" })
+ @Override
+ protected TestResult test() {
+ try {
+ ((Testable)bean.getJobExecutor()).test(testData);
+ return new TestResult.Successful("Job executor tested successfully");
+ } catch (Exception e) {
+ logger.error("Error testing job executor", e);
+ String suggestedSolution = ExceptionUtils.suggestSolution(e);
+ if (suggestedSolution != null)
+ logger.warn("!!! " + suggestedSolution);
+ return new TestResult.Failed("Error testing job executor: " + e.getMessage() + ", check server log for details");
+ }
+ }
+
+ });
+ setOutputMarkupPlaceholderTag(true);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+
+ BeanEditor jobExecutorEditor = editor.visitChildren(BeanEditor.class, new IVisitor<BeanEditor, BeanEditor>() {
+
+ public void component(BeanEditor component, IVisit<BeanEditor> visit) {
+ visit.stop(component);
+ }
+
+ });
+ if (jobExecutorEditor != null
+ && jobExecutorEditor.isVisibleInHierarchy()
+ && Testable.class.isAssignableFrom(jobExecutorEditor.getBeanDescriptor().getBeanClass())) {
+ Class<? extends Serializable> testDataClass = null;
+ for (Type type: jobExecutorEditor.getBeanDescriptor().getBeanClass().getGenericInterfaces()) {
+ ParameterizedType parameterizedType = (ParameterizedType) type;
+ if (parameterizedType.getRawType() == Testable.class) {
+ testDataClass = (Class<? extends Serializable>) parameterizedType.getActualTypeArguments()[0];
+ break;
+ }
+ }
+ if (testDataClass != null) {
+ if (testData == null || testData.getClass() != testDataClass) {
+ try {
+ testData = testDataClass.newInstance();
+ } catch (InstantiationException | IllegalAccessException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ } else {
+ testData = null;
+ }
+ setVisible(true);
+ } else {
+ setVisible(false);
+ }
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ if (testData != null) {
+ new BeanEditModalPanel(target, testData) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Serializable bean) {
+ target.add(editor);
+ target.focusComponent(null);
+ testBehavior.requestTest(target);
+ }
+
+ };
+ } else {
+ target.add(editor);
+ target.focusComponent(null);
+ testBehavior.requestTest(target);
+ }
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ target.add(editor);
+ }
+
+ };
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+
+ if (event.getPayload() instanceof PropertyUpdating) {
+ PropertyUpdating propertyUpdating = (PropertyUpdating) event.getPayload();
+ propertyUpdating.getHandler().add(testButton);
+ }
+
+ }
+
+ };
+
+ form.add(new NotificationPanel("feedback", form));
+ form.add(editor);
+ form.add(saveButton);
+ form.add(testButton);
+ form.add(cancelButton);
+
+ add(form);
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.java
deleted file mode 100644
index 1be9df43f5..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorEditor.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package io.onedev.server.web.page.admin.jobexecutors;
-
-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.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.web.editable.PropertyContext;
-
-@SuppressWarnings("serial")
-abstract class JobExecutorEditor extends Panel {
-
- private final JobExecutor executor;
-
- public JobExecutorEditor(String id, JobExecutor executor) {
- super(id);
-
- this.executor = executor;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- setOutputMarkupId(true);
-
- Form<?> form = new Form<Void>("form");
- form.add(new NotificationPanel("feedback", form));
-
- JobExecutorBean bean = new JobExecutorBean();
- bean.setJobExecutor(executor);
- form.add(PropertyContext.editBean("editor", bean, "jobExecutor"));
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- onSave(target, bean.getJobExecutor());
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- add(form);
- }
-
- protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
index 8007a6d4d1..b3e0c5b82d 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.html
@@ -1,24 +1,23 @@
-<wicket:extend>
- <div class="page-title">Job Executors</div>
- <div wicket:id="jobExecutorSetting" class="panel-list">
- <ul class="list-unstyled protections">
- <li wicket:id="executors" class="executor"><div wicket:id="executor"></div></li>
- </ul>
- <div wicket:id="newExecutor"></div>
- <div class="help-block">
- <i class="fa fa-info-circle"></i> Define job executors here. For a given job, the first
- matching job executor will be used
- </div>
- </div>
- <wicket:fragment wicket:id="editNewFrag">
- <div class="executor panel panel-default">
- <div class="panel-heading"><div class="panel-title">Edit Executor</div></div>
- <div class="panel-body">
- <div wicket:id="editor"></div>
- </div>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="addNewLinkFrag">
- <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Executor</a>
- </wicket:fragment>
-</wicket:extend>
+<wicket:extend>
+ <div class="page-title">Job Executors</div>
+ <div wicket:id="jobExecutorSetting" class="panel-list">
+ <ul class="list-unstyled protections">
+ <li wicket:id="executors" class="executor"><div wicket:id="executor"></div></li>
+ </ul>
+ <div wicket:id="newExecutor"></div>
+ <div class="help-block">
+ <i class="fa fa-info-circle"></i> For a given job, the first matching job executor will be used
+ </div>
+ </div>
+ <wicket:fragment wicket:id="editNewFrag">
+ <div class="executor panel panel-default">
+ <div class="panel-heading"><div class="panel-title">Edit Executor</div></div>
+ <div class="panel-body">
+ <div wicket:id="editor"></div>
+ </div>
+ </div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="addNewLinkFrag">
+ <a wicket:id="link" class="add-new"><i class="fa fa-plus-circle fa-lg"></i> Add Executor</a>
+ </wicket:fragment>
+</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
index ef8c43791a..410422602b 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPage.java
@@ -1,128 +1,128 @@
-package io.onedev.server.web.page.admin.jobexecutors;
-
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-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.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.page.admin.AdministrationPage;
-
-@SuppressWarnings("serial")
-public class JobExecutorPage extends AdministrationPage {
-
- private WebMarkupContainer container;
-
- public JobExecutorPage(PageParameters params) {
- super(params);
- }
-
- private SettingManager getSettingManager() {
- return OneDev.getInstance(SettingManager.class);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- container = new WebMarkupContainer("jobExecutorSetting");
- container.setOutputMarkupId(true);
- add(container);
- container.add(new ListView<JobExecutor>("executors", new AbstractReadOnlyModel<List<JobExecutor>>() {
-
- @Override
- public List<JobExecutor> getObject() {
- return getSettingManager().getJobExecutors();
- }
-
- }) {
-
- @Override
- protected void populateItem(ListItem<JobExecutor> item) {
- item.add(new JobExecutorPanel("executor", item.getModelObject()) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
- executors.remove(item.getIndex());
- getSettingManager().saveJobExecutors(executors);
- target.add(container);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
- executors.set(item.getIndex(), executor);
- getSettingManager().saveJobExecutors(executors);
- }
-
- });
- }
-
- });
-
- container.add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
- JobExecutor executor = executors.get(from.getItemIndex());
- executors.set(from.getItemIndex(), executors.set(to.getItemIndex(), executor));
- getSettingManager().saveJobExecutors(executors);
-
- target.add(container);
- }
-
- }.items("li.executor"));
-
- container.add(newAddNewFrag());
- }
-
- private Component newAddNewFrag() {
- Fragment fragment = new Fragment("newExecutor", "addNewLinkFrag", this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Fragment fragment = new Fragment("newExecutor", "editNewFrag", getPage());
- fragment.setOutputMarkupId(true);
- fragment.add(new JobExecutorEditor("editor", null) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
- List<JobExecutor> executors = getSettingManager().getJobExecutors();
- executors.add(executor);
- getSettingManager().saveJobExecutors(executors);
- container.replace(newAddNewFrag());
- target.add(container);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- Component newAddNewFrag = newAddNewFrag();
- container.replace(newAddNewFrag);
- target.add(newAddNewFrag);
- }
-
- });
- container.replace(fragment);
- target.add(fragment);
- }
-
- });
- fragment.setOutputMarkupId(true);
- return fragment;
- }
-
-}
+package io.onedev.server.web.page.admin.jobexecutors;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+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.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.page.admin.AdministrationPage;
+
+@SuppressWarnings("serial")
+public class JobExecutorPage extends AdministrationPage {
+
+ private WebMarkupContainer container;
+
+ public JobExecutorPage(PageParameters params) {
+ super(params);
+ }
+
+ private SettingManager getSettingManager() {
+ return OneDev.getInstance(SettingManager.class);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ container = new WebMarkupContainer("jobExecutorSetting");
+ container.setOutputMarkupId(true);
+ add(container);
+ container.add(new ListView<JobExecutor>("executors", new AbstractReadOnlyModel<List<JobExecutor>>() {
+
+ @Override
+ public List<JobExecutor> getObject() {
+ return getSettingManager().getJobExecutors();
+ }
+
+ }) {
+
+ @Override
+ protected void populateItem(ListItem<JobExecutor> item) {
+ item.add(new JobExecutorPanel("executor", item.getModelObject()) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ executors.remove(item.getIndex());
+ getSettingManager().saveJobExecutors(executors);
+ target.add(container);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ executors.set(item.getIndex(), executor);
+ getSettingManager().saveJobExecutors(executors);
+ }
+
+ });
+ }
+
+ });
+
+ container.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ JobExecutor executor = executors.get(from.getItemIndex());
+ executors.set(from.getItemIndex(), executors.set(to.getItemIndex(), executor));
+ getSettingManager().saveJobExecutors(executors);
+
+ target.add(container);
+ }
+
+ }.items("li.executor"));
+
+ container.add(newAddNewFrag());
+ }
+
+ private Component newAddNewFrag() {
+ Fragment fragment = new Fragment("newExecutor", "addNewLinkFrag", this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Fragment fragment = new Fragment("newExecutor", "editNewFrag", getPage());
+ fragment.setOutputMarkupId(true);
+ fragment.add(new JobExecutorEditPanel("editor", null) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
+ List<JobExecutor> executors = getSettingManager().getJobExecutors();
+ executors.add(executor);
+ getSettingManager().saveJobExecutors(executors);
+ container.replace(newAddNewFrag());
+ target.add(container);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component newAddNewFrag = newAddNewFrag();
+ container.replace(newAddNewFrag);
+ target.add(newAddNewFrag);
+ }
+
+ });
+ container.replace(fragment);
+ target.add(fragment);
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+ return fragment;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
index 96ff3ca359..b93f726218 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/jobexecutors/JobExecutorPanel.java
@@ -1,116 +1,116 @@
-package io.onedev.server.web.page.admin.jobexecutors;
-
-import org.apache.wicket.Component;
-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.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.model.support.jobexecutor.JobExecutor;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-
-@SuppressWarnings("serial")
-abstract class JobExecutorPanel extends Panel {
-
- private final JobExecutor executor;
-
- public JobExecutorPanel(String id, JobExecutor executor) {
- super(id);
-
- this.executor = executor;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- JobExecutorEditor editor = new JobExecutorEditor("executor", executor) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
- JobExecutorPanel.this.onSave(target, executor);
- Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
- JobExecutorPanel.this.replace(executorViewer);
- target.add(executorViewer);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
- JobExecutorPanel.this.replace(executorViewer);
- target.add(executorViewer);
- }
-
- };
- JobExecutorPanel.this.replace(editor);
- target.add(editor);
- }
-
- });
-
- add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this executor?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onDelete(target);
- }
-
- });
-
- AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(executor.isEnabled())) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- executor.setEnabled(!executor.isEnabled());
- onSave(target, executor);
- target.add(JobExecutorPanel.this);
- }
-
- });
- add(new WebMarkupContainer("enableLabel") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("for", enableCheck.getMarkupId(true));
- }
-
- });
-
- add(BeanContext.viewBean("executor", executor).setOutputMarkupId(true));
-
- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return !executor.isEnabled()? "disabled": "";
- }
-
- }));
-
- setOutputMarkupId(true);
- }
-
- protected abstract void onDelete(AjaxRequestTarget target);
-
- protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
-
-}
+package io.onedev.server.web.page.admin.jobexecutors;
+
+import org.apache.wicket.Component;
+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.AjaxCheckBox;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.model.support.jobexecutor.JobExecutor;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
+
+@SuppressWarnings("serial")
+abstract class JobExecutorPanel extends Panel {
+
+ private final JobExecutor executor;
+
+ public JobExecutorPanel(String id, JobExecutor executor) {
+ super(id);
+
+ this.executor = executor;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("edit") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ JobExecutorEditPanel editor = new JobExecutorEditPanel("executor", executor) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, JobExecutor executor) {
+ JobExecutorPanel.this.onSave(target, executor);
+ Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
+ JobExecutorPanel.this.replace(executorViewer);
+ target.add(executorViewer);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component executorViewer = BeanContext.viewBean("executor", executor).setOutputMarkupId(true);
+ JobExecutorPanel.this.replace(executorViewer);
+ target.add(executorViewer);
+ }
+
+ };
+ JobExecutorPanel.this.replace(editor);
+ target.add(editor);
+ }
+
+ });
+
+ add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this executor?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onDelete(target);
+ }
+
+ });
+
+ AjaxCheckBox enableCheck;
+ add(enableCheck = new AjaxCheckBox("enable", Model.of(executor.isEnabled())) {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ executor.setEnabled(!executor.isEnabled());
+ onSave(target, executor);
+ target.add(JobExecutorPanel.this);
+ }
+
+ });
+ add(new WebMarkupContainer("enableLabel") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("for", enableCheck.getMarkupId(true));
+ }
+
+ });
+
+ add(BeanContext.viewBean("executor", executor).setOutputMarkupId(true));
+
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return !executor.isEnabled()? "disabled": "";
+ }
+
+ }));
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onDelete(AjaxRequestTarget target);
+
+ protected abstract void onSave(AjaxRequestTarget target, JobExecutor executor);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
index 6860ec6cd6..0ce2dd9277 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java
@@ -1,263 +1,258 @@
-package io.onedev.server.web.page.project.blob.render.edit;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.attributes.IAjaxCallListener;
-import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import io.onedev.commons.utils.Provider;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
-import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
-import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;
-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-
-@SuppressWarnings("serial")
-public abstract class BlobEditPanel extends Panel {
-
- public static enum Tab {EDIT, EDIT_PLAIN, SAVE};
-
- protected final BlobRenderContext context;
-
- private FormComponentPanel<byte[]> editor;
-
- private CommitOptionPanel commitOption;
-
- private AbstractDefaultAjaxBehavior recreateBehavior;
-
- private Tab currentTab = Tab.EDIT;
-
- private byte[] editingContent;
-
- public BlobEditPanel(String id, BlobRenderContext context) {
- super(id);
- this.context = context;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new WebMarkupContainer("editPlainTab").setVisible(getPlainEditSupport() != null));
- add(new WebMarkupContainer("saveTab")
- .setVisible(context.getMode() != Mode.ADD || context.getNewPath() != null));
-
- add(new ViewStateAwareAjaxLink<Void>("cancelLink", true) {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- context.onModeChange(target, Mode.VIEW);
- }
-
- });
-
- add(newEditOptions("editOptions"));
-
- add(new Form<Void>("content") {
-
- private AjaxSubmitLink newSubmitLink(String componentId, Tab tab) {
- return new AjaxSubmitLink(componentId) {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- if (currentTab == Tab.EDIT && tab == Tab.EDIT_PLAIN
- || currentTab == Tab.EDIT_PLAIN && tab == Tab.EDIT
- || tab == Tab.SAVE)
- editingContent = editor.getModelObject();
- if (tab != Tab.SAVE) {
- if (tab == Tab.EDIT)
- editor = newEditor("editor", editingContent);
- else
- editor = getPlainEditSupport().newEditor("editor", editingContent);
- getParent().replace(editor);
- } else {
- commitOption.onContentChange(target);
- }
-
- String script = String.format(
- "onedev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.%s'));",
- BlobEditPanel.this.getMarkupId(true), tab.name().toLowerCase().replace("_", "-"));
- target.appendJavaScript(script);
-
- currentTab = tab;
-
- target.add(form);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
-
- attributes.getAjaxCallListeners().add(new IAjaxCallListener() {
-
- @Override
- public CharSequence getSuccessHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getPrecondition(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getInitHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getFailureHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getDoneHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getCompleteHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getBeforeSendHandler(Component component) {
- return null;
- }
-
- @Override
- public CharSequence getBeforeHandler(Component component) {
- return "$('.blob-submit-aware').trigger('beforeSubmit');";
- }
-
- @Override
- public CharSequence getAfterHandler(Component component) {
- return null;
- }
-
- });
- }
-
- };
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new FencedFeedbackPanel("feedback", this));
-
- byte[] content;
- if (context.getMode() == Mode.EDIT)
- content = context.getProject().getBlob(context.getBlobIdent()).getBytes();
- else
- content = new byte[0];
- add(editor = newEditor("editor", content));
- editor.setOutputMarkupId(true);
-
- add(newSubmitLink("edit", Tab.EDIT));
- add(newSubmitLink("editPlain", Tab.EDIT_PLAIN));
- add(newSubmitLink("save", Tab.SAVE));
-
- setOutputMarkupId(true);
- }
-
- });
-
- add(commitOption = new CommitOptionPanel("commitOptions", context, new Provider<byte[]>() {
-
- @Override
- public byte[] get() {
- return editingContent;
- }
-
- }));
-
- add(recreateBehavior = new AbstractPostAjaxBehavior() {
-
- @Override
- protected void respond(AjaxRequestTarget target) {
- // recreate content editor as different name might be using different editor
- context.onModeChange(target, Mode.ADD);
- }
-
- });
-
- if (context.getMode() == Mode.ADD)
- add(AttributeAppender.append("class", "no-autofocus"));
-
- setOutputMarkupId(true);
- }
-
- @Override
- public void onEvent(IEvent<?> event) {
- super.onEvent(event);
- if (event.getPayload() instanceof BlobNameChanging) {
- /*
- * Blob name is changing and current editor might be inappropriate for current
- * blob name, so we need to re-create the editor if the form does not have
- * any change yet
- */
- BlobNameChanging payload = (BlobNameChanging) event.getPayload();
- String script = String.format("onedev.server.blobEdit.onNameChanging('%s', %s, %s);",
- getMarkupId(), context.getMode() == Mode.ADD, recreateBehavior.getCallbackFunction());
- payload.getHandler().appendJavaScript(script);
- }
- }
-
- protected WebMarkupContainer newEditOptions(String componentId) {
- WebMarkupContainer options = new WebMarkupContainer(componentId);
- options.setVisible(false);
- return options;
- }
-
- protected abstract FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent);
-
- @Nullable
- protected abstract PlainEditSupport getPlainEditSupport();
-
- public FormComponentPanel<byte[]> getEditor() {
- return editor;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new BlobEditResourceReference()));
-
- String script = String.format("onedev.server.blobEdit.onDomReady('%s');", getMarkupId());
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.edit;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.attributes.IAjaxCallListener;
+import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.event.IEvent;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import io.onedev.commons.utils.Provider;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+import io.onedev.server.web.component.link.ViewStateAwareAjaxLink;
+import io.onedev.server.web.page.project.blob.navigator.BlobNameChanging;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.commitoption.CommitOptionPanel;
+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
+
+@SuppressWarnings("serial")
+public abstract class BlobEditPanel extends Panel {
+
+ public static enum Tab {EDIT, EDIT_PLAIN, SAVE};
+
+ protected final BlobRenderContext context;
+
+ private FormComponentPanel<byte[]> editor;
+
+ private CommitOptionPanel commitOption;
+
+ private AbstractDefaultAjaxBehavior recreateBehavior;
+
+ private Tab currentTab = Tab.EDIT;
+
+ private byte[] editingContent;
+
+ public BlobEditPanel(String id, BlobRenderContext context) {
+ super(id);
+ this.context = context;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new WebMarkupContainer("editPlainTab").setVisible(this instanceof PlainEditSupport));
+ add(new WebMarkupContainer("saveTab")
+ .setVisible(context.getMode() != Mode.ADD || context.getNewPath() != null));
+
+ add(new ViewStateAwareAjaxLink<Void>("cancelLink", true) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ context.onModeChange(target, Mode.VIEW);
+ }
+
+ });
+
+ add(newEditOptions("editOptions"));
+
+ add(new Form<Void>("content") {
+
+ private AjaxSubmitLink newSubmitLink(String componentId, Tab tab) {
+ return new AjaxSubmitLink(componentId) {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ if (currentTab == Tab.EDIT && tab == Tab.EDIT_PLAIN
+ || currentTab == Tab.EDIT_PLAIN && tab == Tab.EDIT
+ || tab == Tab.SAVE)
+ editingContent = editor.getModelObject();
+ if (tab != Tab.SAVE) {
+ if (tab == Tab.EDIT)
+ editor = newEditor("editor", editingContent);
+ else
+ editor = ((PlainEditSupport)BlobEditPanel.this).newPlainEditor("editor", editingContent);
+ getParent().replace(editor);
+ } else {
+ commitOption.onContentChange(target);
+ }
+
+ String script = String.format(
+ "onedev.server.blobEdit.selectTab($('#%s>.blob-edit>.head>.%s'));",
+ BlobEditPanel.this.getMarkupId(true), tab.name().toLowerCase().replace("_", "-"));
+ target.appendJavaScript(script);
+
+ currentTab = tab;
+
+ target.add(form);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+
+ attributes.getAjaxCallListeners().add(new IAjaxCallListener() {
+
+ @Override
+ public CharSequence getSuccessHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getPrecondition(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getInitHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getFailureHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getDoneHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getCompleteHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getBeforeSendHandler(Component component) {
+ return null;
+ }
+
+ @Override
+ public CharSequence getBeforeHandler(Component component) {
+ return "$('.blob-submit-aware').trigger('beforeSubmit');";
+ }
+
+ @Override
+ public CharSequence getAfterHandler(Component component) {
+ return null;
+ }
+
+ });
+ }
+
+ };
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new FencedFeedbackPanel("feedback", this));
+
+ byte[] content;
+ if (context.getMode() == Mode.EDIT)
+ content = context.getProject().getBlob(context.getBlobIdent()).getBytes();
+ else
+ content = new byte[0];
+ add(editor = newEditor("editor", content));
+ editor.setOutputMarkupId(true);
+
+ add(newSubmitLink("edit", Tab.EDIT));
+ add(newSubmitLink("editPlain", Tab.EDIT_PLAIN));
+ add(newSubmitLink("save", Tab.SAVE));
+
+ setOutputMarkupId(true);
+ }
+
+ });
+
+ add(commitOption = new CommitOptionPanel("commitOptions", context, new Provider<byte[]>() {
+
+ @Override
+ public byte[] get() {
+ return editingContent;
+ }
+
+ }));
+
+ add(recreateBehavior = new AbstractPostAjaxBehavior() {
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ // recreate content editor as different name might be using different editor
+ context.onModeChange(target, Mode.ADD);
+ }
+
+ });
+
+ if (context.getMode() == Mode.ADD)
+ add(AttributeAppender.append("class", "no-autofocus"));
+
+ setOutputMarkupId(true);
+ }
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+ if (event.getPayload() instanceof BlobNameChanging) {
+ /*
+ * Blob name is changing and current editor might be inappropriate for current
+ * blob name, so we need to re-create the editor if the form does not have
+ * any change yet
+ */
+ BlobNameChanging payload = (BlobNameChanging) event.getPayload();
+ String script = String.format("onedev.server.blobEdit.onNameChanging('%s', %s, %s);",
+ getMarkupId(), context.getMode() == Mode.ADD, recreateBehavior.getCallbackFunction());
+ payload.getHandler().appendJavaScript(script);
+ }
+ }
+
+ protected WebMarkupContainer newEditOptions(String componentId) {
+ WebMarkupContainer options = new WebMarkupContainer(componentId);
+ options.setVisible(false);
+ return options;
+ }
+
+ protected abstract FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent);
+
+ public FormComponentPanel<byte[]> getEditor() {
+ return editor;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(JavaScriptHeaderItem.forReference(new BlobEditResourceReference()));
+
+ String script = String.format("onedev.server.blobEdit.onDomReady('%s');", getMarkupId());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java
index 8b463a575c..ca2c2f9ca6 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditSupport.java
@@ -1,11 +1,11 @@
-package io.onedev.server.web.page.project.blob.render.edit.plain;
-
-import java.io.Serializable;
-
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-
-public interface PlainEditSupport extends Serializable {
-
- FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent);
-
-}
+package io.onedev.server.web.page.project.blob.render.edit.plain;
+
+import java.io.Serializable;
+
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+public interface PlainEditSupport extends Serializable {
+
+ FormComponentPanel<byte[]> newPlainEditor(String componentId, byte[] initialContent);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java
index aee1dfbea5..fa9330644e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java
@@ -1,43 +1,36 @@
-package io.onedev.server.web.page.project.blob.render.renderers.cispec;
-
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-
-import io.onedev.server.ci.CISpec;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;
-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
-
-@SuppressWarnings("serial")
-public class CISpecBlobEditPanel extends BlobEditPanel {
-
- public CISpecBlobEditPanel(String id, BlobRenderContext context) {
- super(id, context);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));
- }
-
- @Override
- protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
- return new CISpecEditPanel(componentId, context, initialContent);
- }
-
- @Override
- protected PlainEditSupport getPlainEditSupport() {
- return new PlainEditSupport() {
-
- @Override
- public FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
- return new PlainEditPanel(componentId, CISpec.BLOB_PATH, initialContent);
- }
-
- };
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.cispec;
+
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+import io.onedev.server.ci.CISpec;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditPanel;
+import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
+
+@SuppressWarnings("serial")
+public class CISpecBlobEditPanel extends BlobEditPanel implements PlainEditSupport {
+
+ public CISpecBlobEditPanel(String id, BlobRenderContext context) {
+ super(id, context);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));
+ }
+
+ @Override
+ protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
+ return new CISpecEditPanel(componentId, context, initialContent);
+ }
+
+ @Override
+ public FormComponentPanel<byte[]> newPlainEditor(String componentId, byte[] initialContent) {
+ return new PlainEditPanel(componentId, CISpec.BLOB_PATH, initialContent);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java
index c68c4e8b6a..92cadea4ea 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/gitlink/GitLinkPanel.java
@@ -1,66 +1,73 @@
-package io.onedev.server.web.page.project.blob.render.renderers.gitlink;
-
-import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.Link;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.git.Blob;
-import io.onedev.server.git.Submodule;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
-
-@SuppressWarnings("serial")
-public class GitLinkPanel extends BlobViewPanel {
-
- public GitLinkPanel(String id, BlobRenderContext context) {
- super(id, context);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Blob blob = context.getProject().getBlob(context.getBlobIdent());
- Submodule submodule = Submodule.fromString(blob.getText().getContent());
- WebMarkupContainer link;
- SettingManager configManager = OneDev.getInstance(SettingManager.class);
- if (submodule.getUrl().startsWith(configManager.getSystemSetting().getServerUrl() + "/")) {
- link = new WebMarkupContainer("link");
- link.add(AttributeModifier.replace("href", submodule.getUrl() + "/blob/" + submodule.getCommitId()));
- } else {
- link = new Link<Void>("link") {
-
- @Override
- public void onClick() {
- }
-
- };
- link.setEnabled(false);
- }
- link.add(new Label("label", submodule));
- add(link);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(CssHeaderItem.forReference(new GitLinkResourceReference()));
- }
-
- @Override
- protected boolean isEditSupported() {
- return false;
- }
-
- @Override
- protected boolean isViewPlainSupported() {
- return false;
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.gitlink;
+
+import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.git.Blob;
+import io.onedev.server.git.Submodule;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
+
+@SuppressWarnings("serial")
+public class GitLinkPanel extends BlobViewPanel {
+
+ public GitLinkPanel(String id, BlobRenderContext context) {
+ super(id, context);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Blob blob = context.getProject().getBlob(context.getBlobIdent());
+ Submodule submodule = Submodule.fromString(blob.getText().getContent());
+ WebMarkupContainer link;
+ SettingManager configManager = OneDev.getInstance(SettingManager.class);
+ if (submodule.getUrl().startsWith(configManager.getSystemSetting().getServerUrl() + "/")) {
+ link = new WebMarkupContainer("link");
+ link.add(AttributeModifier.replace("href", submodule.getUrl() + "/blob/" + submodule.getCommitId()));
+ } else {
+ link = new Link<Void>("link") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.setName("span");
+ }
+
+ @Override
+ public void onClick() {
+ }
+
+ };
+ link.setEnabled(false);
+ }
+ link.add(new Label("label", submodule));
+ add(link);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ response.render(CssHeaderItem.forReference(new GitLinkResourceReference()));
+ }
+
+ @Override
+ protected boolean isEditSupported() {
+ return false;
+ }
+
+ @Override
+ protected boolean isViewPlainSupported() {
+ return false;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
index 744a4c2df5..d13a2ef2fc 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditPanel.java
@@ -1,41 +1,35 @@
-package io.onedev.server.web.page.project.blob.render.renderers.markdown;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
-
-@SuppressWarnings("serial")
-public class MarkdownBlobEditPanel extends BlobEditPanel {
-
- public MarkdownBlobEditPanel(String id, BlobRenderContext context) {
- super(id, context);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new MarkdownBlobResourceReference()));
- }
-
- @Override
- protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
- return new MarkdownBlobEditor(componentId, context, initialContent) {
-
- @Override
- protected String getAutosaveKey() {
- return context.getAutosaveKey();
- }
-
- };
- }
-
- @Override
- protected PlainEditSupport getPlainEditSupport() {
- return null;
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.markdown;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
+
+@SuppressWarnings("serial")
+public class MarkdownBlobEditPanel extends BlobEditPanel {
+
+ public MarkdownBlobEditPanel(String id, BlobRenderContext context) {
+ super(id, context);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new MarkdownBlobResourceReference()));
+ }
+
+ @Override
+ protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
+ return new MarkdownBlobEditor(componentId, context, initialContent) {
+
+ @Override
+ protected String getAutosaveKey() {
+ return context.getAutosaveKey();
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java
index 8137946331..23ab607b38 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/noname/NoNameEditPanel.java
@@ -1,34 +1,28 @@
-package io.onedev.server.web.page.project.blob.render.renderers.noname;
-
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
-
-@SuppressWarnings("serial")
-public class NoNameEditPanel extends BlobEditPanel {
-
- public NoNameEditPanel(String id, BlobRenderContext context) {
- super(id, context);
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new NoNameCssResourceReference()));
- }
-
- @Override
- protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
- return new NoNameFormComponent(componentId);
- }
-
- @Override
- protected PlainEditSupport getPlainEditSupport() {
- return null;
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.noname;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
+
+@SuppressWarnings("serial")
+public class NoNameEditPanel extends BlobEditPanel {
+
+ public NoNameEditPanel(String id, BlobRenderContext context) {
+ super(id, context);
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new NoNameCssResourceReference()));
+ }
+
+ @Override
+ protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
+ return new NoNameFormComponent(componentId);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
index 5f2d7212c3..46246220d3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceEditPanel.java
@@ -1,121 +1,115 @@
-package io.onedev.server.web.page.project.blob.render.renderers.source;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-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.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.FormComponentPanel;
-import org.unbescape.javascript.JavaScriptEscape;
-
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.model.support.TextRange;
-import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
-import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
-import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
-import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
-import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport;
-import io.onedev.server.web.page.project.blob.render.view.Markable;
-
-@SuppressWarnings("serial")
-public class SourceEditPanel extends BlobEditPanel implements Markable {
-
- private SourceFormatPanel sourceFormat;
-
- public SourceEditPanel(String id, BlobRenderContext context) {
- super(id, context);
- }
-
- @Override
- protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
- return new SourceFormComponent(componentId, initialContent);
- }
-
- @Override
- protected WebMarkupContainer newEditOptions(String componentId) {
- sourceFormat = new SourceFormatPanel(componentId, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceEdit.onIndentTypeChange('%s', '%s');",
- getEditor().getMarkupId(), sourceFormat.getIndentType());
- target.appendJavaScript(script);
- }
-
- }, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceEdit.onTabSizeChange('%s', %s);",
- getEditor().getMarkupId(), sourceFormat.getTabSize());
- target.appendJavaScript(script);
- }
-
- }, new OptionChangeCallback() {
-
- @Override
- public void onOptioneChange(AjaxRequestTarget target) {
- String script = String.format("onedev.server.sourceEdit.onLineWrapModeChange('%s', '%s');",
- getEditor().getMarkupId(), sourceFormat.getLineWrapMode());
- target.appendJavaScript(script);
- }
-
- });
- return sourceFormat;
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));
-
- String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());
- String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
- String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",
- getEditor().getMarkupId(),
- JavaScriptEscape.escapeJavaScript(context.getNewPath()),
- jsonOfMark,
- sourceFormat.getIndentType(),
- sourceFormat.getTabSize(),
- sourceFormat.getLineWrapMode(),
- context.getMode() == Mode.EDIT || context.getInitialNewPath() != null,
- autosaveKey);
- response.render(OnDomReadyHeaderItem.forScript(script));
-
- script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');",
- getEditor().getMarkupId(), jsonOfMark, autosaveKey);
- response.render(OnLoadHeaderItem.forScript(script));
- }
-
- private String getJson(TextRange mark) {
- try {
- return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
- } catch (JsonProcessingException e) {
- throw new RuntimeException(e);
- }
- }
-
- @Override
- public void mark(AjaxRequestTarget target, TextRange mark) {
- String script;
- if (mark != null) {
- script = String.format("onedev.server.sourceEdit.mark('%s', %s);",
- getEditor().getMarkupId(), getJson(mark));
- } else {
- script = String.format("onedev.server.sourceEdit.mark('%s', undefined);",
- getEditor().getMarkupId());
- }
- target.appendJavaScript(script);
- }
-
- @Override
- protected PlainEditSupport getPlainEditSupport() {
- return null;
- }
-
-}
+package io.onedev.server.web.page.project.blob.render.renderers.source;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+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.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.model.support.TextRange;
+import io.onedev.server.web.component.sourceformat.OptionChangeCallback;
+import io.onedev.server.web.component.sourceformat.SourceFormatPanel;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
+import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode;
+import io.onedev.server.web.page.project.blob.render.edit.BlobEditPanel;
+import io.onedev.server.web.page.project.blob.render.view.Markable;
+
+@SuppressWarnings("serial")
+public class SourceEditPanel extends BlobEditPanel implements Markable {
+
+ private SourceFormatPanel sourceFormat;
+
+ public SourceEditPanel(String id, BlobRenderContext context) {
+ super(id, context);
+ }
+
+ @Override
+ protected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {
+ return new SourceFormComponent(componentId, initialContent);
+ }
+
+ @Override
+ protected WebMarkupContainer newEditOptions(String componentId) {
+ sourceFormat = new SourceFormatPanel(componentId, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceEdit.onIndentTypeChange('%s', '%s');",
+ getEditor().getMarkupId(), sourceFormat.getIndentType());
+ target.appendJavaScript(script);
+ }
+
+ }, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceEdit.onTabSizeChange('%s', %s);",
+ getEditor().getMarkupId(), sourceFormat.getTabSize());
+ target.appendJavaScript(script);
+ }
+
+ }, new OptionChangeCallback() {
+
+ @Override
+ public void onOptioneChange(AjaxRequestTarget target) {
+ String script = String.format("onedev.server.sourceEdit.onLineWrapModeChange('%s', '%s');",
+ getEditor().getMarkupId(), sourceFormat.getLineWrapMode());
+ target.appendJavaScript(script);
+ }
+
+ });
+ return sourceFormat;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new SourceEditResourceReference()));
+
+ String autosaveKey = JavaScriptEscape.escapeJavaScript(context.getAutosaveKey());
+ String jsonOfMark = context.getMark()!=null?getJson(context.getMark()):"undefined";
+ String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');",
+ getEditor().getMarkupId(),
+ JavaScriptEscape.escapeJavaScript(context.getNewPath()),
+ jsonOfMark,
+ sourceFormat.getIndentType(),
+ sourceFormat.getTabSize(),
+ sourceFormat.getLineWrapMode(),
+ context.getMode() == Mode.EDIT || context.getInitialNewPath() != null,
+ autosaveKey);
+ response.render(OnDomReadyHeaderItem.forScript(script));
+
+ script = String.format("onedev.server.sourceEdit.onWindowLoad('%s', %s, '%s');",
+ getEditor().getMarkupId(), jsonOfMark, autosaveKey);
+ response.render(OnLoadHeaderItem.forScript(script));
+ }
+
+ private String getJson(TextRange mark) {
+ try {
+ return OneDev.getInstance(ObjectMapper.class).writeValueAsString(mark);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public void mark(AjaxRequestTarget target, TextRange mark) {
+ String script;
+ if (mark != null) {
+ script = String.format("onedev.server.sourceEdit.mark('%s', %s);",
+ getEditor().getMarkupId(), getJson(mark));
+ } else {
+ script = String.format("onedev.server.sourceEdit.mark('%s', undefined);",
+ getEditor().getMarkupId());
+ }
+ target.appendJavaScript(script);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.html
similarity index 93%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html
rename to core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.html
index 686f19ab1c..03ab7d417f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.html
@@ -1,10 +1,10 @@
-<wicket:panel>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> &nbsp;
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
- </form>
+<wicket:panel>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> &nbsp;
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </form>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java
similarity index 88%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java
rename to core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java
index 2cb1f1b631..79f352d8a4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditor.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionEditPanel.java
@@ -1,64 +1,64 @@
-package io.onedev.server.web.page.project.setting.branchprotection;
-
-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.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.web.editable.BeanContext;
-
-@SuppressWarnings("serial")
-abstract class BranchProtectionEditor extends Panel {
-
- private final BranchProtection protection;
-
- public BranchProtectionEditor(String id, BranchProtection protection) {
- super(id);
-
- this.protection = protection;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- setOutputMarkupId(true);
-
- Form<?> form = new Form<Void>("form");
- form.add(new NotificationPanel("feedback", form));
-
- form.add(BeanContext.editBean("editor", protection));
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- onSave(target, protection);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- add(form);
- }
-
- protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-}
+package io.onedev.server.web.page.project.setting.branchprotection;
+
+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.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.model.support.BranchProtection;
+import io.onedev.server.web.editable.BeanContext;
+
+@SuppressWarnings("serial")
+abstract class BranchProtectionEditPanel extends Panel {
+
+ private final BranchProtection protection;
+
+ public BranchProtectionEditPanel(String id, BranchProtection protection) {
+ super(id);
+
+ this.protection = protection;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ setOutputMarkupId(true);
+
+ Form<?> form = new Form<Void>("form");
+ form.add(new NotificationPanel("feedback", form));
+
+ form.add(BeanContext.editBean("editor", protection));
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target, protection);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java
index 45205beb72..4af7d2d3dc 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPage.java
@@ -1,120 +1,120 @@
-package io.onedev.server.web.page.project.setting.branchprotection;
-
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-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.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-
-@SuppressWarnings("serial")
-public class BranchProtectionPage extends ProjectSettingPage {
-
- private WebMarkupContainer container;
-
- public BranchProtectionPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- container = new WebMarkupContainer("branchProtectionSetting");
- container.setOutputMarkupId(true);
- add(container);
- container.add(new ListView<BranchProtection>("protections", new AbstractReadOnlyModel<List<BranchProtection>>() {
-
- @Override
- public List<BranchProtection> getObject() {
- return getProject().getBranchProtections();
- }
- }) {
-
- @Override
- protected void populateItem(final ListItem<BranchProtection> item) {
- item.add(new BranchProtectionPanel("protection", item.getModelObject()) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- getProject().getBranchProtections().remove(item.getIndex());
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
- target.add(container);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
- getProject().getBranchProtections().set(item.getIndex(), protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
- }
-
- });
- }
-
- });
-
- container.add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- List<BranchProtection> protections = getProject().getBranchProtections();
- BranchProtection protection = protections.get(from.getItemIndex());
- protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
-
- target.add(container);
- }
-
- }.items("li.protection"));
-
- container.add(newAddNewFrag());
- }
-
- private Component newAddNewFrag() {
- Fragment fragment = new Fragment("newProtection", "addNewLinkFrag", this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Fragment fragment = new Fragment("newProtection", "editNewFrag", getPage());
- fragment.setOutputMarkupId(true);
- fragment.add(new BranchProtectionEditor("editor", new BranchProtection()) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
- getProject().getBranchProtections().add(protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
- container.replace(newAddNewFrag());
- target.add(container);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- Component newAddNewFrag = newAddNewFrag();
- container.replace(newAddNewFrag);
- target.add(newAddNewFrag);
- }
-
- });
- container.replace(fragment);
- target.add(fragment);
- }
-
- });
- fragment.setOutputMarkupId(true);
- return fragment;
- }
-
-}
+package io.onedev.server.web.page.project.setting.branchprotection;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+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.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.support.BranchProtection;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.page.project.setting.ProjectSettingPage;
+
+@SuppressWarnings("serial")
+public class BranchProtectionPage extends ProjectSettingPage {
+
+ private WebMarkupContainer container;
+
+ public BranchProtectionPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ container = new WebMarkupContainer("branchProtectionSetting");
+ container.setOutputMarkupId(true);
+ add(container);
+ container.add(new ListView<BranchProtection>("protections", new AbstractReadOnlyModel<List<BranchProtection>>() {
+
+ @Override
+ public List<BranchProtection> getObject() {
+ return getProject().getBranchProtections();
+ }
+ }) {
+
+ @Override
+ protected void populateItem(final ListItem<BranchProtection> item) {
+ item.add(new BranchProtectionPanel("protection", item.getModelObject()) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ getProject().getBranchProtections().remove(item.getIndex());
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ target.add(container);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
+ getProject().getBranchProtections().set(item.getIndex(), protection);
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ }
+
+ });
+ }
+
+ });
+
+ container.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ List<BranchProtection> protections = getProject().getBranchProtections();
+ BranchProtection protection = protections.get(from.getItemIndex());
+ protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+
+ target.add(container);
+ }
+
+ }.items("li.protection"));
+
+ container.add(newAddNewFrag());
+ }
+
+ private Component newAddNewFrag() {
+ Fragment fragment = new Fragment("newProtection", "addNewLinkFrag", this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Fragment fragment = new Fragment("newProtection", "editNewFrag", getPage());
+ fragment.setOutputMarkupId(true);
+ fragment.add(new BranchProtectionEditPanel("editor", new BranchProtection()) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
+ getProject().getBranchProtections().add(protection);
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ container.replace(newAddNewFrag());
+ target.add(container);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component newAddNewFrag = newAddNewFrag();
+ container.replace(newAddNewFrag);
+ target.add(newAddNewFrag);
+ }
+
+ });
+ container.replace(fragment);
+ target.add(fragment);
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+ return fragment;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
index 77caa68510..0649cf516e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
@@ -1,116 +1,116 @@
-package io.onedev.server.web.page.project.setting.branchprotection;
-
-import org.apache.wicket.Component;
-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.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.model.support.BranchProtection;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-
-@SuppressWarnings("serial")
-abstract class BranchProtectionPanel extends Panel {
-
- private final BranchProtection protection;
-
- public BranchProtectionPanel(String id, BranchProtection protection) {
- super(id);
-
- this.protection = protection;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- BranchProtectionEditor editor = new BranchProtectionEditor("protection", protection) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
- BranchProtectionPanel.this.onSave(target, protection);
- Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
- BranchProtectionPanel.this.replace(protectionViewer);
- target.add(protectionViewer);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
- BranchProtectionPanel.this.replace(protectionViewer);
- target.add(protectionViewer);
- }
-
- };
- BranchProtectionPanel.this.replace(editor);
- target.add(editor);
- }
-
- });
-
- add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this protection?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onDelete(target);
- }
-
- });
-
- AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- protection.setEnabled(!protection.isEnabled());
- onSave(target, protection);
- target.add(BranchProtectionPanel.this);
- }
-
- });
- add(new WebMarkupContainer("enableLabel") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("for", enableCheck.getMarkupId(true));
- }
-
- });
-
- add(BeanContext.viewBean("protection", protection).setOutputMarkupId(true));
-
- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return !protection.isEnabled()? "disabled": "";
- }
-
- }));
-
- setOutputMarkupId(true);
- }
-
- protected abstract void onDelete(AjaxRequestTarget target);
-
- protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);
-
-}
+package io.onedev.server.web.page.project.setting.branchprotection;
+
+import org.apache.wicket.Component;
+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.AjaxCheckBox;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.model.support.BranchProtection;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
+
+@SuppressWarnings("serial")
+abstract class BranchProtectionPanel extends Panel {
+
+ private final BranchProtection protection;
+
+ public BranchProtectionPanel(String id, BranchProtection protection) {
+ super(id);
+
+ this.protection = protection;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("edit") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ BranchProtectionEditPanel editor = new BranchProtectionEditPanel("protection", protection) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, BranchProtection protection) {
+ BranchProtectionPanel.this.onSave(target, protection);
+ Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
+ BranchProtectionPanel.this.replace(protectionViewer);
+ target.add(protectionViewer);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
+ BranchProtectionPanel.this.replace(protectionViewer);
+ target.add(protectionViewer);
+ }
+
+ };
+ BranchProtectionPanel.this.replace(editor);
+ target.add(editor);
+ }
+
+ });
+
+ add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this protection?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onDelete(target);
+ }
+
+ });
+
+ AjaxCheckBox enableCheck;
+ add(enableCheck = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ protection.setEnabled(!protection.isEnabled());
+ onSave(target, protection);
+ target.add(BranchProtectionPanel.this);
+ }
+
+ });
+ add(new WebMarkupContainer("enableLabel") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("for", enableCheck.getMarkupId(true));
+ }
+
+ });
+
+ add(BeanContext.viewBean("protection", protection).setOutputMarkupId(true));
+
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return !protection.isEnabled()? "disabled": "";
+ }
+
+ }));
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onDelete(AjaxRequestTarget target);
+
+ protected abstract void onSave(AjaxRequestTarget target, BranchProtection protection);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.html
similarity index 93%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html
rename to core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.html
index 686f19ab1c..03ab7d417f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.html
@@ -1,10 +1,10 @@
-<wicket:panel>
- <form wicket:id="form" class="leave-confirm">
- <div wicket:id="feedback"></div>
- <div wicket:id="editor"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> &nbsp;
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
- </form>
+<wicket:panel>
+ <form wicket:id="form" class="leave-confirm">
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <button wicket:id="save" class="btn btn-primary dirty-aware">Save</button> &nbsp;
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </form>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java
rename to core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.java
index c9df04c2b9..1d47197303 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditor.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionEditPanel.java
@@ -1,64 +1,64 @@
-package io.onedev.server.web.page.project.setting.tagprotection;
-
-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.form.Form;
-import org.apache.wicket.markup.html.panel.Panel;
-
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.web.editable.BeanContext;
-
-@SuppressWarnings("serial")
-abstract class TagProtectionEditor extends Panel {
-
- private final TagProtection protection;
-
- public TagProtectionEditor(String id, TagProtection protection) {
- super(id);
-
- this.protection = protection;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- setOutputMarkupId(true);
-
- Form<?> form = new Form<Void>("form");
- form.add(new NotificationPanel("feedback", form));
-
- form.add(BeanContext.editBean("editor", protection));
-
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- onSave(target, protection);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(form);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- add(form);
- }
-
- protected abstract void onSave(AjaxRequestTarget target, TagProtection protection);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-}
+package io.onedev.server.web.page.project.setting.tagprotection;
+
+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.form.Form;
+import org.apache.wicket.markup.html.panel.Panel;
+
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.web.editable.BeanContext;
+
+@SuppressWarnings("serial")
+abstract class TagProtectionEditPanel extends Panel {
+
+ private final TagProtection protection;
+
+ public TagProtectionEditPanel(String id, TagProtection protection) {
+ super(id);
+
+ this.protection = protection;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ setOutputMarkupId(true);
+
+ Form<?> form = new Form<Void>("form");
+ form.add(new NotificationPanel("feedback", form));
+
+ form.add(BeanContext.editBean("editor", protection));
+
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target, protection);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(form);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ add(form);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, TagProtection protection);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java
index b9c571b78a..d0bfdc5a3c 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPage.java
@@ -1,120 +1,120 @@
-package io.onedev.server.web.page.project.setting.tagprotection;
-
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-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.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.ProjectManager;
-import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.web.behavior.sortable.SortBehavior;
-import io.onedev.server.web.behavior.sortable.SortPosition;
-import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-
-@SuppressWarnings("serial")
-public class TagProtectionPage extends ProjectSettingPage {
-
- private WebMarkupContainer container;
-
- public TagProtectionPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- container = new WebMarkupContainer("tagProtectionSetting");
- container.setOutputMarkupId(true);
- add(container);
- container.add(new ListView<TagProtection>("protections", new AbstractReadOnlyModel<List<TagProtection>>() {
-
- @Override
- public List<TagProtection> getObject() {
- return getProject().getTagProtections();
- }
- }) {
-
- @Override
- protected void populateItem(final ListItem<TagProtection> item) {
- item.add(new TagProtectionPanel("protection", item.getModelObject()) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- getProject().getTagProtections().remove(item.getIndex());
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
- target.add(container);
- }
-
- @Override
- protected void onSave(AjaxRequestTarget target, TagProtection protection) {
- getProject().getTagProtections().set(item.getIndex(), protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
- }
-
- });
- }
-
- });
-
- container.add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- List<TagProtection> protections = getProject().getTagProtections();
- TagProtection protection = protections.get(from.getItemIndex());
- protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
-
- target.add(container);
- }
-
- }.items("li.protection"));
-
- container.add(newAddNewFrag());
- }
-
- private Component newAddNewFrag() {
- Fragment fragment = new Fragment("newProtection", "addNewLinkFrag", this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- Fragment fragment = new Fragment("newProtection", "editNewFrag", getPage());
- fragment.setOutputMarkupId(true);
- fragment.add(new TagProtectionEditor("editor", new TagProtection()) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, TagProtection protection) {
- getProject().getTagProtections().add(protection);
- OneDev.getInstance(ProjectManager.class).save(getProject(), null);
- container.replace(newAddNewFrag());
- target.add(container);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- Component newAddNewFrag = newAddNewFrag();
- container.replace(newAddNewFrag);
- target.add(newAddNewFrag);
- }
-
- });
- container.replace(fragment);
- target.add(fragment);
- }
-
- });
- fragment.setOutputMarkupId(true);
- return fragment;
- }
-
-}
+package io.onedev.server.web.page.project.setting.tagprotection;
+
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+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.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.page.project.setting.ProjectSettingPage;
+
+@SuppressWarnings("serial")
+public class TagProtectionPage extends ProjectSettingPage {
+
+ private WebMarkupContainer container;
+
+ public TagProtectionPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ container = new WebMarkupContainer("tagProtectionSetting");
+ container.setOutputMarkupId(true);
+ add(container);
+ container.add(new ListView<TagProtection>("protections", new AbstractReadOnlyModel<List<TagProtection>>() {
+
+ @Override
+ public List<TagProtection> getObject() {
+ return getProject().getTagProtections();
+ }
+ }) {
+
+ @Override
+ protected void populateItem(final ListItem<TagProtection> item) {
+ item.add(new TagProtectionPanel("protection", item.getModelObject()) {
+
+ @Override
+ protected void onDelete(AjaxRequestTarget target) {
+ getProject().getTagProtections().remove(item.getIndex());
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ target.add(container);
+ }
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, TagProtection protection) {
+ getProject().getTagProtections().set(item.getIndex(), protection);
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ }
+
+ });
+ }
+
+ });
+
+ container.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ List<TagProtection> protections = getProject().getTagProtections();
+ TagProtection protection = protections.get(from.getItemIndex());
+ protections.set(from.getItemIndex(), protections.set(to.getItemIndex(), protection));
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+
+ target.add(container);
+ }
+
+ }.items("li.protection"));
+
+ container.add(newAddNewFrag());
+ }
+
+ private Component newAddNewFrag() {
+ Fragment fragment = new Fragment("newProtection", "addNewLinkFrag", this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ Fragment fragment = new Fragment("newProtection", "editNewFrag", getPage());
+ fragment.setOutputMarkupId(true);
+ fragment.add(new TagProtectionEditPanel("editor", new TagProtection()) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, TagProtection protection) {
+ getProject().getTagProtections().add(protection);
+ OneDev.getInstance(ProjectManager.class).save(getProject(), null);
+ container.replace(newAddNewFrag());
+ target.add(container);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component newAddNewFrag = newAddNewFrag();
+ container.replace(newAddNewFrag);
+ target.add(newAddNewFrag);
+ }
+
+ });
+ container.replace(fragment);
+ target.add(fragment);
+ }
+
+ });
+ fragment.setOutputMarkupId(true);
+ return fragment;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
index bf877ac338..84337461ac 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
@@ -1,116 +1,116 @@
-package io.onedev.server.web.page.project.setting.tagprotection;
-
-import org.apache.wicket.Component;
-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.AjaxCheckBox;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-
-import io.onedev.server.model.support.TagProtection;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
-
-@SuppressWarnings("serial")
-abstract class TagProtectionPanel extends Panel {
-
- private final TagProtection protection;
-
- public TagProtectionPanel(String id, TagProtection protection) {
- super(id);
-
- this.protection = protection;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- add(new AjaxLink<Void>("edit") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- TagProtectionEditor editor = new TagProtectionEditor("protection", protection) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, TagProtection protection) {
- TagProtectionPanel.this.onSave(target, protection);
- Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
- TagProtectionPanel.this.replace(protectionViewer);
- target.add(protectionViewer);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
- TagProtectionPanel.this.replace(protectionViewer);
- target.add(protectionViewer);
- }
-
- };
- TagProtectionPanel.this.replace(editor);
- target.add(editor);
- }
-
- });
-
- add(new AjaxLink<Void>("delete") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this protection?"));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onDelete(target);
- }
-
- });
-
- AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- protection.setEnabled(!protection.isEnabled());
- onSave(target, protection);
- target.add(TagProtectionPanel.this);
- }
-
- });
- add(new WebMarkupContainer("enableLabel") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("for", enableCheck.getMarkupId(true));
- }
-
- });
-
- add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
-
- @Override
- protected String load() {
- return !protection.isEnabled()? "disabled": "";
- }
-
- }));
-
- add(BeanContext.viewBean("protection", protection).setOutputMarkupId(true));
-
- setOutputMarkupId(true);
- }
-
- protected abstract void onDelete(AjaxRequestTarget target);
-
- protected abstract void onSave(AjaxRequestTarget target, TagProtection protection);
-
-}
+package io.onedev.server.web.page.project.setting.tagprotection;
+
+import org.apache.wicket.Component;
+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.AjaxCheckBox;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.model.support.TagProtection;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
+
+@SuppressWarnings("serial")
+abstract class TagProtectionPanel extends Panel {
+
+ private final TagProtection protection;
+
+ public TagProtectionPanel(String id, TagProtection protection) {
+ super(id);
+
+ this.protection = protection;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new AjaxLink<Void>("edit") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ TagProtectionEditPanel editor = new TagProtectionEditPanel("protection", protection) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, TagProtection protection) {
+ TagProtectionPanel.this.onSave(target, protection);
+ Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
+ TagProtectionPanel.this.replace(protectionViewer);
+ target.add(protectionViewer);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ Component protectionViewer = BeanContext.viewBean("protection", protection).setOutputMarkupId(true);
+ TagProtectionPanel.this.replace(protectionViewer);
+ target.add(protectionViewer);
+ }
+
+ };
+ TagProtectionPanel.this.replace(editor);
+ target.add(editor);
+ }
+
+ });
+
+ add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this protection?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onDelete(target);
+ }
+
+ });
+
+ AjaxCheckBox enableCheck;
+ add(enableCheck = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ protection.setEnabled(!protection.isEnabled());
+ onSave(target, protection);
+ target.add(TagProtectionPanel.this);
+ }
+
+ });
+ add(new WebMarkupContainer("enableLabel") {
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+ tag.put("for", enableCheck.getMarkupId(true));
+ }
+
+ });
+
+ add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ return !protection.isEnabled()? "disabled": "";
+ }
+
+ }));
+
+ add(BeanContext.viewBean("protection", protection).setOutputMarkupId(true));
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onDelete(AjaxRequestTarget target);
+
+ protected abstract void onSave(AjaxRequestTarget target, TagProtection protection);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 66db87025c..d5197a5b36 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -1,37 +1,37 @@
-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;
-
-@SuppressWarnings("serial")
-public class TestPage extends BasePage {
-
- public TestPage(PageParameters params) {
- super(params);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Link<Void>("test") {
-
- @Override
- public void onClick() {
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new TestResourceReference()));
- response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));
- }
-
-}
+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;
+
+@SuppressWarnings("serial")
+public class TestPage extends BasePage {
+
+ public TestPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(JavaScriptHeaderItem.forReference(new TestResourceReference()));
+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.test.onDomReady();"));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/util/Testable.java b/core/src/main/java/io/onedev/server/web/util/Testable.java
new file mode 100644
index 0000000000..4e40f83491
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/util/Testable.java
@@ -0,0 +1,9 @@
+package io.onedev.server.web.util;
+
+import java.io.Serializable;
+
+public interface Testable<T extends Serializable> {
+
+ void test(T data);
+
+}
diff --git a/pom.xml b/pom.xml
index 62c96c0fad..63d57ce8ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,216 +1,216 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>io.onedev</groupId>
- <artifactId>parent</artifactId>
- <version>1.0.2</version>
- </parent>
- <artifactId>server</artifactId>
- <version>2.1.2</version>
- <packaging>pom</packaging>
- <build>
- <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.antlr</groupId>
- <artifactId>antlr4-maven-plugin</artifactId>
- <version>${antlr.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>antlr4</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
- <listener>true</listener>
- <visitor>true</visitor>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.m2e</groupId>
- <artifactId>lifecycle-mapping</artifactId>
- <version>1.0.0</version>
- <configuration>
- <lifecycleMappingMetadata>
- <pluginExecutions>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>io.onedev</groupId>
- <artifactId>plugin-maven</artifactId>
- <versionRange>[1.0.3,]</versionRange>
- <goals>
- <goal>generate-artifact-descriptor</goal>
- <goal>generate-plugin-descriptor</goal>
- <goal>generate-product-descriptor</goal>
- <goal>copy-product-resources</goal>
- <goal>create-product-sandbox</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>true</runOnIncremental>
- <runOnConfiguration>true</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>groovy-maven-plugin</artifactId>
- <versionRange>[2.0,]</versionRange>
- <goals>
- <goal>execute</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <execute>
- <runOnIncremental>true</runOnIncremental>
- <runOnConfiguration>true</runOnConfiguration>
- </execute>
- </action>
- </pluginExecution>
- <pluginExecution>
- <pluginExecutionFilter>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <versionRange>[1.0.0,]</versionRange>
- <goals>
- <goal>jar</goal>
- </goals>
- </pluginExecutionFilter>
- <action>
- <ignore/>
- </action>
- </pluginExecution>
- </pluginExecutions>
- </lifecycleMappingMetadata>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-jar-plugin</artifactId>
- <version>3.0.2</version>
- <executions>
- <execution>
- <id>default-jar</id>
- <phase>never</phase>
- <configuration>
- <finalName>unwanted</finalName>
- <classifier>unwanted</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>io.onedev</groupId>
- <artifactId>plugin-maven</artifactId>
- <version>1.0.3</version>
- <executions>
- <execution>
- <id>generate-artifact-descriptor</id>
- <phase>compile</phase>
- <goals>
- <goal>generate-artifact-descriptor</goal>
- </goals>
- </execution>
- <execution>
- <id>generate-plugin-descriptor</id>
- <phase>compile</phase>
- <goals>
- <goal>generate-plugin-descriptor</goal>
- </goals>
- </execution>
- <execution>
- <id>create-product-sandbox</id>
- <phase>compile</phase>
- <goals>
- <goal>create-product-sandbox</goal>
- </goals>
- </execution>
- <execution>
- <id>package-artifact</id>
- <phase>package</phase>
- <goals>
- <goal>package-artifact</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </pluginManagement>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <excludes>
- <exclude>**/*.java</exclude>
- </excludes>
- </resource>
- <resource>
- <directory>src/main/resources</directory>
- </resource>
- <resource>
- <directory>target/generated-sources/antlr4</directory>
- <includes>
- <include>*.tokens</include>
- </includes>
- </resource>
- </resources>
- </build>
- <modules>
- <module>core</module>
- <module>product</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-launcher-loader</artifactId>
- <version>${commons.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-launcher-loader</artifactId>
- <type>test-jar</type>
- <version>${commons.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-codeassist</artifactId>
- <version>${commons.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-jsymbol</artifactId>
- <version>${commons.version}</version>
- </dependency>
- <dependency>
- <groupId>io.onedev</groupId>
- <artifactId>commons-jsyntax</artifactId>
- <version>${commons.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <repositories>
- <repository>
- <id>pmeaseRepo</id>
- <url>http://artifact.pmease.com/artifactory/pmeaseRepo</url>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>always</updatePolicy>
- <checksumPolicy>fail</checksumPolicy>
- </snapshots>
- </repository>
- </repositories>
- <properties>
- <commons.version>1.0.9</commons.version>
- <antlr.version>4.7.2</antlr.version>
- </properties>
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>io.onedev</groupId>
+ <artifactId>parent</artifactId>
+ <version>1.0.2</version>
+ </parent>
+ <artifactId>server</artifactId>
+ <version>2.1.2</version>
+ <packaging>pom</packaging>
+ <build>
+ <finalName>${project.groupId}.${project.artifactId}-${project.version}</finalName>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr4-maven-plugin</artifactId>
+ <version>${antlr.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>antlr4</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
+ <listener>true</listener>
+ <visitor>true</visitor>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.eclipse.m2e</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>1.0.0</version>
+ <configuration>
+ <lifecycleMappingMetadata>
+ <pluginExecutions>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>io.onedev</groupId>
+ <artifactId>plugin-maven</artifactId>
+ <versionRange>[1.0.3,]</versionRange>
+ <goals>
+ <goal>generate-artifact-descriptor</goal>
+ <goal>generate-plugin-descriptor</goal>
+ <goal>generate-product-descriptor</goal>
+ <goal>copy-product-resources</goal>
+ <goal>create-product-sandbox</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <versionRange>[2.0,]</versionRange>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <execute>
+ <runOnIncremental>true</runOnIncremental>
+ <runOnConfiguration>true</runOnConfiguration>
+ </execute>
+ </action>
+ </pluginExecution>
+ <pluginExecution>
+ <pluginExecutionFilter>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <versionRange>[1.0.0,]</versionRange>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </pluginExecutionFilter>
+ <action>
+ <ignore/>
+ </action>
+ </pluginExecution>
+ </pluginExecutions>
+ </lifecycleMappingMetadata>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.0.2</version>
+ <executions>
+ <execution>
+ <id>default-jar</id>
+ <phase>never</phase>
+ <configuration>
+ <finalName>unwanted</finalName>
+ <classifier>unwanted</classifier>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>io.onedev</groupId>
+ <artifactId>plugin-maven</artifactId>
+ <version>1.0.3</version>
+ <executions>
+ <execution>
+ <id>generate-artifact-descriptor</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate-artifact-descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>generate-plugin-descriptor</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>generate-plugin-descriptor</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>create-product-sandbox</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>create-product-sandbox</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>package-artifact</id>
+ <phase>package</phase>
+ <goals>
+ <goal>package-artifact</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <resources>
+ <resource>
+ <directory>src/main/java</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>target/generated-sources/antlr4</directory>
+ <includes>
+ <include>*.tokens</include>
+ </includes>
+ </resource>
+ </resources>
+ </build>
+ <modules>
+ <module>core</module>
+ <module>product</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-launcher-loader</artifactId>
+ <type>test-jar</type>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-codeassist</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsymbol</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.onedev</groupId>
+ <artifactId>commons-jsyntax</artifactId>
+ <version>${commons.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <repositories>
+ <repository>
+ <id>pmeaseRepo</id>
+ <url>http://artifact.pmease.com/artifactory/pmeaseRepo</url>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>always</updatePolicy>
+ <checksumPolicy>fail</checksumPolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <properties>
+ <commons.version>1.0.10</commons.version>
+ <antlr.version>4.7.2</antlr.version>
+ </properties>
</project>
\ No newline at end of file
diff --git a/product/src/test/java/io/onedev/server/product/Test.java b/product/src/test/java/io/onedev/server/product/Test.java
index f52a643bed..5a9ac81d88 100644
--- a/product/src/test/java/io/onedev/server/product/Test.java
+++ b/product/src/test/java/io/onedev/server/product/Test.java
@@ -1,11 +1,9 @@
-package io.onedev.server.product;
-
-import java.io.IOException;
-
-public class Test {
-
- @org.junit.Test
- public void test() throws IOException {
- }
-
+package io.onedev.server.product;
+
+public class Test {
+
+ @org.junit.Test
+ public void test() {
+ }
+
}
\ No newline at end of file