Fix issue #1242 - Validate tag name to avoid invalid chars in create tag step

server-core/src/main/java/io/onedev/server/CoreModule.java

@@ -210,7 +210,7 @@ import io.onedev.server.util.jackson.hibernate.HibernateObjectMapperConfigurator
 import io.onedev.server.util.schedule.DefaultTaskScheduler;
 import io.onedev.server.util.schedule.TaskScheduler;
 import io.onedev.server.util.ScriptContribution;
-import io.onedev.server.util.validation.ValidatorProvider;
+import io.onedev.server.validation.ValidatorProvider;
 import io.onedev.server.util.xstream.CollectionConverter;
 import io.onedev.server.util.xstream.HibernateProxyConverter;
 import io.onedev.server.util.xstream.MapConverter;

server-core/src/main/java/io/onedev/server/annotation/ActionCondition.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/AgentQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.AgentQueryValidator;
+import io.onedev.server.validation.validator.AgentQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/AttributeName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.AttributeNameValidator;
+import io.onedev.server.validation.validator.AttributeNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/BlobChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/BranchChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/BuildChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/BuildQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.BuildQueryValidator;
+import io.onedev.server.validation.validator.BuildQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ChoiceProvider.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/ClassValidating.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -9,7 +9,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ClassValidatingValidator;
+import io.onedev.server.validation.validator.ClassValidatingValidator;
 
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Code.java

@@ -6,7 +6,7 @@
  * 
  * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $
  */
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -16,7 +16,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.CodeValidator;
+import io.onedev.server.validation.validator.CodeValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/CodeCommentQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.CodeCommentQueryValidator;
+import io.onedev.server.validation.validator.CodeCommentQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Color.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/CommitHash.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.CommitHashValidator;
+import io.onedev.server.validation.validator.CommitHashValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/CommitQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.CommitQueryValidator;
+import io.onedev.server.validation.validator.CommitQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/CronExpression.java

@@ -5,7 +5,7 @@
  *
  * Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $
  */
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -15,7 +15,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.CronExpressionValidator;
+import io.onedev.server.validation.validator.CronExpressionValidator;
 
 /**
  * @author robin

server-core/src/main/java/io/onedev/server/annotation/CurrentPassword.java

@@ -5,7 +5,7 @@
  *
  * Revision: $Id: PathElement.java 1209 2008-07-28 00:16:18Z robin $
  */
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -15,7 +15,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.CurrentPasswordValidator;
+import io.onedev.server.validation.validator.CurrentPasswordValidator;
 
 /**
  * @author robin

server-core/src/main/java/io/onedev/server/annotation/Directory.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.DirectoryValidator;
+import io.onedev.server.validation.validator.DirectoryValidator;
 
 /**
  * @author robin

server-core/src/main/java/io/onedev/server/annotation/DnsName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.DnsNameValidator;
+import io.onedev.server.validation.validator.DnsNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Editable.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/EnvironmentName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.EnvironmentNameValidator;
+import io.onedev.server.validation.validator.EnvironmentNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ExcludedProperties.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/FieldName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.FieldNameValidator;
+import io.onedev.server.validation.validator.FieldNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/FieldNamesProvider.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/GroupChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/GroupName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.GroupNameValidator;
+import io.onedev.server.validation.validator.GroupNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Horizontal.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/Interpolative.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.InterpolativeValidator;
+import io.onedev.server.validation.validator.InterpolativeValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/IssueChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/IssueQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.IssueQueryValidator;
+import io.onedev.server.validation.validator.IssueQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/JobChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/JobMatch.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.JobMatchValidator;
+import io.onedev.server.validation.validator.JobMatchValidator;
 
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Markdown.java

@@ -6,7 +6,7 @@
  * 
  * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $
  */
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/MilestoneChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/MilestoneName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ProjectNameValidator;
+import io.onedev.server.validation.validator.ProjectNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Multiline.java

@@ -6,7 +6,7 @@
  * 
  * Revision: $Id: Multiline.java 1209 2008-07-28 00:16:18Z robin $
  */
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/NotificationReceiver.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.NotificationReceiverValidator;
+import io.onedev.server.validation.validator.NotificationReceiverValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/Numeric.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.NumericValidator;
+import io.onedev.server.validation.validator.NumericValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/OmitName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/ParamName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ParamNameValidator;
+import io.onedev.server.validation.validator.ParamNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ParamSpecProvider.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/ParentChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/Password.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/PathSegment.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.PathSegmentValidator;
+import io.onedev.server.validation.validator.PathSegmentValidator;
 
 /**
  * @author robin

server-core/src/main/java/io/onedev/server/annotation/Patterns.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.PatternsValidator;
+import io.onedev.server.validation.validator.PatternsValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ProjectChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/ProjectName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ProjectNameValidator;
+import io.onedev.server.validation.validator.ProjectNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ProjectPath.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ProjectPathValidator;
+import io.onedev.server.validation.validator.ProjectPathValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ProjectQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ProjectQueryValidator;
+import io.onedev.server.validation.validator.ProjectQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/PullRequestChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/PullRequestQuery.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.PullRequestQueryValidator;
+import io.onedev.server.validation.validator.PullRequestQueryValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ReferenceAware.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/RefreshToken.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/RegEx.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.RegExValidator;
+import io.onedev.server.validation.validator.RegExValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/RetryCondition.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/ReviewRequirement.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.ReviewRequirementValidator;
+import io.onedev.server.validation.validator.ReviewRequirementValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD, ElementType.ANNOTATION_TYPE})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/RevisionChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/RoleChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/RoleName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.RoleNameValidator;
+import io.onedev.server.validation.validator.RoleNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/SafePath.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.SafePathValidator;
+import io.onedev.server.validation.validator.SafePathValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ScriptChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/SecretName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.SecretNameValidator;
+import io.onedev.server.validation.validator.SecretNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/ShowCondition.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/SuggestionProvider.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/TagName.java

@@ -0,0 +1,22 @@
+package io.onedev.server.annotation;
+
+import io.onedev.server.validation.validator.TagNameValidator;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Constraint(validatedBy = TagNameValidator.class) 
+public @interface TagName {
+
+	String message() default "";
+	
+    Class<?>[] groups() default {};
+
+    Class<? extends Payload>[] payload() default {};
+}

server-core/src/main/java/io/onedev/server/annotation/UrlPath.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.UrlPathValidator;
+import io.onedev.server.validation.validator.UrlPathValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/UrlSegment.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.UrlSegmentValidator;
+import io.onedev.server.validation.validator.UrlSegmentValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/UserChoice.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/UserMatch.java

@@ -1,6 +1,6 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
-import io.onedev.server.util.validation.UserMatchValidator;
+import io.onedev.server.validation.validator.UserMatchValidator;
 
 import javax.validation.Constraint;
 import javax.validation.Payload;

server-core/src/main/java/io/onedev/server/annotation/UserName.java

@@ -1,4 +1,4 @@
-package io.onedev.server.util.validation.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -8,7 +8,7 @@ import java.lang.annotation.Target;
 import javax.validation.Constraint;
 import javax.validation.Payload;
 
-import io.onedev.server.util.validation.UserNameValidator;
+import io.onedev.server.validation.validator.UserNameValidator;
 
 @Target({ElementType.METHOD, ElementType.FIELD})
 @Retention(RetentionPolicy.RUNTIME)

server-core/src/main/java/io/onedev/server/annotation/VariableOption.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/Vertical.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/WithTime.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/annotation/WorkingPeriod.java

@@ -1,4 +1,4 @@
-package io.onedev.server.web.editable.annotation;
+package io.onedev.server.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java

@@ -27,9 +27,9 @@ import io.onedev.server.model.Project;
 import io.onedev.server.model.support.build.JobProperty;
 import io.onedev.server.security.SecurityUtils;
 import io.onedev.server.util.ComponentContext;
-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.validation.Validatable;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.Editable;
 import io.onedev.server.web.page.project.blob.ProjectBlobPage;
 import io.onedev.server.web.util.SuggestionUtils;
 import io.onedev.server.web.util.WicketUtils;

server-core/src/main/java/io/onedev/server/buildspec/Import.java

@@ -17,11 +17,11 @@ import io.onedev.server.security.permission.ProjectPermission;
 import io.onedev.server.security.permission.ReadCode;
 import io.onedev.server.util.EditContext;
 import io.onedev.server.util.facade.ProjectCache;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
+import io.onedev.server.validation.Validatable;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
 import io.onedev.server.web.page.project.ProjectPage;
 import io.onedev.server.web.util.SuggestionUtils;
 import io.onedev.server.web.util.WicketUtils;

server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java

@@ -2,7 +2,7 @@ package io.onedev.server.buildspec;
 
 import java.io.Serializable;
 
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 @Editable
 public interface NamedElement extends Serializable {

server-core/src/main/java/io/onedev/server/buildspec/Service.java

@@ -12,10 +12,10 @@ import io.onedev.commons.codeassist.InputCompletion;
 import io.onedev.commons.codeassist.InputStatus;
 import io.onedev.commons.codeassist.InputSuggestion;
 import io.onedev.server.buildspec.job.EnvVar;
-import io.onedev.server.util.validation.annotation.DnsName;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
-import io.onedev.server.web.editable.annotation.SuggestionProvider;
+import io.onedev.server.annotation.DnsName;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.SuggestionProvider;
 
 @Editable
 public class Service implements NamedElement, Serializable {

server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java

@@ -10,11 +10,11 @@ import javax.validation.constraints.NotEmpty;
 import io.onedev.commons.codeassist.InputSuggestion;
 import io.onedev.commons.utils.PathUtils;
 import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.util.validation.annotation.RegEx;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
+import io.onedev.server.validation.Validatable;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.RegEx;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
 
 @Editable
 @ClassValidating

server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java

@@ -7,9 +7,9 @@ import javax.validation.constraints.NotEmpty;
 
 import io.onedev.commons.codeassist.InputSuggestion;
 import io.onedev.server.buildspec.BuildSpec;
-import io.onedev.server.util.validation.annotation.EnvironmentName;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
+import io.onedev.server.annotation.EnvironmentName;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
 
 @Editable
 public class EnvVar implements Serializable {

server-core/src/main/java/io/onedev/server/buildspec/job/Job.java

@@ -4,6 +4,7 @@ import io.onedev.commons.codeassist.InputCompletion;
 import io.onedev.commons.codeassist.InputStatus;
 import io.onedev.commons.codeassist.InputSuggestion;
 import io.onedev.server.OneDev;
+import io.onedev.server.annotation.*;
 import io.onedev.server.buildspec.BuildSpec;
 import io.onedev.server.buildspec.BuildSpecAware;
 import io.onedev.server.buildspec.NamedElement;
@@ -25,9 +26,7 @@ import io.onedev.server.security.SecurityUtils;
 import io.onedev.server.util.ComponentContext;
 import io.onedev.server.util.EditContext;
 import io.onedev.server.util.criteria.Criteria;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.*;
+import io.onedev.server.validation.Validatable;
 import io.onedev.server.web.page.project.blob.ProjectBlobPage;
 import io.onedev.server.web.util.SuggestionUtils;
 import io.onedev.server.web.util.WicketUtils;

server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java

@@ -14,13 +14,13 @@ import io.onedev.server.buildspec.param.spec.ParamSpec;
 import io.onedev.server.buildspec.param.supply.ParamSupply;
 import io.onedev.server.util.ComponentContext;
 import io.onedev.server.util.EditContext;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
-import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.editable.annotation.ParamSpecProvider;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.editable.annotation.VariableOption;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.annotation.ParamSpecProvider;
+import io.onedev.server.annotation.Patterns;
+import io.onedev.server.annotation.VariableOption;
 import io.onedev.server.web.util.WicketUtils;
 
 @Editable

server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java

@@ -23,11 +23,11 @@ import io.onedev.server.model.support.issue.field.FieldUtils;
 import io.onedev.server.model.support.issue.field.supply.FieldSupply;
 import io.onedev.server.persistence.TransactionManager;
 import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.FieldNamesProvider;
-import io.onedev.server.web.editable.annotation.Interpolative;
-import io.onedev.server.web.editable.annotation.Multiline;
-import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.FieldNamesProvider;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.Multiline;
+import io.onedev.server.annotation.OmitName;
 
 @Editable(name="Create issue", order=300)
 public class CreateIssueAction extends PostBuildAction {

server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java

@@ -7,8 +7,8 @@ import javax.validation.constraints.NotEmpty;
 import io.onedev.server.buildspec.BuildSpec;
 import io.onedev.server.buildspec.job.Job;
 import io.onedev.server.model.Build;
-import io.onedev.server.web.editable.annotation.ActionCondition;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.ActionCondition;
+import io.onedev.server.annotation.Editable;
 
 @Editable
 public abstract class PostBuildAction implements Serializable {

server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java

@@ -1,6 +1,7 @@
 package io.onedev.server.buildspec.job.action;
 
 import io.onedev.server.OneDev;
+import io.onedev.server.annotation.*;
 import io.onedev.server.buildspec.BuildSpec;
 import io.onedev.server.buildspec.BuildSpecAware;
 import io.onedev.server.buildspec.job.Job;
@@ -12,7 +13,6 @@ import io.onedev.server.model.Build;
 import io.onedev.server.util.ComponentContext;
 import io.onedev.server.util.EditContext;
 import io.onedev.server.util.MatrixRunner;
-import io.onedev.server.web.editable.annotation.*;
 import io.onedev.server.web.util.WicketUtils;
 import org.apache.wicket.Component;
 

server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java

@@ -6,8 +6,8 @@ import io.onedev.server.OneDev;
 import io.onedev.server.event.project.build.BuildFinished;
 import io.onedev.server.model.Build;
 import io.onedev.server.notification.BuildNotificationManager;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.NotificationReceiver;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.NotificationReceiver;
 
 @Editable(name="Send notification", order=200)
 public class SendNotificationAction extends PostBuildAction {

server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/DefaultCredential.java

@@ -5,7 +5,7 @@ import io.onedev.k8shelper.DefaultCloneInfo;
 import io.onedev.server.OneDev;
 import io.onedev.server.entitymanager.UrlManager;
 import io.onedev.server.model.Build;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 @Editable(name="Default", order=100)
 public class DefaultCredential implements GitCredential {

server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/GitCredential.java

@@ -4,7 +4,7 @@ import java.io.Serializable;
 
 import io.onedev.k8shelper.CloneInfo;
 import io.onedev.server.model.Build;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 @Editable
 public interface GitCredential extends Serializable {

server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/HttpCredential.java

@@ -13,10 +13,10 @@ import io.onedev.server.OneDev;
 import io.onedev.server.entitymanager.UrlManager;
 import io.onedev.server.model.Build;
 import io.onedev.server.model.Project;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.validation.Validatable;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
 
 @Editable(name="HTTP(S)", order=200)
 @ClassValidating

server-core/src/main/java/io/onedev/server/buildspec/job/gitcredential/SshCredential.java

@@ -20,10 +20,10 @@ import io.onedev.server.model.Build;
 import io.onedev.server.model.Project;
 import io.onedev.server.model.support.administration.SshSetting;
 import io.onedev.server.model.support.administration.SystemSetting;
-import io.onedev.server.util.validation.Validatable;
-import io.onedev.server.util.validation.annotation.ClassValidating;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.validation.Validatable;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
 
 @Editable(name="SSH", order=300)
 @ClassValidating

server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/BuildProvider.java

@@ -6,7 +6,7 @@ import javax.annotation.Nullable;
 
 import io.onedev.server.model.Build;
 import io.onedev.server.model.Project;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 @Editable
 public interface BuildProvider extends Serializable {

server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/LastFinishedBuild.java

@@ -11,9 +11,9 @@ import io.onedev.server.entitymanager.BuildManager;
 import io.onedev.server.model.Build;
 import io.onedev.server.model.Project;
 import io.onedev.server.util.EditContext;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.OmitName;
 
 @Editable(order=100, name="Last Finished of Specified Job")
 public class LastFinishedBuild implements BuildProvider {

server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/ProjectDependency.java

@@ -20,10 +20,10 @@ import io.onedev.server.security.SecurityUtils;
 import io.onedev.server.security.permission.AccessProject;
 import io.onedev.server.util.EditContext;
 import io.onedev.server.util.facade.ProjectCache;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
-import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.annotation.ChoiceProvider;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.Patterns;
 import io.onedev.server.web.page.project.ProjectPage;
 import io.onedev.server.web.util.WicketUtils;
 

server-core/src/main/java/io/onedev/server/buildspec/job/projectdependency/SpecifiedBuild.java

@@ -13,9 +13,9 @@ import io.onedev.server.model.Build;
 import io.onedev.server.model.Project;
 import io.onedev.server.util.EditContext;
 import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Interpolative;
-import io.onedev.server.web.editable.annotation.OmitName;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Interpolative;
+import io.onedev.server.annotation.OmitName;
 import io.onedev.server.web.util.SuggestionUtils;
 
 @Editable(order=200, name="Specify by Build Number")

server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java

@@ -12,8 +12,8 @@ import io.onedev.server.model.Project;
 import io.onedev.server.util.match.Matcher;
 import io.onedev.server.util.match.PathMatcher;
 import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Patterns;
 import io.onedev.server.web.util.SuggestionUtils;
 import org.eclipse.jgit.lib.ObjectId;
 import org.eclipse.jgit.lib.Repository;

server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java

@@ -8,7 +8,7 @@ import io.onedev.server.event.project.ProjectEvent;
 import io.onedev.server.event.project.build.BuildFinished;
 import io.onedev.server.model.Build;
 import io.onedev.server.model.Build.Status;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 import java.util.List;
 

server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java

@@ -22,11 +22,11 @@ import io.onedev.server.util.ComponentContext;
 import io.onedev.server.util.match.Matcher;
 import io.onedev.server.util.match.PathMatcher;
 import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.OmitName;
-import io.onedev.server.web.editable.annotation.ParamSpecProvider;
-import io.onedev.server.web.editable.annotation.Patterns;
-import io.onedev.server.web.editable.annotation.VariableOption;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.OmitName;
+import io.onedev.server.annotation.ParamSpecProvider;
+import io.onedev.server.annotation.Patterns;
+import io.onedev.server.annotation.VariableOption;
 import io.onedev.server.web.util.SuggestionUtils;
 import io.onedev.server.web.util.WicketUtils;
 

server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestDiscardTrigger.java

@@ -5,7 +5,7 @@ import io.onedev.server.buildspec.job.TriggerMatch;
 import io.onedev.server.event.project.ProjectEvent;
 import io.onedev.server.event.project.pullrequest.PullRequestChanged;
 import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 @Editable(order=320, name="Pull request discard", description="Job will run on head commit of target branch")
 public class PullRequestDiscardTrigger extends PullRequestTrigger {

server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestMergeTrigger.java

@@ -5,7 +5,7 @@ import io.onedev.server.buildspec.job.TriggerMatch;
 import io.onedev.server.event.project.ProjectEvent;
 import io.onedev.server.event.project.pullrequest.PullRequestChanged;
 import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
-import io.onedev.server.web.editable.annotation.Editable;
+import io.onedev.server.annotation.Editable;
 
 @Editable(order=310, name="Pull request merge", description="Job will run on merge commit of target branch and source branch")
 public class PullRequestMergeTrigger extends PullRequestTrigger {

server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java

@@ -10,8 +10,8 @@ import io.onedev.server.model.PullRequest;
 import io.onedev.server.util.match.Matcher;
 import io.onedev.server.util.match.PathMatcher;
 import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.editable.annotation.Patterns;
+import io.onedev.server.annotation.Editable;
+import io.onedev.server.annotation.Patterns;
 import io.onedev.server.web.util.SuggestionUtils;
 import org.eclipse.jgit.lib.Repository;