From 698261f2e2af49c8d5a9a8a48fe4f62bc21fc88a Mon Sep 17 00:00:00 2001 From: Robin Shen Date: Wed, 27 Nov 2019 19:55:42 +0800 Subject: [PATCH] Use build spec instead of ci spec --- .../java/io/onedev/server/CoreModule.java | 10 +-- .../CISpec.java => buildspec/BuildSpec.java} | 30 +++---- .../server/buildspec/BuildSpecAware.java | 10 +++ .../buildspec/InvalidBuildSpecException.java | 13 +++ .../{ci => buildspec}/job/Authentication.java | 2 +- .../{ci => buildspec}/job/CacheSpec.java | 2 +- .../CancellerAwareCancellationException.java | 2 +- .../job/DefaultJobManager.java | 26 +++--- .../server/{ci => buildspec}/job/EnvVar.java | 2 +- .../server/{ci => buildspec}/job/Job.java | 24 +++--- .../{ci => buildspec}/job/JobAware.java | 2 +- .../{ci => buildspec}/job/JobContext.java | 2 +- .../{ci => buildspec}/job/JobDependency.java | 20 ++--- .../{ci => buildspec}/job/JobExecution.java | 2 +- .../job/JobExecutorDiscoverer.java | 2 +- .../{ci => buildspec}/job/JobManager.java | 2 +- .../{ci => buildspec}/job/JobReport.java | 2 +- .../{ci => buildspec}/job/JobService.java | 2 +- .../{ci => buildspec}/job/JobSuggestion.java | 2 +- .../{ci => buildspec}/job/JobVariable.java | 2 +- .../job/ProjectDependency.java | 2 +- .../job/SubmoduleCredential.java | 2 +- .../job/VariableInterpolator.java | 4 +- .../job/action/CreateIssueAction.java | 10 +-- .../job/action/PostBuildAction.java | 10 +-- .../job/action/RunJobAction.java | 30 +++---- .../job/action/SendNotificationAction.java | 4 +- .../job/action/condition/ActionCondition.g4 | 0 .../job/action/condition/ActionCondition.java | 25 +++--- .../job/action/condition/AlwaysCriteria.java | 2 +- .../AssociatedWithPullRequestsCriteria.java | 2 +- .../action/condition/CancelledCriteria.java | 2 +- .../condition}/ErrorMessageCriteria.java | 2 +- .../job/action/condition/FailedCriteria.java | 2 +- .../job/action/condition}/LogCriteria.java | 4 +- .../action/condition/OnBranchCriteria.java | 2 +- .../job/action/condition}/ParamCriteria.java | 2 +- .../PreviousIsCancelledCriteria.java | 2 +- .../condition/PreviousIsFailedCriteria.java | 2 +- .../PreviousIsSuccessfulCriteria.java | 2 +- .../condition/PreviousIsTimedOutCriteria.java | 2 +- .../RequiredByPullRequestsCriteria.java | 2 +- .../action/condition/SuccessfulCriteria.java | 2 +- .../action/condition/TimedOutCriteria.java | 2 +- .../NotificationReceiver.g4 | 0 .../NotificationReceiver.java | 8 +- .../job/log/DefaultLogManager.java | 8 +- .../job/log/JobLogEntry.java | 2 +- .../{ci => buildspec}/job/log/LogManager.java | 2 +- .../{ci => buildspec}/job/log/LogSnippet.java | 2 +- .../job/log/instruction/LogInstruction.g4 | 0 .../job/log/instruction/LogInstruction.java | 6 +- .../job/log/instruction/SetBuildVersion.java | 2 +- .../job/paramspec/BooleanParam.java | 2 +- .../job/paramspec/BuildChoiceParam.java | 2 +- .../job/paramspec/ChoiceParam.java | 2 +- .../job/paramspec/CommitParam.java | 2 +- .../job/paramspec/DateParam.java | 2 +- .../job/paramspec/GroupChoiceParam.java | 2 +- .../job/paramspec/IssueChoiceParam.java | 2 +- .../job/paramspec/NumberParam.java | 2 +- .../job/paramspec/ParamSpec.java | 2 +- .../job/paramspec/PullRequestChoiceParam.java | 2 +- .../job/paramspec/SecretParam.java | 2 +- .../job/paramspec/TextParam.java | 2 +- .../job/paramspec/UserChoiceParam.java | 2 +- .../job/paramsupply/ParamSupply.java | 8 +- .../job/paramsupply/ScriptingValues.java | 2 +- .../job/paramsupply/SpecifiedValues.java | 2 +- .../job/paramsupply/ValuesProvider.java | 2 +- .../job/retrycondition/Criteria.java | 2 +- .../retrycondition}/ErrorMessageCriteria.java | 2 +- .../job/retrycondition}/LogCriteria.java | 4 +- .../job/retrycondition/NeverCriteria.java | 2 +- .../job/retrycondition}/ParamCriteria.java | 2 +- .../job/retrycondition/RetryCondition.g4 | 0 .../job/retrycondition/RetryCondition.java | 21 ++--- .../job/trigger/BranchUpdateTrigger.java | 4 +- .../trigger/DependencyFinishedTrigger.java | 8 +- .../job/trigger/JobTrigger.java | 10 +-- .../job/trigger/PullRequestTrigger.java | 4 +- .../job/trigger/TagCreateTrigger.java | 4 +- .../java/io/onedev/server/ci/CISpecAware.java | 10 --- .../server/ci/InvalidCISpecException.java | 13 --- .../impl/DefaultBuildParamManager.java | 2 +- .../impl/DefaultPullRequestManager.java | 18 ++--- .../java/io/onedev/server/model/Build.java | 22 ++--- .../java/io/onedev/server/model/Project.java | 36 ++++----- .../AutoDiscoveredJobExecutor.java | 7 +- .../jobexecutor/JobExecutor.java | 2 +- .../jobexecutor/ServiceLocator.java | 2 +- .../choiceprovider/SpecifiedChoices.java | 2 +- .../server/util/markdown/UrlProcessor.java | 52 ++++++------ .../NotificationReceiverValidator.java | 2 +- .../server/web/asset/codemirror/codemirror.js | 12 ++- .../web/behavior/ActionConditionBehavior.java | 12 +-- .../NotificationReceiverBehavior.java | 2 +- .../web/behavior/RetryConditionBehavior.java | 12 +-- .../server/web/component/blob/BlobPicker.java | 10 ++- .../component/build/log/BuildLogPanel.java | 6 +- .../component/build/side/BuildSidePanel.java | 2 +- .../commit/status/CommitStatusPanel.java | 12 +-- .../issue/fieldvalues/FieldValuesPanel.java | 2 +- .../server/web/component/job/JobDefLink.java | 10 +-- .../server/web/component/job/RunJobLink.java | 14 ++-- .../component/markdown/InsertUrlPanel.java | 75 +++++++++++------ .../download/BuildLogDownloadResource.java | 2 +- .../jobdependency/JobDependencyEditPanel.java | 8 +- .../JobDependencyListEditPanel.java | 26 +++--- .../JobDependencyListEditSupport.java | 2 +- .../JobDependencyListViewPanel.java | 2 +- .../editable/job/paramspec/ParamSpecBean.java | 2 +- .../job/paramspec/ParamSpecEditPanel.java | 2 +- .../job/paramspec/ParamSpecListEditPanel.java | 2 +- .../paramspec/ParamSpecListEditSupport.java | 2 +- .../job/paramspec/ParamSpecListViewPanel.java | 2 +- .../job/paramsupply/ParamListEditPanel.java | 12 +-- .../job/paramsupply/ParamListEditSupport.java | 2 +- .../job/paramsupply/ParamListViewPanel.java | 6 +- .../job/postbuildaction/ActionBean.java | 2 +- .../job/postbuildaction/ActionEditPanel.java | 8 +- .../postbuildaction/ActionListEditPanel.java | 26 +++--- .../ActionListEditSupport.java | 2 +- .../postbuildaction/ActionListViewPanel.java | 2 +- .../ProjectDependencyEditPanel.java | 4 +- .../ProjectDependencyListEditPanel.java | 6 +- .../ProjectDependencyListEditSupport.java | 2 +- .../ProjectDependencyListViewPanel.java | 2 +- .../web/editable/job/report/ReportBean.java | 2 +- .../editable/job/report/ReportEditPanel.java | 8 +- .../job/report/ReportListEditPanel.java | 26 +++--- .../job/report/ReportListEditSupport.java | 2 +- .../job/report/ReportListViewPanel.java | 2 +- .../job/service/ServiceEditPanel.java | 8 +- .../job/service/ServiceListEditPanel.java | 26 +++--- .../job/service/ServiceListEditSupport.java | 2 +- .../job/service/ServiceListViewPanel.java | 2 +- .../web/editable/job/trigger/TriggerBean.java | 2 +- .../job/trigger/TriggerEditPanel.java | 4 +- .../job/trigger/TriggerListEditPanel.java | 6 +- .../job/trigger/TriggerListEditSupport.java | 2 +- .../job/trigger/TriggerListViewPanel.java | 2 +- .../servicelocator/LocatorEditPanel.java | 6 +- .../servicelocator/LocatorListEditPanel.java | 24 +++--- .../admin/jobexecutor/JobExecutorPage.html | 2 +- .../page/project/blob/BlobUploadPanel.java | 25 +++++- .../page/project/blob/ProjectBlobPage.html | 2 +- .../page/project/blob/ProjectBlobPage.java | 19 +++-- .../project/blob/render/edit/blob-edit.js | 2 +- .../BuildSpecBlobEditPanel.java} | 12 +-- .../BuildSpecBlobViewPanel.html} | 4 +- .../BuildSpecBlobViewPanel.java} | 28 +++---- .../BuildSpecEditPanel.html} | 4 +- .../BuildSpecEditPanel.java} | 80 +++++++++---------- .../BuildSpecRendererProvider.java} | 22 ++--- .../BuildSpecResourceReference.java} | 10 +-- .../ci-spec.css => buildspec/build-spec.css} | 60 +++++++------- .../ci-spec.js => buildspec/build-spec.js} | 26 +++--- .../renderers/folder/FolderViewPanel.java | 16 ++-- .../renderers/nocommits/NoCommitsPanel.html | 2 +- .../renderers/source/SourceFormComponent.java | 3 +- .../renderers/source/SourceViewPanel.java | 4 +- .../render/renderers/source/source-edit.js | 5 +- .../render/renderers/source/source-view.js | 5 +- .../builds/detail/BuildDetailPage.java | 6 +- .../project/commits/CommitDetailPage.java | 12 +-- .../setting/secret/SecretListPage.java | 2 +- .../server/web/util/SuggestionUtils.java | 8 +- .../application/AbstractClassResolver.java | 2 +- server-plugin/pom.xml | 6 +- .../pom.xml | 4 +- .../gradle/GradleJobSuggestion.java | 14 ++-- .../buildspec}/gradle/GradleModule.java | 6 +- .../pom.xml | 4 +- .../buildspec}/maven/MavenJobSuggestion.java | 12 +-- .../plugin/buildspec}/maven/MavenModule.java | 6 +- .../Dockerfile | 0 .../pom.xml | 4 +- .../buildspec}/node/NodeJobSuggestion.java | 12 +-- .../buildspec}/node/NodePluginModule.java | 6 +- .../server/plugin/docker/DockerExecutor.java | 12 +-- .../server/plugin/docker/DockerModule.java | 2 +- .../kubernetes/KubernetesExecutor.java | 10 +-- .../executor/kubernetes/KubernetesModule.java | 2 +- .../kubernetes/KubernetesResource.java | 6 +- .../plugin/report/html/HtmlReportModule.java | 2 +- .../plugin/report/html/JobHtmlReport.java | 4 +- server-product/pom.xml | 6 +- 188 files changed, 775 insertions(+), 700 deletions(-) rename server-core/src/main/java/io/onedev/server/{ci/CISpec.java => buildspec/BuildSpec.java} (82%) create mode 100644 server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java create mode 100644 server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/Authentication.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/CacheSpec.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/CancellerAwareCancellationException.java (91%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/DefaultJobManager.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/EnvVar.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/Job.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobAware.java (70%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobContext.java (98%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobDependency.java (83%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobExecution.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobExecutorDiscoverer.java (83%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobManager.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobReport.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobService.java (99%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobSuggestion.java (87%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/JobVariable.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/ProjectDependency.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/SubmoduleCredential.java (95%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/VariableInterpolator.java (95%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/CreateIssueAction.java (95%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/PostBuildAction.java (76%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/RunJobAction.java (82%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/SendNotificationAction.java (84%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/ActionCondition.g4 (100%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/ActionCondition.java (83%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/AlwaysCriteria.java (78%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/AssociatedWithPullRequestsCriteria.java (81%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/CancelledCriteria.java (81%) rename server-core/src/main/java/io/onedev/server/{ci/job/retrycondition => buildspec/job/action/condition}/ErrorMessageCriteria.java (87%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/FailedCriteria.java (80%) rename server-core/src/main/java/io/onedev/server/{ci/job/retrycondition => buildspec/job/action/condition}/LogCriteria.java (80%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/OnBranchCriteria.java (86%) rename server-core/src/main/java/io/onedev/server/{ci/job/retrycondition => buildspec/job/action/condition}/ParamCriteria.java (90%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/PreviousIsCancelledCriteria.java (85%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/PreviousIsFailedCriteria.java (84%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/PreviousIsSuccessfulCriteria.java (85%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/PreviousIsTimedOutCriteria.java (85%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/RequiredByPullRequestsCriteria.java (83%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/SuccessfulCriteria.java (81%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/condition/TimedOutCriteria.java (81%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/notificationreceiver/NotificationReceiver.g4 (100%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/action/notificationreceiver/NotificationReceiver.java (90%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/DefaultLogManager.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/JobLogEntry.java (90%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/LogManager.java (93%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/LogSnippet.java (83%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/instruction/LogInstruction.g4 (100%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/instruction/LogInstruction.java (85%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/log/instruction/SetBuildVersion.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/BooleanParam.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/BuildChoiceParam.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/ChoiceParam.java (98%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/CommitParam.java (93%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/DateParam.java (96%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/GroupChoiceParam.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/IssueChoiceParam.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/NumberParam.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/ParamSpec.java (93%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/PullRequestChoiceParam.java (95%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/SecretParam.java (94%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/TextParam.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramspec/UserChoiceParam.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramsupply/ParamSupply.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramsupply/ScriptingValues.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramsupply/SpecifiedValues.java (95%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/paramsupply/ValuesProvider.java (74%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/retrycondition/Criteria.java (80%) rename server-core/src/main/java/io/onedev/server/{ci/job/action/condition => buildspec/job/retrycondition}/ErrorMessageCriteria.java (87%) rename server-core/src/main/java/io/onedev/server/{ci/job/action/condition => buildspec/job/retrycondition}/LogCriteria.java (80%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/retrycondition/NeverCriteria.java (78%) rename server-core/src/main/java/io/onedev/server/{ci/job/action/condition => buildspec/job/retrycondition}/ParamCriteria.java (90%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/retrycondition/RetryCondition.g4 (100%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/retrycondition/RetryCondition.java (82%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/trigger/BranchUpdateTrigger.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/trigger/DependencyFinishedTrigger.java (85%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/trigger/JobTrigger.java (83%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/trigger/PullRequestTrigger.java (97%) rename server-core/src/main/java/io/onedev/server/{ci => buildspec}/job/trigger/TagCreateTrigger.java (95%) delete mode 100644 server-core/src/main/java/io/onedev/server/ci/CISpecAware.java delete mode 100644 server-core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecBlobEditPanel.java => buildspec/BuildSpecBlobEditPanel.java} (64%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecBlobViewPanel.html => buildspec/BuildSpecBlobViewPanel.html} (87%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecBlobViewPanel.java => buildspec/BuildSpecBlobViewPanel.java} (81%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecEditPanel.html => buildspec/BuildSpecEditPanel.html} (92%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecEditPanel.java => buildspec/BuildSpecEditPanel.java} (78%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecRendererProvider.java => buildspec/BuildSpecRendererProvider.java} (78%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/CISpecResourceReference.java => buildspec/BuildSpecResourceReference.java} (71%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/ci-spec.css => buildspec/build-spec.css} (51%) rename server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/{cispec/ci-spec.js => buildspec/build-spec.js} (84%) rename server-plugin/{server-plugin-cispec-gradle => server-plugin-buildspec-gradle}/pom.xml (79%) rename server-plugin/{server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec => server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec}/gradle/GradleJobSuggestion.java (89%) rename server-plugin/{server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec => server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec}/gradle/GradleModule.java (76%) rename server-plugin/{server-plugin-cispec-maven => server-plugin-buildspec-maven}/pom.xml (74%) rename server-plugin/{server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec => server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec}/maven/MavenJobSuggestion.java (92%) rename server-plugin/{server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec => server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec}/maven/MavenModule.java (84%) rename server-plugin/{server-plugin-cispec-node => server-plugin-buildspec-node}/Dockerfile (100%) rename server-plugin/{server-plugin-cispec-node => server-plugin-buildspec-node}/pom.xml (74%) rename server-plugin/{server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec => server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec}/node/NodeJobSuggestion.java (96%) rename server-plugin/{server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec => server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec}/node/NodePluginModule.java (84%) diff --git a/server-core/src/main/java/io/onedev/server/CoreModule.java b/server-core/src/main/java/io/onedev/server/CoreModule.java index d212f49624..83839fe5af 100644 --- a/server-core/src/main/java/io/onedev/server/CoreModule.java +++ b/server-core/src/main/java/io/onedev/server/CoreModule.java @@ -72,17 +72,17 @@ import io.onedev.commons.launcher.loader.ImplementationProvider; import io.onedev.commons.utils.StringUtils; import io.onedev.commons.utils.schedule.DefaultTaskScheduler; import io.onedev.commons.utils.schedule.TaskScheduler; +import io.onedev.server.buildspec.job.DefaultJobManager; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.log.DefaultLogManager; +import io.onedev.server.buildspec.job.log.LogManager; +import io.onedev.server.buildspec.job.log.instruction.LogInstruction; import io.onedev.server.cache.CodeCommentRelationInfoManager; import io.onedev.server.cache.CommitInfoManager; import io.onedev.server.cache.DefaultCodeCommentRelationInfoManager; import io.onedev.server.cache.DefaultCommitInfoManager; import io.onedev.server.cache.DefaultUserInfoManager; import io.onedev.server.cache.UserInfoManager; -import io.onedev.server.ci.job.DefaultJobManager; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.log.DefaultLogManager; -import io.onedev.server.ci.job.log.LogManager; -import io.onedev.server.ci.job.log.instruction.LogInstruction; import io.onedev.server.entitymanager.BuildDependenceManager; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.BuildParamManager; diff --git a/server-core/src/main/java/io/onedev/server/ci/CISpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java similarity index 82% rename from server-core/src/main/java/io/onedev/server/ci/CISpec.java rename to server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java index 6240752fa7..45c7f93ab0 100644 --- a/server-core/src/main/java/io/onedev/server/ci/CISpec.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci; +package io.onedev.server.buildspec; import java.io.Serializable; import java.util.ArrayList; @@ -20,12 +20,12 @@ import com.google.common.base.Charsets; import com.google.common.collect.Lists; import io.onedev.commons.utils.StringUtils; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobDependency; -import io.onedev.server.ci.job.action.PostBuildAction; -import io.onedev.server.ci.job.paramsupply.ParamSupply; -import io.onedev.server.ci.job.retrycondition.RetryCondition; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobDependency; +import io.onedev.server.buildspec.job.action.PostBuildAction; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.retrycondition.RetryCondition; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.migration.VersionedDocument; import io.onedev.server.util.validation.Validatable; import io.onedev.server.util.validation.annotation.ClassValidating; @@ -33,13 +33,13 @@ import io.onedev.server.web.editable.annotation.Editable; @Editable @ClassValidating -public class CISpec implements Serializable, Validatable { +public class BuildSpec implements Serializable, Validatable { private static final long serialVersionUID = 1L; - private static final Logger logger = LoggerFactory.getLogger(CISpec.class); + private static final Logger logger = LoggerFactory.getLogger(BuildSpec.class); - public static final String BLOB_PATH = "onedev-ci.xml"; + public static final String BLOB_PATH = ".onedev-buildspec"; private List jobs = new ArrayList<>(); @@ -183,13 +183,13 @@ public class CISpec implements Serializable, Validatable { } @Nullable - public static CISpec parse(byte[] bytes) { - String ciSpecString = new String(bytes, Charsets.UTF_8); - if (StringUtils.isNotBlank(ciSpecString)) { + public static BuildSpec parse(byte[] bytes) { + String buildSpecString = new String(bytes, Charsets.UTF_8); + if (StringUtils.isNotBlank(buildSpecString)) { try { - return (CISpec) VersionedDocument.fromXML(ciSpecString).toBean(); + return (BuildSpec) VersionedDocument.fromXML(buildSpecString).toBean(); } catch (Exception e) { - throw new InvalidCISpecException("Invalid CI spec", e); + throw new InvalidBuildSpecException("Invalid build spec", e); } } else { return null; diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java new file mode 100644 index 0000000000..227215cc01 --- /dev/null +++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpecAware.java @@ -0,0 +1,10 @@ +package io.onedev.server.buildspec; + +import javax.annotation.Nullable; + +public interface BuildSpecAware { + + @Nullable + BuildSpec getBuildSpec(); + +} diff --git a/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java b/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java new file mode 100644 index 0000000000..5cc2f69c58 --- /dev/null +++ b/server-core/src/main/java/io/onedev/server/buildspec/InvalidBuildSpecException.java @@ -0,0 +1,13 @@ +package io.onedev.server.buildspec; + +import io.onedev.server.OneException; + +public class InvalidBuildSpecException extends OneException { + + private static final long serialVersionUID = 1L; + + public InvalidBuildSpecException(String message, Throwable cause) { + super(message, cause); + } + +} diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Authentication.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/Authentication.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java index 4d093e3acb..f82b7f64bf 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/Authentication.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Authentication.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.Serializable; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java index ed185de520..5d731f0e41 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/CacheSpec.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CacheSpec.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.Serializable; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/CancellerAwareCancellationException.java b/server-core/src/main/java/io/onedev/server/buildspec/job/CancellerAwareCancellationException.java similarity index 91% rename from server-core/src/main/java/io/onedev/server/ci/job/CancellerAwareCancellationException.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/CancellerAwareCancellationException.java index b2f7ed578b..78860e54f4 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/CancellerAwareCancellationException.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/CancellerAwareCancellationException.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.concurrent.CancellationException; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java index f687697210..98abf8085a 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/DefaultJobManager.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.File; import java.util.ArrayList; @@ -52,15 +52,15 @@ import io.onedev.commons.utils.MatrixRunner; import io.onedev.k8shelper.CacheInstance; import io.onedev.server.OneDev; import io.onedev.server.OneException; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.action.PostBuildAction; -import io.onedev.server.ci.job.action.condition.ActionCondition; -import io.onedev.server.ci.job.log.LogManager; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramspec.SecretParam; -import io.onedev.server.ci.job.paramsupply.ParamSupply; -import io.onedev.server.ci.job.retrycondition.RetryCondition; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.action.PostBuildAction; +import io.onedev.server.buildspec.job.action.condition.ActionCondition; +import io.onedev.server.buildspec.job.log.LogManager; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.SecretParam; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.retrycondition.RetryCondition; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.BuildParamManager; import io.onedev.server.entitymanager.ProjectManager; @@ -568,9 +568,9 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz if (!commitId.equals(ObjectId.zeroId())) { ScriptIdentity.push(new JobIdentity(event.getProject(), commitId)); try { - CISpec ciSpec = event.getProject().getCISpec(commitId); - if (ciSpec != null) { - for (Job job: ciSpec.getJobs()) { + BuildSpec buildSpec = event.getProject().getBuildSpec(commitId); + if (buildSpec != null) { + for (Job job: buildSpec.getJobs()) { JobTrigger trigger = job.getMatchedTrigger(event); if (trigger != null) { Map>> paramMatrix = ParamSupply.getParamMatrix(trigger.getParams()); diff --git a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java index eac957111c..856b3b4f4d 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/EnvVar.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/EnvVar.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.Serializable; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/Job.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/Job.java index c05338c1fb..ad46271c90 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/Job.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import static io.onedev.server.search.entity.EntityQuery.quote; import static io.onedev.server.search.entity.build.BuildQuery.getRuleName; @@ -24,12 +24,12 @@ import org.eclipse.jgit.revwalk.RevCommit; import org.hibernate.validator.constraints.NotEmpty; import io.onedev.commons.codeassist.InputSuggestion; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.action.PostBuildAction; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.action.PostBuildAction; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.event.ProjectEvent; import io.onedev.server.model.Project; import io.onedev.server.util.ComponentContext; @@ -465,11 +465,11 @@ public class Job implements Serializable, Validatable { public static List getChoices() { List choices = new ArrayList<>(); Component component = ComponentContext.get().getComponent(); - CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class); - if (ciSpecAware != null) { - CISpec ciSpec = ciSpecAware.getCISpec(); - if (ciSpec != null) { - for (Job eachJob: ciSpec.getJobs()) { + BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class); + if (buildSpecAware != null) { + BuildSpec buildSpec = buildSpecAware.getBuildSpec(); + if (buildSpec != null) { + for (Job eachJob: buildSpec.getJobs()) { if (eachJob.getName() != null) choices.add(eachJob.getName()); } diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobAware.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java similarity index 70% rename from server-core/src/main/java/io/onedev/server/ci/job/JobAware.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java index 52e28d1537..9ca34237c4 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobAware.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobAware.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import javax.annotation.Nullable; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java similarity index 98% rename from server-core/src/main/java/io/onedev/server/ci/job/JobContext.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java index d786f225f9..334fecf7a5 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobContext.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobContext.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.File; import java.util.Collection; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java similarity index 83% rename from server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java index 8485e3e0e5..a71076cd50 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobDependency.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobDependency.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.Serializable; import java.util.ArrayList; @@ -8,10 +8,10 @@ import org.apache.wicket.Component; import org.hibernate.validator.constraints.NotEmpty; import io.onedev.commons.codeassist.InputSuggestion; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.util.ComponentContext; import io.onedev.server.util.EditContext; import io.onedev.server.web.editable.annotation.ChoiceProvider; @@ -97,11 +97,11 @@ public class JobDependency implements Serializable { String jobName = (String) EditContext.get().getInputValue("jobName"); if (jobName != null) { Component component = ComponentContext.get().getComponent(); - CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class); - if (ciSpecAware != null) { - CISpec ciSpec = ciSpecAware.getCISpec(); - if (ciSpec != null) { - Job job = ciSpec.getJobMap().get(jobName); + BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class); + if (buildSpecAware != null) { + BuildSpec buildSpec = buildSpecAware.getBuildSpec(); + if (buildSpec != null) { + Job job = buildSpec.getJobMap().get(jobName); if (job != null) return job.getParamSpecs(); } diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobExecution.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/JobExecution.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.java index c7c71b0a1b..58e8069dab 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobExecution.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecution.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java similarity index 83% rename from server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java index fa7e4ebcea..1c310cb688 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobExecutorDiscoverer.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobExecutorDiscoverer.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import javax.annotation.Nullable; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/JobManager.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java index 4dff4280d2..d1017209aa 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobManager.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.Collection; import java.util.Date; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/JobReport.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java index de23184176..f51d137815 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobReport.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobReport.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.File; import java.io.Serializable; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java similarity index 99% rename from server-core/src/main/java/io/onedev/server/ci/job/JobService.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java index 5972090bdc..ff72d00b5e 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobService.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobService.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.Serializable; import java.util.ArrayList; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobSuggestion.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.java similarity index 87% rename from server-core/src/main/java/io/onedev/server/ci/job/JobSuggestion.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.java index 7a6a0b54f2..da82769ac6 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobSuggestion.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobSuggestion.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.Collection; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/JobVariable.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/JobVariable.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java index 06918f56b4..66fe372005 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/JobVariable.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobVariable.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.stream.Collectors; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java index d3c4139d11..62f73032fe 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/ProjectDependency.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/ProjectDependency.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.io.Serializable; import java.util.ArrayList; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java b/server-core/src/main/java/io/onedev/server/buildspec/job/SubmoduleCredential.java similarity index 95% rename from server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/SubmoduleCredential.java index c14b482029..0675fcd6d3 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/SubmoduleCredential.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/SubmoduleCredential.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java similarity index 95% rename from server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java index 4b39961172..17ce78b648 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/VariableInterpolator.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/VariableInterpolator.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job; +package io.onedev.server.buildspec.job; import java.util.ArrayList; import java.util.HashMap; @@ -9,7 +9,7 @@ import java.util.function.Function; import io.onedev.commons.utils.StringUtils; import io.onedev.server.OneException; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.model.Build; import io.onedev.server.util.GroovyUtils; import io.onedev.server.util.Input; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/CreateIssueAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java similarity index 95% rename from server-core/src/main/java/io/onedev/server/ci/job/action/CreateIssueAction.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java index 9d760fbe8a..46feefa3f9 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/CreateIssueAction.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/CreateIssueAction.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action; +package io.onedev.server.buildspec.job.action; import java.util.ArrayList; import java.util.Collection; @@ -14,8 +14,8 @@ import org.hibernate.validator.constraints.NotEmpty; import io.onedev.commons.codeassist.InputSuggestion; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.IssueManager; import io.onedev.server.entitymanager.SettingManager; @@ -139,8 +139,8 @@ public class CreateIssueAction extends PostBuildAction { } @Override - public void validateWithContext(CISpec ciSpec, Job job) { - super.validateWithContext(ciSpec, job); + public void validateWithContext(BuildSpec buildSpec, Job job) { + super.validateWithContext(buildSpec, job); GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting(); try { diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/PostBuildAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java similarity index 76% rename from server-core/src/main/java/io/onedev/server/ci/job/action/PostBuildAction.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java index a9f4226d8a..fbc2e8bf17 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/PostBuildAction.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/PostBuildAction.java @@ -1,11 +1,11 @@ -package io.onedev.server.ci.job.action; +package io.onedev.server.buildspec.job.action; import java.io.Serializable; import org.hibernate.validator.constraints.NotEmpty; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; +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; @@ -32,9 +32,9 @@ public abstract class PostBuildAction implements Serializable { public abstract String getDescription(); - public void validateWithContext(CISpec ciSpec, Job job) { + public void validateWithContext(BuildSpec buildSpec, Job job) { try { - io.onedev.server.ci.job.action.condition.ActionCondition.parse(job, condition); + io.onedev.server.buildspec.job.action.condition.ActionCondition.parse(job, condition); } catch (Exception e) { String message = "Invalid action condition"; if (e.getMessage() != null) diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java similarity index 82% rename from server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java index b782e0c916..b173c3ae8d 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/RunJobAction.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action; +package io.onedev.server.buildspec.job.action; import java.util.ArrayList; import java.util.List; @@ -15,12 +15,12 @@ import org.slf4j.LoggerFactory; import io.onedev.commons.utils.MatrixRunner; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.model.Build; import io.onedev.server.persistence.SessionManager; @@ -77,11 +77,11 @@ public class RunJobAction extends PostBuildAction { String jobName = (String) EditContext.get().getInputValue("jobName"); if (jobName != null) { Component component = ComponentContext.get().getComponent(); - CISpecAware ciSpecAware = WicketUtils.findInnermost(component, CISpecAware.class); - if (ciSpecAware != null) { - CISpec ciSpec = ciSpecAware.getCISpec(); - if (ciSpec != null) { - Job job = ciSpec.getJobMap().get(jobName); + BuildSpecAware buildSpecAware = WicketUtils.findInnermost(component, BuildSpecAware.class); + if (buildSpecAware != null) { + BuildSpec buildSpec = buildSpecAware.getBuildSpec(); + if (buildSpec != null) { + Job job = buildSpec.getJobMap().get(jobName); if (job != null) return job.getParamSpecs(); } @@ -135,10 +135,10 @@ public class RunJobAction extends PostBuildAction { } @Override - public void validateWithContext(CISpec ciSpec, Job job) { - super.validateWithContext(ciSpec, job); + public void validateWithContext(BuildSpec buildSpec, Job job) { + super.validateWithContext(buildSpec, job); - Job jobToRun = ciSpec.getJobMap().get(jobName); + Job jobToRun = buildSpec.getJobMap().get(jobName); if (jobToRun != null) { try { ParamSupply.validateParams(jobToRun.getParamSpecs(), jobParams); diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/SendNotificationAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java similarity index 84% rename from server-core/src/main/java/io/onedev/server/ci/job/action/SendNotificationAction.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java index ecdba8b3a8..7581cb8702 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/SendNotificationAction.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/SendNotificationAction.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action; +package io.onedev.server.buildspec.job.action; import org.hibernate.validator.constraints.NotEmpty; @@ -29,7 +29,7 @@ public class SendNotificationAction extends PostBuildAction { @Override public void execute(Build build) { OneDev.getInstance(BuildNotificationManager.class).notify(build, - io.onedev.server.ci.job.action.notificationreceiver.NotificationReceiver.fromString(receivers, build).getEmails()); + io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiver.fromString(receivers, build).getEmails()); } @Override diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ActionCondition.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4 similarity index 100% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/ActionCondition.g4 rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.g4 diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ActionCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java similarity index 83% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/ActionCondition.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java index 5939b92c21..2a94328b22 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ActionCondition.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ActionCondition.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.ArrayList; import java.util.List; @@ -16,16 +16,19 @@ import io.onedev.commons.codeassist.AntlrUtils; import io.onedev.commons.codeassist.FenceAware; import io.onedev.commons.utils.StringUtils; import io.onedev.server.OneException; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.AndCriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.ConditionContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.CriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.FieldOperatorValueCriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.NotCriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.OperatorCriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.OperatorValueCriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.OrCriteriaContext; -import io.onedev.server.ci.job.action.condition.ActionConditionParser.ParensCriteriaContext; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.action.condition.ActionConditionBaseVisitor; +import io.onedev.server.buildspec.job.action.condition.ActionConditionLexer; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.AndCriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ConditionContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.CriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.FieldOperatorValueCriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.NotCriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OperatorCriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OperatorValueCriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.OrCriteriaContext; +import io.onedev.server.buildspec.job.action.condition.ActionConditionParser.ParensCriteriaContext; import io.onedev.server.model.Build; import io.onedev.server.util.BuildConstants; import io.onedev.server.util.criteria.AndCriteria; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/AlwaysCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java similarity index 78% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/AlwaysCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java index 09b7208a5b..b660b2a033 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/AlwaysCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AlwaysCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/AssociatedWithPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java similarity index 81% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/AssociatedWithPullRequestsCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java index 5e37a890d9..fe52a418a2 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/AssociatedWithPullRequestsCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/AssociatedWithPullRequestsCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java similarity index 81% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/CancelledCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java index 7e37e1c3fa..a1bc7e6e2b 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/CancelledCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/CancelledCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java similarity index 87% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/ErrorMessageCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java index 4c3ed8dbc3..abcc54da4e 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/ErrorMessageCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ErrorMessageCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.retrycondition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; import java.util.regex.Pattern; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java similarity index 80% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/FailedCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java index c5651cea8d..329b4b3033 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/FailedCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/FailedCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java similarity index 80% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/LogCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java index e1e9d58788..ffe3eaaded 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/LogCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/LogCriteria.java @@ -1,10 +1,10 @@ -package io.onedev.server.ci.job.retrycondition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; import java.util.regex.Pattern; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.log.LogManager; +import io.onedev.server.buildspec.job.log.LogManager; import io.onedev.server.model.Build; public class LogCriteria implements Predicate { diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/OnBranchCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java similarity index 86% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/OnBranchCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java index ed4d27415e..1d94755a17 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/OnBranchCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/OnBranchCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java similarity index 90% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/ParamCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java index 42542568ac..a41d5af8d4 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/ParamCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/ParamCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.retrycondition; +package io.onedev.server.buildspec.job.action.condition; import java.util.List; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsCancelledCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java similarity index 85% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsCancelledCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java index a614396932..11250d0288 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsCancelledCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsCancelledCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsFailedCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java similarity index 84% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsFailedCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java index aab6bf502c..0fb61f2428 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsFailedCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsFailedCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsSuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java similarity index 85% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsSuccessfulCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java index 12e65d8cbe..e381c5d1d8 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsSuccessfulCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsSuccessfulCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsTimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java similarity index 85% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsTimedOutCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java index 2cf63e8605..63fd2d7677 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/PreviousIsTimedOutCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/PreviousIsTimedOutCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/RequiredByPullRequestsCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java similarity index 83% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/RequiredByPullRequestsCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java index 5f34f4015d..6991809b37 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/RequiredByPullRequestsCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/RequiredByPullRequestsCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java similarity index 81% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/SuccessfulCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java index e3ab697b99..29725871b2 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/SuccessfulCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/SuccessfulCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java similarity index 81% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/TimedOutCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java index c2c203568d..e7a59615bf 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/TimedOutCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/condition/TimedOutCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.action.condition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/notificationreceiver/NotificationReceiver.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.g4 similarity index 100% rename from server-core/src/main/java/io/onedev/server/ci/job/action/notificationreceiver/NotificationReceiver.g4 rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.g4 diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/notificationreceiver/NotificationReceiver.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java similarity index 90% rename from server-core/src/main/java/io/onedev/server/ci/job/action/notificationreceiver/NotificationReceiver.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java index 7bf8094665..7969a6c3c8 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/notificationreceiver/NotificationReceiver.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/notificationreceiver/NotificationReceiver.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.notificationreceiver; +package io.onedev.server.buildspec.job.action.notificationreceiver; import java.util.Collection; import java.util.HashSet; @@ -21,8 +21,10 @@ import io.onedev.commons.codeassist.FenceAware; import io.onedev.commons.utils.StringUtils; import io.onedev.server.OneDev; import io.onedev.server.OneException; -import io.onedev.server.ci.job.action.notificationreceiver.NotificationReceiverParser.CriteriaContext; -import io.onedev.server.ci.job.action.notificationreceiver.NotificationReceiverParser.ReceiverContext; +import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverLexer; +import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser; +import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser.CriteriaContext; +import io.onedev.server.buildspec.job.action.notificationreceiver.NotificationReceiverParser.ReceiverContext; import io.onedev.server.entitymanager.GroupManager; import io.onedev.server.entitymanager.UserManager; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java index c30f7fbf60..c9e17bfc1a 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/log/DefaultLogManager.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/DefaultLogManager.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.log; +package io.onedev.server.buildspec.job.log; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; @@ -39,9 +39,9 @@ import io.onedev.commons.launcher.loader.Listen; import io.onedev.commons.utils.ExceptionUtils; import io.onedev.commons.utils.LockUtils; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.log.instruction.LogInstruction; -import io.onedev.server.ci.job.log.instruction.LogInstructionParser.InstructionContext; -import io.onedev.server.ci.job.log.instruction.LogInstructionParser.ParamContext; +import io.onedev.server.buildspec.job.log.instruction.LogInstruction; +import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.InstructionContext; +import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.ParamContext; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.event.build.BuildFinished; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogEntry.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntry.java similarity index 90% rename from server-core/src/main/java/io/onedev/server/ci/job/log/JobLogEntry.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntry.java index ad96906204..d82716a936 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/log/JobLogEntry.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/JobLogEntry.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.log; +package io.onedev.server.buildspec.job.log; import java.io.Serializable; import java.util.Date; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/LogManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java similarity index 93% rename from server-core/src/main/java/io/onedev/server/ci/job/log/LogManager.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java index a3c55df830..5d7ed9b87c 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/log/LogManager.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogManager.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.log; +package io.onedev.server.buildspec.job.log; import java.io.InputStream; import java.util.Collection; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/LogSnippet.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogSnippet.java similarity index 83% rename from server-core/src/main/java/io/onedev/server/ci/job/log/LogSnippet.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/LogSnippet.java index d278f249da..778c4ee7b7 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/log/LogSnippet.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/LogSnippet.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.log; +package io.onedev.server.buildspec.job.log; import java.util.LinkedList; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.g4 similarity index 100% rename from server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.g4 rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.g4 diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.java similarity index 85% rename from server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.java index 0f37966cac..3463cd3cfa 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/LogInstruction.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/LogInstruction.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.log.instruction; +package io.onedev.server.buildspec.job.log.instruction; import java.util.List; import java.util.Map; @@ -16,7 +16,9 @@ import io.onedev.commons.codeassist.FenceAware; import io.onedev.commons.launcher.loader.ExtensionPoint; import io.onedev.commons.utils.StringUtils; import io.onedev.server.OneException; -import io.onedev.server.ci.job.log.instruction.LogInstructionParser.InstructionContext; +import io.onedev.server.buildspec.job.log.instruction.LogInstructionLexer; +import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser; +import io.onedev.server.buildspec.job.log.instruction.LogInstructionParser.InstructionContext; import io.onedev.server.model.Build; @ExtensionPoint diff --git a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.java index aded69b2ff..1f9a2dd0aa 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/log/instruction/SetBuildVersion.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/log/instruction/SetBuildVersion.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.log.instruction; +package io.onedev.server.buildspec.job.log.instruction; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BooleanParam.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BooleanParam.java index 8e0b080b48..d498ff0e98 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BooleanParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BooleanParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java index 7d2b5fac0f..8f582be0a5 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/BuildChoiceParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/BuildChoiceParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java similarity index 98% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java index fb1a912c91..aef63418a6 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ChoiceParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ChoiceParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.ArrayList; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/CommitParam.java similarity index 93% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/CommitParam.java index 8534f62a1f..3e8091f6d8 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/CommitParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/CommitParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java similarity index 96% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java index 95692ebb3d..50a3088918 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/DateParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/DateParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.Date; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/GroupChoiceParam.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/GroupChoiceParam.java index 40e170414d..e760ea2153 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/GroupChoiceParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/GroupChoiceParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java index eac7d30ac4..aa50c4fee2 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/IssueChoiceParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/IssueChoiceParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java index 324c518fef..505651b916 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/NumberParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/NumberParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ParamSpec.java similarity index 93% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ParamSpec.java index 019c6f3749..c62037b297 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/ParamSpec.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/ParamSpec.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import javax.validation.Valid; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java similarity index 95% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java index 4308e72606..210825e813 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/PullRequestChoiceParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/PullRequestChoiceParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/SecretParam.java similarity index 94% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/SecretParam.java index c604c1cd34..a272624641 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/SecretParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/SecretParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java index c913d5777e..ef3a6dea0a 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/TextParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/TextParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java index 543a31bf76..b8112a9b2f 100755 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramspec/UserChoiceParam.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramspec/UserChoiceParam.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramspec; +package io.onedev.server.buildspec.job.paramspec; import java.util.List; import java.util.Map; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ParamSupply.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ParamSupply.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java index dcc046f2d5..66956c3125 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ParamSupply.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ParamSupply.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramsupply; +package io.onedev.server.buildspec.job.paramsupply; import java.io.Serializable; import java.util.ArrayList; @@ -26,9 +26,9 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramspec.SecretParam; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.SecretParam; import io.onedev.server.util.inputspec.SecretInput; import io.onedev.server.web.editable.BeanDescriptor; import io.onedev.server.web.editable.PropertyDescriptor; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ScriptingValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ScriptingValues.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java index dd8823de3a..0f4a070348 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ScriptingValues.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ScriptingValues.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramsupply; +package io.onedev.server.buildspec.job.paramsupply; import java.util.ArrayList; import java.util.Collection; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/SpecifiedValues.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java similarity index 95% rename from server-core/src/main/java/io/onedev/server/ci/job/paramsupply/SpecifiedValues.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java index b98a617841..bdafa3f3b3 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/SpecifiedValues.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/SpecifiedValues.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramsupply; +package io.onedev.server.buildspec.job.paramsupply; import java.util.ArrayList; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ValuesProvider.java b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java similarity index 74% rename from server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ValuesProvider.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java index 6eaa338558..3aa10a5aec 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/paramsupply/ValuesProvider.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/paramsupply/ValuesProvider.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.paramsupply; +package io.onedev.server.buildspec.job.paramsupply; import java.io.Serializable; import java.util.List; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/Criteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/Criteria.java similarity index 80% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/Criteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/Criteria.java index 2517969819..b51e970ba5 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/Criteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/Criteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.retrycondition; +package io.onedev.server.buildspec.job.retrycondition; import java.io.Serializable; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ErrorMessageCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java similarity index 87% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/ErrorMessageCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java index 3f997456ec..1476f9d21f 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ErrorMessageCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ErrorMessageCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.retrycondition; import java.util.function.Predicate; import java.util.regex.Pattern; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/LogCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java similarity index 80% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/LogCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java index e6db66ba68..6305963581 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/LogCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/LogCriteria.java @@ -1,10 +1,10 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.retrycondition; import java.util.function.Predicate; import java.util.regex.Pattern; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.log.LogManager; +import io.onedev.server.buildspec.job.log.LogManager; import io.onedev.server.model.Build; public class LogCriteria implements Predicate { diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/NeverCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java similarity index 78% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/NeverCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java index fa8e653381..24b6834d9a 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/NeverCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/NeverCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.retrycondition; +package io.onedev.server.buildspec.job.retrycondition; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ParamCriteria.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java similarity index 90% rename from server-core/src/main/java/io/onedev/server/ci/job/action/condition/ParamCriteria.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java index b0ee5952ca..e737b10d52 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/action/condition/ParamCriteria.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/ParamCriteria.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.action.condition; +package io.onedev.server.buildspec.job.retrycondition; import java.util.List; import java.util.function.Predicate; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/RetryCondition.g4 b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.g4 similarity index 100% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/RetryCondition.g4 rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.g4 diff --git a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/RetryCondition.java b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java similarity index 82% rename from server-core/src/main/java/io/onedev/server/ci/job/retrycondition/RetryCondition.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java index 0878c5ee40..ef7a880119 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/retrycondition/RetryCondition.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/retrycondition/RetryCondition.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.retrycondition; +package io.onedev.server.buildspec.job.retrycondition; import java.util.ArrayList; import java.util.List; @@ -16,14 +16,17 @@ import io.onedev.commons.codeassist.AntlrUtils; import io.onedev.commons.codeassist.FenceAware; import io.onedev.commons.utils.StringUtils; import io.onedev.server.OneException; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.AndCriteriaContext; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.ConditionContext; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.CriteriaContext; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.FieldOperatorValueCriteriaContext; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.NotCriteriaContext; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.OrCriteriaContext; -import io.onedev.server.ci.job.retrycondition.RetryConditionParser.ParensCriteriaContext; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionBaseVisitor; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionLexer; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.AndCriteriaContext; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ConditionContext; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.CriteriaContext; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.FieldOperatorValueCriteriaContext; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.NotCriteriaContext; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.OrCriteriaContext; +import io.onedev.server.buildspec.job.retrycondition.RetryConditionParser.ParensCriteriaContext; import io.onedev.server.model.Build; import io.onedev.server.util.BuildConstants; import io.onedev.server.util.criteria.AndCriteria; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java index e7a3f8722d..53ee793b05 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/BranchUpdateTrigger.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/BranchUpdateTrigger.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.trigger; +package io.onedev.server.buildspec.job.trigger; import java.util.Collection; import java.util.List; @@ -8,7 +8,7 @@ import org.eclipse.jgit.lib.ObjectId; import io.onedev.commons.codeassist.InputSuggestion; import io.onedev.commons.utils.match.Matcher; import io.onedev.commons.utils.match.PathMatcher; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.event.ProjectEvent; import io.onedev.server.event.RefUpdated; import io.onedev.server.git.GitUtils; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java similarity index 85% rename from server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java index ad0fd2641d..4b1514e284 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/DependencyFinishedTrigger.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/DependencyFinishedTrigger.java @@ -1,10 +1,10 @@ -package io.onedev.server.ci.job.trigger; +package io.onedev.server.buildspec.job.trigger; import java.util.List; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobDependency; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobDependency; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.event.ProjectEvent; import io.onedev.server.event.build.BuildFinished; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java similarity index 83% rename from server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java index fb300248ff..cfa05557bb 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/JobTrigger.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/JobTrigger.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.trigger; +package io.onedev.server.buildspec.job.trigger; import java.io.Serializable; import java.util.ArrayList; @@ -8,10 +8,10 @@ import javax.validation.Valid; import org.apache.wicket.Component; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.event.ProjectEvent; import io.onedev.server.util.ComponentContext; import io.onedev.server.web.editable.annotation.Editable; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java similarity index 97% rename from server-core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java index 9dabb25d38..dc711c8075 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/PullRequestTrigger.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/PullRequestTrigger.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.trigger; +package io.onedev.server.buildspec.job.trigger; import java.util.Collection; import java.util.List; @@ -8,7 +8,7 @@ import org.eclipse.jgit.lib.ObjectId; import io.onedev.commons.codeassist.InputSuggestion; import io.onedev.commons.utils.match.Matcher; import io.onedev.commons.utils.match.PathMatcher; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.event.ProjectEvent; import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated; import io.onedev.server.git.GitUtils; diff --git a/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java similarity index 95% rename from server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java rename to server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java index 33007a42ea..3bb53ccacf 100644 --- a/server-core/src/main/java/io/onedev/server/ci/job/trigger/TagCreateTrigger.java +++ b/server-core/src/main/java/io/onedev/server/buildspec/job/trigger/TagCreateTrigger.java @@ -1,4 +1,4 @@ -package io.onedev.server.ci.job.trigger; +package io.onedev.server.buildspec.job.trigger; import java.util.List; @@ -6,7 +6,7 @@ import org.eclipse.jgit.lib.ObjectId; import io.onedev.commons.codeassist.InputSuggestion; import io.onedev.commons.utils.match.PathMatcher; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.event.ProjectEvent; import io.onedev.server.event.RefUpdated; import io.onedev.server.git.GitUtils; diff --git a/server-core/src/main/java/io/onedev/server/ci/CISpecAware.java b/server-core/src/main/java/io/onedev/server/ci/CISpecAware.java deleted file mode 100644 index a6b68f74b5..0000000000 --- a/server-core/src/main/java/io/onedev/server/ci/CISpecAware.java +++ /dev/null @@ -1,10 +0,0 @@ -package io.onedev.server.ci; - -import javax.annotation.Nullable; - -public interface CISpecAware { - - @Nullable - CISpec getCISpec(); - -} diff --git a/server-core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java b/server-core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java deleted file mode 100644 index 08e95cad31..0000000000 --- a/server-core/src/main/java/io/onedev/server/ci/InvalidCISpecException.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.onedev.server.ci; - -import io.onedev.server.OneException; - -public class InvalidCISpecException extends OneException { - - private static final long serialVersionUID = 1L; - - public InvalidCISpecException(String message, Throwable cause) { - super(message, cause); - } - -} diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java index 6f183fad28..37ef210fce 100644 --- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java +++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildParamManager.java @@ -18,7 +18,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import io.onedev.commons.launcher.loader.Listen; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.entitymanager.BuildParamManager; import io.onedev.server.event.system.SystemStarted; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java index cf2967348f..f84a1b4b47 100644 --- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java +++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java @@ -60,13 +60,13 @@ import io.onedev.commons.utils.MatrixRunner; import io.onedev.commons.utils.concurrent.Prioritized; import io.onedev.server.OneDev; import io.onedev.server.OneException; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.trigger.PullRequestTrigger; import io.onedev.server.cache.CommitInfoManager; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.paramsupply.ParamSupply; -import io.onedev.server.ci.job.trigger.JobTrigger; -import io.onedev.server.ci.job.trigger.PullRequestTrigger; import io.onedev.server.entitymanager.ProjectManager; import io.onedev.server.entitymanager.PullRequestBuildManager; import io.onedev.server.entitymanager.PullRequestChangeManager; @@ -734,9 +734,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager(); } - CISpec ciSpec = project.getCISpec(commitId); - if (ciSpec != null) { - for (Job job: ciSpec.getJobs()) { + BuildSpec buildSpec = project.getBuildSpec(commitId); + if (buildSpec != null) { + for (Job job: buildSpec.getJobs()) { for (JobTrigger trigger: job.getTriggers()) { if (trigger instanceof PullRequestTrigger) { PullRequestTrigger pullRequestTrigger = (PullRequestTrigger) trigger; diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java index 1af65b216b..f0264fe503 100644 --- a/server-core/src/main/java/io/onedev/server/model/Build.java +++ b/server-core/src/main/java/io/onedev/server/model/Build.java @@ -49,12 +49,12 @@ import io.onedev.commons.utils.LockUtils; import io.onedev.commons.utils.StringUtils; import io.onedev.server.OneDev; import io.onedev.server.OneException; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.VariableInterpolator; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.cache.CommitInfoManager; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.VariableInterpolator; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.git.GitUtils; import io.onedev.server.git.RefInfo; @@ -187,7 +187,7 @@ public class Build extends AbstractEntity implements Referenceable { private transient Map> commitsCache; - private transient CISpec ciSpec; + private transient BuildSpec buildSpec; private transient Job job; @@ -537,15 +537,15 @@ public class Build extends AbstractEntity implements Referenceable { return project.getSecretValue(secretName, ObjectId.fromString(getCommitHash())); } - public CISpec getCISpec() { - if (ciSpec == null) - ciSpec = Preconditions.checkNotNull(getProject().getCISpec(getCommitId())); - return ciSpec; + public BuildSpec getBuildSpec() { + if (buildSpec == null) + buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(getCommitId())); + return buildSpec; } public Job getJob() { if (job == null) - job = Preconditions.checkNotNull(getCISpec().getJobMap().get(getJobName())); + job = Preconditions.checkNotNull(getBuildSpec().getJobMap().get(getJobName())); return job; } diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java index 98c5971338..e4028f124e 100644 --- a/server-core/src/main/java/io/onedev/server/model/Project.java +++ b/server-core/src/main/java/io/onedev/server/model/Project.java @@ -73,8 +73,8 @@ import io.onedev.commons.utils.match.Matcher; import io.onedev.commons.utils.match.PathMatcher; import io.onedev.server.OneDev; import io.onedev.server.OneException; +import io.onedev.server.buildspec.BuildSpec; import io.onedev.server.cache.CommitInfoManager; -import io.onedev.server.ci.CISpec; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.BuildQuerySettingManager; import io.onedev.server.entitymanager.CodeCommentQuerySettingManager; @@ -290,7 +290,7 @@ public class Project extends AbstractEntity { private transient Map> objectIdCache; - private transient Map> ciSpecCache; + private transient Map> buildSpecCache; private transient Map> commitStatusCache; @@ -672,36 +672,36 @@ public class Project extends AbstractEntity { } /** - * Get CI spec of specified commit + * Get build spec of specified commit * @param commitId - * commit id to get CI spec for + * commit id to get build spec for * @return - * CI spec of specified commit, or null if no CI spec is defined and - * auto-detection also can not provide an appropriate CI spec + * build spec of specified commit, or null if no build spec is defined and + * auto-detection also can not provide an appropriate build spec * @throws - * Exception when CI spec is defined but not valid + * Exception when build spec is defined but not valid */ @Nullable - public CISpec getCISpec(ObjectId commitId) { - if (ciSpecCache == null) - ciSpecCache = new HashMap<>(); - Optional ciSpec = ciSpecCache.get(commitId); - if (ciSpec == null) { - Blob blob = getBlob(new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE), false); + public BuildSpec getBuildSpec(ObjectId commitId) { + if (buildSpecCache == null) + buildSpecCache = new HashMap<>(); + Optional buildSpec = buildSpecCache.get(commitId); + if (buildSpec == null) { + Blob blob = getBlob(new BlobIdent(commitId.name(), BuildSpec.BLOB_PATH, FileMode.TYPE_FILE), false); if (blob != null) - ciSpec = Optional.fromNullable(CISpec.parse(blob.getBytes())); + buildSpec = Optional.fromNullable(BuildSpec.parse(blob.getBytes())); else - ciSpec = Optional.absent(); - ciSpecCache.put(commitId, ciSpec); + buildSpec = Optional.absent(); + buildSpecCache.put(commitId, buildSpec); } - return ciSpec.orNull(); + return buildSpec.orNull(); } public List getJobNames() { if (jobNames == null) { Set jobNameSet = new HashSet<>(); for (RefInfo refInfo: getBranches()) { - Blob blob = getBlob(new BlobIdent(refInfo.getPeeledObj().name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE), false); + Blob blob = getBlob(new BlobIdent(refInfo.getPeeledObj().name(), BuildSpec.BLOB_PATH, FileMode.TYPE_FILE), false); if (blob != null && blob.getText() != null) { try { VersionedDocument dom = VersionedDocument.fromXML(blob.getText().getContent()); diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java index 4f564ff7a5..8a66a04665 100644 --- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java +++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/AutoDiscoveredJobExecutor.java @@ -7,13 +7,13 @@ import java.util.List; import edu.emory.mathcs.backport.java.util.Collections; import io.onedev.server.OneDev; import io.onedev.server.OneException; -import io.onedev.server.ci.job.JobContext; -import io.onedev.server.ci.job.JobExecutorDiscoverer; +import io.onedev.server.buildspec.job.JobContext; +import io.onedev.server.buildspec.job.JobExecutorDiscoverer; import io.onedev.server.web.editable.EditableUtils; import io.onedev.server.web.editable.annotation.Editable; import io.onedev.server.web.editable.annotation.Horizontal; -@Editable(order=10000, description="Discover appropriate job executor automatically to run CI jobs") +@Editable(order=10000, description="Discover appropriate job executor automatically to run builds") @Horizontal public class AutoDiscoveredJobExecutor extends JobExecutor { @@ -38,6 +38,7 @@ public class AutoDiscoveredJobExecutor extends JobExecutor { }); JobExecutor jobExecutor = jobExecutors.iterator().next(); + jobExecutor.setName(getName()); jobExecutor.setApplicableBranches(getApplicableBranches()); jobExecutor.setCacheTTL(getCacheTTL()); jobExecutor.setEnabled(isEnabled()); diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java index eb3e971320..fba3854502 100644 --- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java +++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/JobExecutor.java @@ -13,7 +13,7 @@ import io.onedev.commons.launcher.loader.ExtensionPoint; import io.onedev.commons.utils.match.Matcher; import io.onedev.commons.utils.match.PathMatcher; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.JobContext; +import io.onedev.server.buildspec.job.JobContext; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.model.Project; import io.onedev.server.util.Usage; diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java index 983c1e77e4..ca7b2f025e 100644 --- a/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java +++ b/server-core/src/main/java/io/onedev/server/model/support/administration/jobexecutor/ServiceLocator.java @@ -8,7 +8,7 @@ import javax.validation.constraints.Size; import io.onedev.commons.utils.match.Matcher; import io.onedev.commons.utils.match.PathMatcher; -import io.onedev.server.ci.job.JobService; +import io.onedev.server.buildspec.job.JobService; import io.onedev.server.util.patternset.PatternSet; import io.onedev.server.web.editable.annotation.Editable; import io.onedev.server.web.editable.annotation.NameOfEmptyValue; diff --git a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java index ac45796695..fdf8269a6c 100755 --- a/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java +++ b/server-core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java @@ -12,7 +12,7 @@ import javax.annotation.Nullable; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.Size; -import io.onedev.server.ci.job.paramspec.ChoiceParam; +import io.onedev.server.buildspec.job.paramspec.ChoiceParam; import io.onedev.server.issue.fieldspec.ChoiceField; import io.onedev.server.util.inputspec.InputSpec; import io.onedev.server.util.validation.Validatable; diff --git a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java index e6372a673b..ab7826ff75 100644 --- a/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java +++ b/server-core/src/main/java/io/onedev/server/util/markdown/UrlProcessor.java @@ -33,13 +33,16 @@ public class UrlProcessor implements MarkdownProcessor { public void process(Project project, Document rendered, Object context) { if (context instanceof BlobRenderContext && project != null) { BlobRenderContext blobRenderContext = (BlobRenderContext) context; - Repository repository = project.getRepository(); RevCommit commit; - try (RevWalk revWalk = new RevWalk(repository)) { - commit = revWalk.parseCommit(repository.resolve(blobRenderContext.getBlobIdent().revision)); - } catch (IOException e) { - throw new RuntimeException(e); + if (blobRenderContext.getBlobIdent().revision != null) { + try (RevWalk revWalk = new RevWalk(repository)) { + commit = revWalk.parseCommit(repository.resolve(blobRenderContext.getBlobIdent().revision)); + } catch (IOException e) { + throw new RuntimeException(e); + } + } else { + commit = null; } new NodeTraversor(new NodeVisitor() { @@ -62,25 +65,25 @@ public class UrlProcessor implements MarkdownProcessor { String directory = blobRenderContext.getDirectory(); String referencedPath = PathUtils.resolve(directory, path); referencedPath = GitUtils.normalizePath(referencedPath); - if (referencedPath != null && TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) { - element.after("!!missing!!"); - Element missingElement = element.nextElementSibling(); - BlobIdent blobIdent = blobRenderContext.getBlobIdent(); - Mode mode = blobRenderContext.getMode(); - if (mode != Mode.ADD && mode != Mode.EDIT - && SecurityUtils.canModify(project, blobIdent.revision, referencedPath)) { - ProjectBlobPage.State state = new ProjectBlobPage.State(); - state.blobIdent = blobRenderContext.getBlobIdent(); - state.mode = Mode.ADD; - state.initialNewPath = path; - CharSequence urlToAddFile = RequestCycle.get().urlFor(ProjectBlobPage.class, - ProjectBlobPage.paramsOf(project, state)); - String htmlToAddFile = String.format( - "", - urlToAddFile.toString()); - missingElement.after(htmlToAddFile); - } + if (referencedPath != null && (commit == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null)) { + element.after("!!missing!!"); + Element missingElement = element.nextElementSibling(); + BlobIdent blobIdent = blobRenderContext.getBlobIdent(); + Mode mode = blobRenderContext.getMode(); + if (mode != Mode.ADD && mode != Mode.EDIT + && SecurityUtils.canModify(project, blobIdent.revision, referencedPath)) { + ProjectBlobPage.State state = new ProjectBlobPage.State(); + state.blobIdent = blobRenderContext.getBlobIdent(); + state.mode = Mode.ADD; + state.initialNewPath = path; + CharSequence urlToAddFile = RequestCycle.get().urlFor(ProjectBlobPage.class, + ProjectBlobPage.paramsOf(project, state)); + String htmlToAddFile = String.format( + "", + urlToAddFile.toString()); + missingElement.after(htmlToAddFile); } + } } catch (IOException e) { throw new RuntimeException(e); } @@ -97,7 +100,7 @@ public class UrlProcessor implements MarkdownProcessor { String basePath = blobRenderContext.getDirectory(); String referencedPath = PathUtils.resolve(basePath, UrlUtils.trimHashAndQuery(URLDecoder.decode(url, Charsets.UTF_8.name()))); referencedPath = GitUtils.normalizePath(referencedPath); - if (referencedPath != null && TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null) { + if (referencedPath != null && (commit == null || TreeWalk.forPath(repository, referencedPath, commit.getTree()) == null)) { element.after("!!missing!!"); } } catch (IOException e) { @@ -108,7 +111,6 @@ public class UrlProcessor implements MarkdownProcessor { } } }).traverse(rendered); - } } diff --git a/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java b/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java index e7e70bc0d8..b9cc8dedb0 100644 --- a/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java +++ b/server-core/src/main/java/io/onedev/server/util/validation/NotificationReceiverValidator.java @@ -22,7 +22,7 @@ public class NotificationReceiverValidator implements ConstraintValidator getRoots() { - return getChildren(new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE)); + if (commitId != null) + return getChildren(new BlobIdent(commitId.name(), null, FileMode.TYPE_TREE)); + else + return new ArrayList().iterator(); } @Override diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java index 321e485193..4a279d5b7b 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/component/build/log/BuildLogPanel.java @@ -15,9 +15,9 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.log.JobLogEntry; -import io.onedev.server.ci.job.log.LogManager; -import io.onedev.server.ci.job.log.LogSnippet; +import io.onedev.server.buildspec.job.log.JobLogEntry; +import io.onedev.server.buildspec.job.log.LogManager; +import io.onedev.server.buildspec.job.log.LogSnippet; import io.onedev.server.model.Build; import io.onedev.server.web.behavior.WebSocketObserver; diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java index ef2d3d03b2..6f61e0a657 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java +++ b/server-core/src/main/java/io/onedev/server/web/component/build/side/BuildSidePanel.java @@ -26,7 +26,7 @@ import org.eclipse.jgit.revwalk.RevCommit; import io.onedev.commons.utils.HtmlUtils; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.git.GitUtils; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java index 1b038ff1cf..3c2074544b 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java @@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.model.Build; import io.onedev.server.model.Build.Status; @@ -54,11 +54,11 @@ public abstract class CommitStatusPanel extends Panel { @Override protected List load() { try { - CISpec ciSpec = getProject().getCISpec(commitId); - if (ciSpec != null) - return ciSpec.getJobs(); + BuildSpec buildSpec = getProject().getBuildSpec(commitId); + if (buildSpec != null) + return buildSpec.getJobs(); } catch (Exception e) { - logger.error("Error retrieving CI spec (project: {}, commit: {})", + logger.error("Error retrieving build spec (project: {}, commit: {})", getProject().getName(), commitId.name(), e); } return new ArrayList<>(); diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java index a731f82025..f9fb287666 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java @@ -16,7 +16,7 @@ import org.unbescape.html.HtmlEscape; import io.onedev.commons.utils.ColorUtils; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.IssueManager; import io.onedev.server.entitymanager.PullRequestManager; diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java index fc26dbbb5e..a7de223fac 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java +++ b/server-core/src/main/java/io/onedev/server/web/component/job/JobDefLink.java @@ -6,13 +6,13 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.eclipse.jgit.lib.FileMode; import org.eclipse.jgit.lib.ObjectId; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.git.BlobIdent; import io.onedev.server.model.Project; import io.onedev.server.util.SecurityUtils; import io.onedev.server.web.page.project.blob.ProjectBlobPage; -import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecRendererProvider; +import io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRendererProvider; @SuppressWarnings("serial") public abstract class JobDefLink extends BookmarkablePageLink { @@ -45,8 +45,8 @@ public abstract class JobDefLink extends BookmarkablePageLink { @Override public PageParameters getPageParameters() { ProjectBlobPage.State state = new ProjectBlobPage.State(); - state.blobIdent = new BlobIdent(commitId.name(), CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits()); - state.position = CISpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName); + state.blobIdent = new BlobIdent(commitId.name(), BuildSpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits()); + state.position = BuildSpecRendererProvider.getPosition(Job.SELECTION_PREFIX + jobName); return ProjectBlobPage.paramsOf(getProject(), state); } diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java index 4b0ae03528..35ff47de0a 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java +++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java @@ -13,11 +13,11 @@ import org.eclipse.jgit.lib.ObjectId; import com.google.common.base.Preconditions; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.model.Build; import io.onedev.server.model.Project; import io.onedev.server.util.SecurityUtils; @@ -47,9 +47,9 @@ public abstract class RunJobLink extends AjaxLink { @Override public void onClick(AjaxRequestTarget target) { - CISpec ciSpec = Preconditions.checkNotNull(getProject().getCISpec(commitId)); + BuildSpec buildSpec = Preconditions.checkNotNull(getProject().getBuildSpec(commitId)); - Job job = Preconditions.checkNotNull(ciSpec.getJobMap().get(jobName)); + Job job = Preconditions.checkNotNull(buildSpec.getJobMap().get(jobName)); if (!job.getParamSpecs().isEmpty()) { Serializable paramBean; try { diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java index fd902ee4a2..d7b92b0264 100644 --- a/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/InsertUrlPanel.java @@ -50,6 +50,7 @@ import io.onedev.commons.utils.UrlUtils; import io.onedev.server.git.BlobIdent; import io.onedev.server.git.BlobIdentFilter; import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.ReferenceInputBehavior; import io.onedev.server.web.component.blob.BlobPicker; import io.onedev.server.web.component.dropzonefield.DropzoneField; import io.onedev.server.web.component.tabbable.AjaxActionTab; @@ -174,35 +175,41 @@ abstract class InsertUrlPanel extends Panel { * added/uploaded files while editing a markdown file */ ObjectId commitId; - try { - commitId = context.getProject().getRepository() - .resolve(context.getBlobIdent().revision); - } catch (IOException e) { - throw new RuntimeException(e); + if (context.getBlobIdent().revision != null) { + try { + commitId = context.getProject().getRepository().resolve(context.getBlobIdent().revision); + } catch (IOException e) { + throw new RuntimeException(e); + } + } else { + commitId = null; } Set blobPickerState = new HashSet<>(); - Set expandedPaths = WebSession.get().getMetaData(BLOB_PICKER_STATE); - if (expandedPaths != null) { - for (String path: expandedPaths) - blobPickerState.add(new BlobIdent(commitId.name(), path, FileMode.TREE.getBits())); - } - BlobIdent blobIdent = context.getBlobIdent(); - String parentPath; - if (blobIdent.isTree()) - parentPath = blobIdent.path; - else if (blobIdent.path.contains("/")) - parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/"); - else - parentPath = null; - - while (parentPath != null) { - blobPickerState.add(new BlobIdent(commitId.name(), parentPath, FileMode.TYPE_TREE)); - if (parentPath.contains("/")) - parentPath = StringUtils.substringBeforeLast(parentPath, "/"); + if (commitId != null) { + Set expandedPaths = WebSession.get().getMetaData(BLOB_PICKER_STATE); + if (expandedPaths != null) { + for (String path: expandedPaths) + blobPickerState.add(new BlobIdent(commitId.name(), path, FileMode.TREE.getBits())); + } + + BlobIdent blobIdent = context.getBlobIdent(); + String parentPath; + if (blobIdent.isTree()) + parentPath = blobIdent.path; + else if (blobIdent.path.contains("/")) + parentPath = StringUtils.substringBeforeLast(blobIdent.path, "/"); else parentPath = null; + + while (parentPath != null) { + blobPickerState.add(new BlobIdent(commitId.name(), parentPath, FileMode.TYPE_TREE)); + if (parentPath.contains("/")) + parentPath = StringUtils.substringBeforeLast(parentPath, "/"); + else + parentPath = null; + } } fragment.add(new BlobPicker("files", commitId) { @@ -421,10 +428,28 @@ abstract class InsertUrlPanel extends Panel { } })); + + ReferenceInputBehavior behavior = new ReferenceInputBehavior(true) { + + @Override + protected Project getProject() { + return markdownEditor.getBlobRenderContext().getProject(); + } + + }; form.add(new TextField("summaryCommitMessage", - new PropertyModel(this, "summaryCommitMessage"))); + new PropertyModel(this, "summaryCommitMessage")).add(behavior)); + + behavior = new ReferenceInputBehavior(true) { + + @Override + protected Project getProject() { + return markdownEditor.getBlobRenderContext().getProject(); + } + + }; form.add(new TextArea("detailCommitMessage", - new PropertyModel(this, "detailCommitMessage"))); + new PropertyModel(this, "detailCommitMessage")).add(behavior)); form.add(new AjaxButton("insert") { diff --git a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java index 3c15958de3..3781be29f9 100644 --- a/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java +++ b/server-core/src/main/java/io/onedev/server/web/download/BuildLogDownloadResource.java @@ -17,7 +17,7 @@ import org.apache.wicket.request.resource.AbstractResource; import com.google.common.base.Charsets; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.log.LogManager; +import io.onedev.server.buildspec.job.log.LogManager; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.ProjectManager; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java index de4c009d49..b039ec9444 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyEditPanel.java @@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobDependency; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobDependency; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; @@ -21,7 +21,7 @@ import io.onedev.server.web.editable.PathNode; import io.onedev.server.web.editable.Path; @SuppressWarnings("serial") -abstract class JobDependencyEditPanel extends Panel implements CISpecAware, JobAware { +abstract class JobDependencyEditPanel extends Panel implements BuildSpecAware, JobAware { private final List dependencies; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java index 0729d3f2d0..49f274bb80 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditPanel.java @@ -26,11 +26,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobDependency; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobDependency; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; import io.onedev.server.web.component.modal.ModalLink; @@ -54,10 +54,10 @@ class JobDependencyListEditPanel extends PropertyEditor> { } } - private CISpec getCISpec() { - CISpecAware ciSpecAware = findParent(CISpecAware.class); - if (ciSpecAware != null) - return ciSpecAware.getCISpec(); + private BuildSpec getBuildSpec() { + BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class); + if (buildSpecAware != null) + return buildSpecAware.getBuildSpec(); else return null; } @@ -93,8 +93,8 @@ class JobDependencyListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return JobDependencyListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return JobDependencyListEditPanel.this.getBuildSpec(); } @Override @@ -174,8 +174,8 @@ class JobDependencyListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return JobDependencyListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return JobDependencyListEditPanel.this.getBuildSpec(); } @Override diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java index fc9ef7052f..b7d5fde5ee 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.JobDependency; +import io.onedev.server.buildspec.job.JobDependency; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java index af7cd3fccf..3eecf692c2 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/jobdependency/JobDependencyListViewPanel.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import io.onedev.server.ci.job.JobDependency; +import io.onedev.server.buildspec.job.JobDependency; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.page.layout.SideFloating; import io.onedev.server.web.page.layout.SideFloating.Placement; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java index 046c509085..d3ae0bba42 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecBean.java @@ -4,7 +4,7 @@ import java.io.Serializable; import javax.validation.constraints.NotNull; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.web.editable.annotation.Editable; @Editable diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java index 863eb231f9..0679d440af 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecEditPanel.java @@ -11,7 +11,7 @@ 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.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.util.inputspec.InputContext; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java index dc786b811e..9563cad22d 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditPanel.java @@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java index cd8ae3957c..8954e27c8c 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java index 06b492958b..41b78793b5 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramspec/ParamSpecListViewPanel.java @@ -28,7 +28,7 @@ import org.apache.wicket.model.Model; import com.google.common.collect.Sets; -import io.onedev.server.ci.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.EditableUtils; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java index 1cc4623613..f5d6142e2d 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditPanel.java @@ -34,12 +34,12 @@ import org.slf4j.LoggerFactory; import com.google.common.base.Preconditions; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramspec.SecretParam; -import io.onedev.server.ci.job.paramsupply.ParamSupply; -import io.onedev.server.ci.job.paramsupply.ScriptingValues; -import io.onedev.server.ci.job.paramsupply.SpecifiedValues; -import io.onedev.server.ci.job.paramsupply.ValuesProvider; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramspec.SecretParam; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.paramsupply.ScriptingValues; +import io.onedev.server.buildspec.job.paramsupply.SpecifiedValues; +import io.onedev.server.buildspec.job.paramsupply.ValuesProvider; import io.onedev.server.util.ComponentContext; import io.onedev.server.web.editable.BeanDescriptor; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java index 834ede23d4..b7b02f4bea 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListEditSupport.java @@ -8,7 +8,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.PropertyContext; import io.onedev.server.web.editable.PropertyDescriptor; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java index 411932a652..45988dc811 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/paramsupply/ParamListViewPanel.java @@ -12,9 +12,9 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.markup.repeater.RepeatingView; -import io.onedev.server.ci.job.paramsupply.ParamSupply; -import io.onedev.server.ci.job.paramsupply.ScriptingValues; -import io.onedev.server.ci.job.paramsupply.SpecifiedValues; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.paramsupply.ScriptingValues; +import io.onedev.server.buildspec.job.paramsupply.SpecifiedValues; import io.onedev.server.web.editable.PropertyContext; @SuppressWarnings("serial") diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java index df30fd441d..3cdf729c26 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionBean.java @@ -4,7 +4,7 @@ import java.io.Serializable; import javax.validation.constraints.NotNull; -import io.onedev.server.ci.job.action.PostBuildAction; +import io.onedev.server.buildspec.job.action.PostBuildAction; import io.onedev.server.web.editable.annotation.Editable; @Editable diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java index c5b9b4827b..6606fe6437 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionEditPanel.java @@ -10,15 +10,15 @@ 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.ci.CISpecAware; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.action.PostBuildAction; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.action.PostBuildAction; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; @SuppressWarnings("serial") -abstract class ActionEditPanel extends Panel implements CISpecAware, JobAware { +abstract class ActionEditPanel extends Panel implements BuildSpecAware, JobAware { private final List actions; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java index fbb3b06373..c1013f2b5f 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditPanel.java @@ -26,11 +26,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.action.PostBuildAction; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.action.PostBuildAction; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; import io.onedev.server.web.component.modal.ModalLink; @@ -89,8 +89,8 @@ class ActionListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return ActionListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return ActionListEditPanel.this.getBuildSpec(); } }; @@ -160,8 +160,8 @@ class ActionListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return ActionListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return ActionListEditPanel.this.getBuildSpec(); } }; @@ -223,10 +223,10 @@ class ActionListEditPanel extends PropertyEditor> { }.sortable("tbody")); } - private CISpec getCISpec() { - CISpecAware ciSpecAware = findParent(CISpecAware.class); - if (ciSpecAware != null) - return ciSpecAware.getCISpec(); + private BuildSpec getBuildSpec() { + BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class); + if (buildSpecAware != null) + return buildSpecAware.getBuildSpec(); else return null; } diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java index a20bd72ab1..da9d9b699f 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.action.PostBuildAction; +import io.onedev.server.buildspec.job.action.PostBuildAction; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java index 28db2e4560..c7753e5b30 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/postbuildaction/ActionListViewPanel.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import io.onedev.server.ci.job.action.PostBuildAction; +import io.onedev.server.buildspec.job.action.PostBuildAction; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.EditableUtils; import io.onedev.server.web.page.layout.SideFloating; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java index 615b227a88..6bd7368304 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyEditPanel.java @@ -11,8 +11,8 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.ProjectDependency; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.ProjectDependency; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java index 953aa870e2..bfe94ebc93 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditPanel.java @@ -26,9 +26,9 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.ProjectDependency; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.ProjectDependency; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; import io.onedev.server.web.component.modal.ModalLink; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java index e3664fdfb7..e0eed217b5 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.ProjectDependency; +import io.onedev.server.buildspec.job.ProjectDependency; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java index 11efde6ba8..a4a1625c77 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/projectdependency/ProjectDependencyListViewPanel.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import io.onedev.server.ci.job.ProjectDependency; +import io.onedev.server.buildspec.job.ProjectDependency; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.page.layout.SideFloating; import io.onedev.server.web.page.layout.SideFloating.Placement; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.java index 712f173983..58c2a97ccc 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportBean.java @@ -4,7 +4,7 @@ import java.io.Serializable; import javax.validation.constraints.NotNull; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.web.editable.annotation.Editable; @Editable diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java index 18dd28bc4d..4e98168a4a 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportEditPanel.java @@ -10,15 +10,15 @@ 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.ci.CISpecAware; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; @SuppressWarnings("serial") -abstract class ReportEditPanel extends Panel implements CISpecAware, JobAware { +abstract class ReportEditPanel extends Panel implements BuildSpecAware, JobAware { private final List reports; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java index 040faa0d70..17262c53b4 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditPanel.java @@ -24,11 +24,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; import io.onedev.server.web.component.modal.ModalLink; @@ -74,8 +74,8 @@ class ReportListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return ReportListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return ReportListEditPanel.this.getBuildSpec(); } @Override @@ -145,8 +145,8 @@ class ReportListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return ReportListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return ReportListEditPanel.this.getBuildSpec(); } @Override @@ -213,10 +213,10 @@ class ReportListEditPanel extends PropertyEditor> { }.sortable("tbody")); } - private CISpec getCISpec() { - CISpecAware ciSpecAware = findParent(CISpecAware.class); - if (ciSpecAware != null) - return ciSpecAware.getCISpec(); + private BuildSpec getBuildSpec() { + BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class); + if (buildSpecAware != null) + return buildSpecAware.getBuildSpec(); else return null; } diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.java index b97abfafd7..61eed96685 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java index a095131005..45c9cb549b 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/report/ReportListViewPanel.java @@ -23,7 +23,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.EditableUtils; import io.onedev.server.web.page.layout.SideFloating; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java index fede3f97ac..1d4c1d6ab8 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceEditPanel.java @@ -11,9 +11,9 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobService; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobService; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; @@ -21,7 +21,7 @@ import io.onedev.server.web.editable.PathNode; import io.onedev.server.web.editable.Path; @SuppressWarnings("serial") -abstract class ServiceEditPanel extends Panel implements CISpecAware, JobAware { +abstract class ServiceEditPanel extends Panel implements BuildSpecAware, JobAware { private final List services; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java index e2a6d8ce5d..830e45cc5b 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditPanel.java @@ -26,11 +26,11 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobService; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobService; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; import io.onedev.server.web.component.modal.ModalLink; @@ -53,10 +53,10 @@ class ServiceListEditPanel extends PropertyEditor> { } } - private CISpec getCISpec() { - CISpecAware ciSpecAware = findParent(CISpecAware.class); - if (ciSpecAware != null) - return ciSpecAware.getCISpec(); + private BuildSpec getBuildSpec() { + BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class); + if (buildSpecAware != null) + return buildSpecAware.getBuildSpec(); else return null; } @@ -92,8 +92,8 @@ class ServiceListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return ServiceListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return ServiceListEditPanel.this.getBuildSpec(); } @Override @@ -164,8 +164,8 @@ class ServiceListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return ServiceListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return ServiceListEditPanel.this.getBuildSpec(); } @Override diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java index 14dfaefde1..2c83c492bf 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.JobService; +import io.onedev.server.buildspec.job.JobService; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java index 6bb7c726f7..0a5ab0a597 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/service/ServiceListViewPanel.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import io.onedev.server.ci.job.JobService; +import io.onedev.server.buildspec.job.JobService; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.page.layout.SideFloating; import io.onedev.server.web.page.layout.SideFloating.Placement; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java index 057113b0e4..3f9449f20d 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerBean.java @@ -4,7 +4,7 @@ import java.io.Serializable; import javax.validation.constraints.NotNull; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.web.editable.annotation.Editable; @Editable diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java index 61524a4cc1..f350ee2a4a 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerEditPanel.java @@ -10,8 +10,8 @@ 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.ci.job.JobAware; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java index db9805c6d0..65889e67b0 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditPanel.java @@ -26,9 +26,9 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; import io.onedev.server.web.component.modal.ModalLink; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java index 2cebc24869..00c9efa4f7 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListEditSupport.java @@ -7,7 +7,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import io.onedev.commons.utils.ReflectionUtils; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.web.editable.EditSupport; import io.onedev.server.web.editable.EmptyValueLabel; import io.onedev.server.web.editable.PropertyContext; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java index bbb420108e..0bc479cef4 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/job/trigger/TriggerListViewPanel.java @@ -25,7 +25,7 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; -import io.onedev.server.ci.job.trigger.JobTrigger; +import io.onedev.server.buildspec.job.trigger.JobTrigger; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.EditableUtils; import io.onedev.server.web.page.layout.SideFloating; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java index e4ad430426..db937074b3 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorEditPanel.java @@ -11,15 +11,15 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.request.cycle.RequestCycle; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.JobAware; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.JobAware; import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator; import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener; import io.onedev.server.web.editable.BeanContext; import io.onedev.server.web.editable.BeanEditor; @SuppressWarnings("serial") -abstract class LocatorEditPanel extends Panel implements CISpecAware, JobAware { +abstract class LocatorEditPanel extends Panel implements BuildSpecAware, JobAware { private final List locators; diff --git a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java index 94dba10530..9c697d46d8 100644 --- a/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/editable/servicelocator/LocatorListEditPanel.java @@ -24,10 +24,10 @@ import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.convert.ConversionException; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; import io.onedev.server.model.support.administration.jobexecutor.ServiceLocator; import io.onedev.server.web.behavior.sortable.SortBehavior; import io.onedev.server.web.behavior.sortable.SortPosition; @@ -52,10 +52,10 @@ class LocatorListEditPanel extends PropertyEditor> { } } - private CISpec getCISpec() { - CISpecAware ciSpecAware = findParent(CISpecAware.class); - if (ciSpecAware != null) - return ciSpecAware.getCISpec(); + private BuildSpec getBuildSpec() { + BuildSpecAware buildSpecAware = findParent(BuildSpecAware.class); + if (buildSpecAware != null) + return buildSpecAware.getBuildSpec(); else return null; } @@ -91,8 +91,8 @@ class LocatorListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return LocatorListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return LocatorListEditPanel.this.getBuildSpec(); } @Override @@ -187,8 +187,8 @@ class LocatorListEditPanel extends PropertyEditor> { } @Override - public CISpec getCISpec() { - return LocatorListEditPanel.this.getCISpec(); + public BuildSpec getBuildSpec() { + return LocatorListEditPanel.this.getBuildSpec(); } @Override diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html index 5648564752..3320175837 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html +++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPage.html @@ -1,7 +1,7 @@
Job Executors
- For a given CI job, the first matching job executor will be used + For a given build job, the first matching job executor will be used
    diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java index 6d062b3a8c..1034b3e62e 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/BlobUploadPanel.java @@ -19,6 +19,7 @@ import org.apache.wicket.util.lang.Bytes; import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel; import io.onedev.server.event.RefUpdated; import io.onedev.server.model.Project; +import io.onedev.server.web.behavior.ReferenceInputBehavior; import io.onedev.server.web.component.dropzonefield.DropzoneField; import io.onedev.server.web.page.project.blob.render.BlobRenderContext; @@ -91,9 +92,29 @@ public abstract class BlobUploadPanel extends Panel { }); form.add(new TextField("directory", new PropertyModel(this, "directory"))); + + ReferenceInputBehavior behavior = new ReferenceInputBehavior(true) { + + @Override + protected Project getProject() { + return context.getProject(); + } + + }; form.add(new TextField("summaryCommitMessage", - new PropertyModel(this, "summaryCommitMessage"))); - form.add(new TextArea("detailCommitMessage", new PropertyModel(this, "detailCommitMessage"))); + new PropertyModel(this, "summaryCommitMessage")).add(behavior)); + + behavior = new ReferenceInputBehavior(true) { + + @Override + protected Project getProject() { + return context.getProject(); + } + + }; + form.add(new TextArea("detailCommitMessage", + new PropertyModel(this, "detailCommitMessage")).add(behavior)); + form.add(new AjaxLink("cancel") { @Override diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html index 19f2ca5974..39b3dc71f2 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html @@ -17,7 +17,7 @@ Revision indexing in progress... (search in this revision will be accurate after indexed)
-
Enable CI support by adding onedev-ci.xml
+
Enable build support by
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java index 36a9b577a9..85104d8e8e 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.java @@ -29,8 +29,11 @@ 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.basic.Label; import org.apache.wicket.markup.html.form.upload.FileUpload; import org.apache.wicket.model.AbstractReadOnlyModel; +import org.apache.wicket.model.IModel; +import org.apache.wicket.model.Model; import org.apache.wicket.request.IRequestParameters; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; @@ -55,7 +58,7 @@ import io.onedev.commons.jsymbol.util.NoAntiCacheImage; import io.onedev.commons.launcher.loader.ListenerRegistry; import io.onedev.commons.utils.PlanarRange; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; +import io.onedev.server.buildspec.BuildSpec; import io.onedev.server.entitymanager.CodeCommentManager; import io.onedev.server.entitymanager.ProjectManager; import io.onedev.server.entitymanager.PullRequestManager; @@ -713,17 +716,22 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S protected void onInitialize() { super.onInitialize(); - if (SecurityUtils.canModify(getProject(), state.blobIdent.revision, CISpec.BLOB_PATH)) { + if (SecurityUtils.canModify(getProject(), state.blobIdent.revision, BuildSpec.BLOB_PATH)) { add(new ViewStateAwareAjaxLink("addFile") { @Override public void onClick(AjaxRequestTarget target) { - onModeChange(target, Mode.ADD, CISpec.BLOB_PATH); + onModeChange(target, Mode.ADD, BuildSpec.BLOB_PATH); + } + + @Override + public IModel getBody() { + return Model.of("adding " + BuildSpec.BLOB_PATH); } }); } else { - add(new WebMarkupContainer("addFile") { + add(new Label("addFile", "adding " + BuildSpec.BLOB_PATH) { @Override protected void onComponentTag(ComponentTag tag) { @@ -740,7 +748,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S protected void onConfigure() { super.onConfigure(); if (resolvedRevision != null && isOnBranch() && state.blobIdent.path == null && state.mode == Mode.VIEW) { - BlobIdent blobIdent = new BlobIdent(resolvedRevision.name(), CISpec.BLOB_PATH, FileMode.TYPE_FILE); + BlobIdent blobIdent = new BlobIdent(resolvedRevision.name(), BuildSpec.BLOB_PATH, FileMode.TYPE_FILE); setVisible(getProject().getBlob(blobIdent, false) == null); } else { setVisible(false); @@ -1131,6 +1139,7 @@ public class ProjectBlobPage extends ProjectPage implements BlobRenderContext, S Project project = getProject(); if (state.blobIdent.revision == null) { state.blobIdent.revision = "master"; + resolvedRevision = refUpdated.getNewCommitId(); project.setDefaultBranch("master"); } String branch = state.blobIdent.revision; diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js index e09d58ddb8..077b4fceee 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/blob-edit.js @@ -59,7 +59,7 @@ onedev.server.blobEdit = { * use appropriate blob editor for current file name. In such case we add "no-autofocus" * class to the blob content container in order not to jump to blob content area while * inputting file name. However we want to remove this class to get better user - * experience (for instance when we are editing the CI specs) when we are ready to edit + * experience (for instance when we are editing the build specs) when we are ready to edit * the blob content by moving mouse into blob edit area */ $container.closest(".no-autofocus").removeClass("no-autofocus"); diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java similarity index 64% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java index 4997597948..cdfa968166 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobEditPanel.java @@ -1,28 +1,28 @@ -package io.onedev.server.web.page.project.blob.render.renderers.cispec; +package io.onedev.server.web.page.project.blob.render.renderers.buildspec; import org.apache.wicket.markup.html.form.FormComponentPanel; -import io.onedev.server.ci.CISpec; +import io.onedev.server.buildspec.BuildSpec; 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 class BuildSpecBlobEditPanel extends BlobEditPanel implements PlainEditSupport { - public CISpecBlobEditPanel(String id, BlobRenderContext context) { + public BuildSpecBlobEditPanel(String id, BlobRenderContext context) { super(id, context); } @Override protected FormComponentPanel newEditor(String componentId, byte[] initialContent) { - return new CISpecEditPanel(componentId, context, initialContent); + return new BuildSpecEditPanel(componentId, context, initialContent); } @Override public FormComponentPanel newPlainEditor(String componentId, byte[] initialContent) { - return new PlainEditPanel(componentId, CISpec.BLOB_PATH, initialContent); + return new PlainEditPanel(componentId, BuildSpec.BLOB_PATH, initialContent); } } diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html similarity index 87% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html index 4f17303ba3..f604809c21 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html @@ -1,5 +1,5 @@ -
+
@@ -12,7 +12,7 @@
-
Error rendering CI spec
+
Error rendering build spec
 diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java similarity index 81% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java index ca94a3fdcf..7670707661 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java @@ -1,4 +1,4 @@ -package io.onedev.server.web.page.project.blob.render.renderers.cispec; +package io.onedev.server.web.page.project.blob.render.renderers.buildspec; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.CallbackParameter; @@ -16,8 +16,8 @@ import org.unbescape.javascript.JavaScriptEscape; import com.google.common.base.Throwables; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.git.Blob; import io.onedev.server.model.Project; import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; @@ -28,11 +28,11 @@ 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 CISpecBlobViewPanel extends BlobViewPanel { +public class BuildSpecBlobViewPanel extends BlobViewPanel { private AbstractPostAjaxBehavior selectBehavior; - public CISpecBlobViewPanel(String id, BlobRenderContext context) { + public BuildSpecBlobViewPanel(String id, BlobRenderContext context) { super(id, context); } @@ -42,15 +42,15 @@ public class CISpecBlobViewPanel extends BlobViewPanel { try { Blob blob = context.getProject().getBlob(context.getBlobIdent(), true); - CISpec ciSpec = CISpec.parse(blob.getBytes()); - if (ciSpec != null) { + BuildSpec buildSpec = BuildSpec.parse(blob.getBytes()); + if (buildSpec != null) { Fragment validFrag = new Fragment("content", "validFrag", this); - if (!ciSpec.getJobs().isEmpty()) { + if (!buildSpec.getJobs().isEmpty()) { Fragment hasJobsFrag = new Fragment("body", "hasJobsFrag", this); RepeatingView navsView = new RepeatingView("navs"); RepeatingView jobsView = new RepeatingView("contents"); - for (Job job: ciSpec.getJobs()) { + for (Job job: buildSpec.getJobs()) { WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId()); nav.add(new Label("jobName", job.getName())); nav.add(AttributeAppender.append("data-name", job.getName())); @@ -74,7 +74,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel { } add(validFrag); } else { - add(new Label("content", "CI spec not defined").add(AttributeAppender.append("class", "not-defined"))); + add(new Label("content", "Build spec not defined").add(AttributeAppender.append("class", "not-defined"))); } } catch (Exception e) { Fragment invalidFrag = new Fragment("content", "invalidFrag", this); @@ -88,7 +88,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel { protected void respond(AjaxRequestTarget target) { IRequestParameters params = RequestCycle.get().getRequest().getPostParameters(); String selection = params.getParameterValue("selection").toString(); - String position = CISpecRendererProvider.getPosition(selection); + String position = BuildSpecRendererProvider.getPosition(selection); context.onSelect(target, context.getBlobIdent(), position); } @@ -98,9 +98,9 @@ public class CISpecBlobViewPanel extends BlobViewPanel { @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference())); - String selection = CISpecRendererProvider.getSelection(context.getPosition()); - String script = String.format("onedev.server.ciSpec.onDomReady(%s, %s);", + response.render(JavaScriptHeaderItem.forReference(new BuildSpecResourceReference())); + String selection = BuildSpecRendererProvider.getSelection(context.getPosition()); + String script = String.format("onedev.server.buildSpec.onDomReady(%s, %s);", selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined", selectBehavior.getCallbackFunction(CallbackParameter.explicit("selection"))); response.render(OnDomReadyHeaderItem.forScript(script)); diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html similarity index 92% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html index dbcfa267a6..562b2e2c7a 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html @@ -1,5 +1,5 @@ -
+
@@ -33,7 +33,7 @@
-
Error rendering CI spec
+
Error rendering build spec
 diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java similarity index 78% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java index f6d3ad892e..ed5013c45d 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java @@ -1,4 +1,4 @@ -package io.onedev.server.web.page.project.blob.render.renderers.cispec; +package io.onedev.server.web.page.project.blob.render.renderers.buildspec; import java.io.Serializable; import java.util.ArrayList; @@ -31,11 +31,11 @@ import com.google.common.base.Throwables; import io.onedev.commons.launcher.loader.AppLoader; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.CISpecAware; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobAware; -import io.onedev.server.ci.job.JobSuggestion; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.BuildSpecAware; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobAware; +import io.onedev.server.buildspec.job.JobSuggestion; import io.onedev.server.migration.VersionedDocument; import io.onedev.server.web.behavior.AbstractPostAjaxBehavior; import io.onedev.server.web.behavior.sortable.SortBehavior; @@ -54,7 +54,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext; import io.onedev.server.web.util.WicketUtils; @SuppressWarnings("serial") -public class CISpecEditPanel extends FormComponentPanel implements CISpecAware { +public class BuildSpecEditPanel extends FormComponentPanel implements BuildSpecAware { private final BlobRenderContext context; @@ -66,18 +66,18 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe private AbstractPostAjaxBehavior deleteBehavior; - public CISpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) { + public BuildSpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) { super(id, Model.of(initialContent)); this.context = context; - parseResult = parseCISpec(getModelObject()); + parseResult = parseBuildSpec(getModelObject()); } - private Serializable parseCISpec(byte[] bytes) { + private Serializable parseBuildSpec(byte[] bytes) { try { - CISpec ciSpec = CISpec.parse(bytes); - if (ciSpec == null) - ciSpec = new CISpec(); - return ciSpec; + BuildSpec buildSpec = BuildSpec.parse(bytes); + if (buildSpec == null) + buildSpec = new BuildSpec(); + return buildSpec; } catch (Exception e) { return e; } @@ -98,7 +98,7 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe public void renderHead(Component component, IHeaderResponse response) { super.renderHead(component, response); int index = WicketUtils.getChildIndex(jobContents, content); - String script = String.format("onedev.server.ciSpec.trackJobNameChange(%d);", index); + String script = String.format("onedev.server.buildSpec.trackJobNameChange(%d);", index); response.render(OnDomReadyHeaderItem.forScript(script)); } @@ -109,21 +109,21 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe private void addJob(AjaxRequestTarget target, Job job) { Component nav = newJobNav(job); - String script = String.format("$('.ci-spec>.valid>.jobs>.body>.side>.navs').append(\"
\");", + String script = String.format("$('.build-spec>.valid>.jobs>.body>.side>.navs').append(\"
\");", nav.getMarkupId()); target.prependJavaScript(script); target.add(nav); Component content = newJobContent(job); - script = String.format("$('.ci-spec>.valid>.jobs>.body>.contents').append(\"
\");", + script = String.format("$('.build-spec>.valid>.jobs>.body>.contents').append(\"
\");", content.getMarkupId()); target.prependJavaScript(script); target.add(content); script = String.format("" - + "onedev.server.ciSpec.showJob(%d); " - + "$('#%s .select').mouseup(onedev.server.ciSpec.selectJob);" - + "$('#%s .delete').mouseup(onedev.server.ciSpec.deleteJob);", + + "onedev.server.buildSpec.showJob(%d); " + + "$('#%s .select').mouseup(onedev.server.buildSpec.selectJob);" + + "$('#%s .delete').mouseup(onedev.server.buildSpec.deleteJob);", jobNavs.size() - 1, nav.getMarkupId(), nav.getMarkupId()); target.appendJavaScript(script); } @@ -133,14 +133,14 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe super.onInitialize(); Fragment content; - if (parseResult instanceof CISpec) { - CISpec ciSpec = (CISpec) parseResult; + if (parseResult instanceof BuildSpec) { + BuildSpec buildSpec = (BuildSpec) parseResult; content = new Fragment("content", "validFrag", this); jobNavs = new RepeatingView("navs"); jobContents = new RepeatingView("contents"); - for (Job job: ciSpec.getJobs()) { + for (Job job: buildSpec.getJobs()) { newJobNav(job); newJobContent(job); } @@ -222,7 +222,7 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe jobContents.swap(fromIndex-i, fromIndex-i-1); } } - target.appendJavaScript(String.format("onedev.server.ciSpec.swapJobs(%d, %d)", fromIndex, toIndex)); + target.appendJavaScript(String.format("onedev.server.buildSpec.swapJobs(%d, %d)", fromIndex, toIndex)); } }.sortable(".jobs>.body>.side>.navs")); @@ -231,11 +231,11 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe @Override public void validate(IValidatable validatable) { - Serializable parseResult = parseCISpec(validatable.getValue()); - if (parseResult instanceof CISpec) { - CISpec ciSpec = (CISpec) parseResult; + Serializable parseResult = parseBuildSpec(validatable.getValue()); + if (parseResult instanceof BuildSpec) { + BuildSpec buildSpec = (BuildSpec) parseResult; Validator validator = AppLoader.getInstance(Validator.class); - for (ConstraintViolation violation: validator.validate(ciSpec)) { + for (ConstraintViolation violation: validator.validate(buildSpec)) { Path path = new Path(violation.getPropertyPath()); if (path.getNodes().isEmpty()) { error(violation.getMessage()); @@ -250,7 +250,7 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe PathNode.Indexed indexed = (Indexed) path.getNodes().iterator().next(); path = new Path(path.getNodes().subList(1, path.getNodes().size())); if (path.getNodes().isEmpty()) { - error("Job '" + ciSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage()); + error("Job '" + buildSpec.getJobs().get(indexed.getIndex()).getName() + "': " + violation.getMessage()); } else { @SuppressWarnings("deprecation") BeanEditor editor = (BeanEditor) jobContents.get(indexed.getIndex()); @@ -288,9 +288,9 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe @Override public void convertInput() { - if (parseResult instanceof CISpec) { - CISpec ciSpec = getCISpec(); - setConvertedInput(VersionedDocument.fromBean(ciSpec).toXML().getBytes(Charsets.UTF_8)); + if (parseResult instanceof BuildSpec) { + BuildSpec buildSpec = getBuildSpec(); + setConvertedInput(VersionedDocument.fromBean(buildSpec).toXML().getBytes(Charsets.UTF_8)); } else { setConvertedInput(getModelObject()); } @@ -299,24 +299,24 @@ public class CISpecEditPanel extends FormComponentPanel implements CISpe @Override public void renderHead(IHeaderResponse response) { super.renderHead(response); - response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference())); - String selection = CISpecRendererProvider.getSelection(context.getPosition()); + response.render(JavaScriptHeaderItem.forReference(new BuildSpecResourceReference())); + String selection = BuildSpecRendererProvider.getSelection(context.getPosition()); - String script = String.format("onedev.server.ciSpec.onDomReady(%s, undefined, %s);", + String script = String.format("onedev.server.buildSpec.onDomReady(%s, undefined, %s);", selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined", deleteBehavior.getCallbackFunction(CallbackParameter.explicit("index"))); response.render(OnDomReadyHeaderItem.forScript(script)); } @Override - public CISpec getCISpec() { - if (parseResult instanceof CISpec) { - CISpec ciSpec = new CISpec(); + public BuildSpec getBuildSpec() { + if (parseResult instanceof BuildSpec) { + BuildSpec buildSpec = new BuildSpec(); for (Component child: jobContents) { BeanEditor jobContent = (BeanEditor) child; - ciSpec.getJobs().add((Job) jobContent.getConvertedInput()); + buildSpec.getJobs().add((Job) jobContent.getConvertedInput()); } - return ciSpec; + return buildSpec; } else { return null; } diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java similarity index 78% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java index 0fb8046f35..a7f31cdd37 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecRendererProvider.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRendererProvider.java @@ -1,10 +1,10 @@ -package io.onedev.server.web.page.project.blob.render.renderers.cispec; +package io.onedev.server.web.page.project.blob.render.renderers.buildspec; import javax.annotation.Nullable; import org.apache.wicket.Component; -import io.onedev.server.ci.CISpec; +import io.onedev.server.buildspec.BuildSpec; import io.onedev.server.web.PrioritizedComponentRenderer; import io.onedev.server.web.page.project.blob.render.BlobRenderContext; import io.onedev.server.web.page.project.blob.render.BlobRenderContext.Mode; @@ -13,14 +13,14 @@ import io.onedev.server.web.page.project.blob.render.renderers.source.SourceEdit import io.onedev.server.web.page.project.blob.render.renderers.source.SourceRendererProvider; import io.onedev.server.web.page.project.blob.render.renderers.source.SourceViewPanel; -public class CISpecRendererProvider implements BlobRendererContribution { +public class BuildSpecRendererProvider implements BlobRendererContribution { private static final long serialVersionUID = 1L; - private static final String POSITION_PREFIX = "cispec-"; + private static final String POSITION_PREFIX = "buildspec-"; - private boolean isCISpec(@Nullable String blobPath) { - return CISpec.BLOB_PATH.equals(blobPath); + private boolean isBuildSpec(@Nullable String blobPath) { + return BuildSpec.BLOB_PATH.equals(blobPath); } @Nullable @@ -38,8 +38,8 @@ public class CISpecRendererProvider implements BlobRendererContribution { @Override public PrioritizedComponentRenderer getRenderer(BlobRenderContext context) { - if (context.getMode() == Mode.ADD && isCISpec(context.getNewPath()) - || context.getMode() == Mode.EDIT && isCISpec(context.getBlobIdent().path)) { + if (context.getMode() == Mode.ADD && isBuildSpec(context.getNewPath()) + || context.getMode() == Mode.EDIT && isBuildSpec(context.getBlobIdent().path)) { return new PrioritizedComponentRenderer() { private static final long serialVersionUID = 1L; @@ -49,7 +49,7 @@ public class CISpecRendererProvider implements BlobRendererContribution { if (SourceRendererProvider.getRange(context.getPosition()) != null) return new SourceEditPanel(componentId, context); else - return new CISpecBlobEditPanel(componentId, context); + return new BuildSpecBlobEditPanel(componentId, context); } @Override @@ -59,7 +59,7 @@ public class CISpecRendererProvider implements BlobRendererContribution { }; } else if ((context.getMode() == Mode.VIEW || context.getMode() == Mode.VIEW_PLAIN || context.getMode() == Mode.BLAME) && context.getBlobIdent().isFile() - && isCISpec(context.getBlobIdent().path)) { + && isBuildSpec(context.getBlobIdent().path)) { return new PrioritizedComponentRenderer() { private static final long serialVersionUID = 1L; @@ -71,7 +71,7 @@ public class CISpecRendererProvider implements BlobRendererContribution { else if (context.getMode() == Mode.VIEW_PLAIN) return new SourceViewPanel(componentId, context, true); else - return new CISpecBlobViewPanel(componentId, context); + return new BuildSpecBlobViewPanel(componentId, context); } @Override diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.java similarity index 71% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.java index 5cf3f7b42c..4a6d120959 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.java @@ -1,4 +1,4 @@ -package io.onedev.server.web.page.project.blob.render.renderers.cispec; +package io.onedev.server.web.page.project.blob.render.renderers.buildspec; import java.util.List; @@ -8,19 +8,19 @@ import org.apache.wicket.markup.head.HeaderItem; import io.onedev.server.web.page.base.BaseDependentCssResourceReference; import io.onedev.server.web.page.base.BaseDependentResourceReference; -public class CISpecResourceReference extends BaseDependentResourceReference { +public class BuildSpecResourceReference extends BaseDependentResourceReference { private static final long serialVersionUID = 1L; - public CISpecResourceReference() { - super(CISpecResourceReference.class, "ci-spec.js"); + public BuildSpecResourceReference() { + super(BuildSpecResourceReference.class, "build-spec.js"); } @Override public List getDependencies() { List dependencies = super.getDependencies(); dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference( - CISpecResourceReference.class, "ci-spec.css"))); + BuildSpecResourceReference.class, "build-spec.css"))); return dependencies; } diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css similarity index 51% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css index fafb6292f7..1ab30b0078 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css @@ -1,77 +1,77 @@ -.ci-spec { +.build-spec { padding: 20px; } -.ci-spec.not-defined { +.build-spec.not-defined { font-style: italic; font-size: 16px; text-align: center; } -.ci-spec>.invalid>.title { +.build-spec>.invalid>.title { font-size: 20px; color: red; margin-bottom: 20px; } -.ci-spec>.invalid>.error-message { +.build-spec>.invalid>.error-message { white-space: pre-wrap; word-wrap: break-word; font-size: 13px; font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; } -.ci-spec>.valid>div { +.build-spec>.valid>div { border-radius: 4px; } -.ci-spec>.valid>div>.head { +.build-spec>.valid>div>.head { font-weight: bold; font-size: 16px; margin-bottom: 16px; } -.ci-spec>.valid>div>.body { +.build-spec>.valid>div>.body { position: relative; } -.ci-spec>.valid>div>.not-defined { +.build-spec>.valid>div>.not-defined { font-size: 16px; font-style: italic; } -.ci-spec>.valid>div>.body>:first-child { +.build-spec>.valid>div>.body>:first-child { position: absolute; left: 0; top: 0; width: 220px; } -.ci-spec>.valid>div>.body>:last-child { +.build-spec>.valid>div>.body>:last-child { margin-left: 240px; } -.ci-spec>.valid>div>.body>.side>.navs:not(:empty) { +.build-spec>.valid>div>.body>.side>.navs:not(:empty) { margin-bottom: 20px; } -.ci-spec>.valid>div>.body>.side>.navs>.nav { +.build-spec>.valid>div>.body>.side>.navs>.nav { position: relative; background: #444; border-radius: 4px; margin-bottom: 8px; } -.ci-spec>.valid>div>.body>.side>.navs>.nav a { +.build-spec>.valid>div>.body>.side>.navs>.nav a { color: #BBB; } -.ci-spec>.valid>div>.body>.side>.navs>.nav .drag-indicator { +.build-spec>.valid>div>.body>.side>.navs>.nav .drag-indicator { color: inherit; margin-right: 4px; } -.ci-spec>.valid>div>.body>.side>.navs>.nav:hover a, -.ci-spec>.valid>div>.body>.side>.navs>.nav.active a { +.build-spec>.valid>div>.body>.side>.navs>.nav:hover a, +.build-spec>.valid>div>.body>.side>.navs>.nav.active a { color: white; font-weight: bold; } -.ci-spec>.valid>div>.body>.side>.navs>.nav.active { +.build-spec>.valid>div>.body>.side>.navs>.nav.active { background: #080808; } -.ci-spec>.valid>div>.body>.side>.navs>.nav:first-child:last-child { +.build-spec>.valid>div>.body>.side>.navs>.nav:first-child:last-child { border-radius: 4px; } -.ci-spec>.valid>div>.body>.side>.navs>.nav>.select { +.build-spec>.valid>div>.body>.side>.navs>.nav>.select { padding: 8px 28px 8px 8px; text-decoration: none; display: block; @@ -79,8 +79,8 @@ text-overflow: ellipsis; white-space: nowrap; } -.ci-spec>.valid>div>.body>.side>.navs>.nav>.delete, -.ci-spec>.valid>div>.body>.side>.navs>.nav>.run { +.build-spec>.valid>div>.body>.side>.navs>.nav>.delete, +.build-spec>.valid>div>.body>.side>.navs>.nav>.run { right: 0; top: 0; position: absolute; @@ -88,42 +88,42 @@ padding: 8px 8px; display: block; } -.ci-spec>.valid>div>.body>.side .add { +.build-spec>.valid>div>.body>.side .add { position: relative; } -.ci-spec>.valid>div>.body>.side .create { +.build-spec>.valid>div>.body>.side .create { display: block; margin-right: 38px; border-radius: 4px 0 0 4px; } -.ci-spec>.valid>div>.body>.side .create.no-suggestions { +.build-spec>.valid>div>.body>.side .create.no-suggestions { margin-right: 0; border-radius: 4px; } -.ci-spec>.valid>div>.body>.side .suggestions { +.build-spec>.valid>div>.body>.side .suggestions { position: absolute; right: 0; top: 0; border-radius: 0 4px 4px 0; border-left: none; } -.ci-spec>.valid>div>.body>.contents>.content { +.build-spec>.valid>div>.body>.contents>.content { border-radius: 4px; border: 1px solid #BBB; padding: 20px; } -.ci-spec>.valid .bean-properties>table>tbody>tr>td.name { +.build-spec>.valid .bean-properties>table>tbody>tr>td.name { width: 200px; } -.ci-spec>.valid .bean-properties>table>tbody>tr.property-retry td.name { +.build-spec>.valid .bean-properties>table>tbody>tr.property-retry td.name { width: 100px; } -.ci-spec>.valid .bean-properties>table>tbody>tr>td.value .form-control { +.build-spec>.valid .bean-properties>table>tbody>tr>td.value .form-control { height: 32px; font-size: 13px; } -.ci-spec>.valid .def-list table>tbody>tr>td:first-child>div>a { +.build-spec>.valid .def-list table>tbody>tr>td:first-child>div>a { margin-left: 0; } diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js similarity index 84% rename from server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js rename to server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js index ac7d43862f..4e8c530519 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js @@ -1,7 +1,7 @@ -onedev.server.ciSpec = { +onedev.server.buildSpec = { onDomReady: function(selection, selectCallback, deleteCallback) { var activeJobIndex = -1; - var $body = $(".ci-spec>.valid>.jobs>.body"); + var $body = $(".build-spec>.valid>.jobs>.body"); $body.data("selectCallback", selectCallback); $body.data("deleteCallback", deleteCallback); @@ -21,29 +21,29 @@ onedev.server.ciSpec = { if (activeJobIndex == -1) activeJobIndex = 0; - onedev.server.ciSpec.showJob(activeJobIndex); + onedev.server.buildSpec.showJob(activeJobIndex); var $navs = $body.find(".side>.navs"); $navs.data("getPosition", function() { - return "cispec-jobs/" + $navs.children(".active").data("name"); + return "buildspec-jobs/" + $navs.children(".active").data("name"); }); // use mouseup together with ui-sortable-helper (see selectJob method) class check // to avoid the issue that sortable will fire onclick event in firefox (hence cause // the job being selected while sorting - $body.find(".side>.navs>.nav>.select").mouseup(onedev.server.ciSpec.selectJob); - $body.find(".side>.navs>.nav>.delete").mouseup(onedev.server.ciSpec.deleteJob); + $body.find(".side>.navs>.nav>.select").mouseup(onedev.server.buildSpec.selectJob); + $body.find(".side>.navs>.nav>.delete").mouseup(onedev.server.buildSpec.deleteJob); }, selectJob: function() { var $nav = $(this).parent(); if (!$nav.hasClass("ui-sortable-helper")) { - onedev.server.ciSpec.showJob($nav.index()); - var $body = $(".ci-spec>.valid>.jobs>.body"); + onedev.server.buildSpec.showJob($nav.index()); + var $body = $(".build-spec>.valid>.jobs>.body"); if ($body.data("selectCallback")) $body.data("selectCallback")("jobs/" + $nav.data("name")); } }, showJob: function(index) { - var $body = $(".ci-spec>.valid>.jobs>.body"); + var $body = $(".build-spec>.valid>.jobs>.body"); var $navs = $body.find(">.side>.navs"); $navs.children().removeClass("active"); var $nav = $navs.children().eq(index); @@ -58,7 +58,7 @@ onedev.server.ciSpec = { deleteJob: function() { var $nav = $(this).parent(); if (!$nav.hasClass("ui-sortable-helper")) { - var $body = $(".ci-spec-edit .jobs>.body"); + var $body = $(".build-spec-edit .jobs>.body"); var $navs = $body.find(">.side>.navs"); var $contents = $body.children(".contents"); var index = $nav.index(); @@ -67,13 +67,13 @@ onedev.server.ciSpec = { $contents.children().eq(index).remove(); if ($nav.hasClass("active")) - onedev.server.ciSpec.showJob(0); + onedev.server.buildSpec.showJob(0); $body.data("deleteCallback")(index); } }, swapJobs: function(index1, index2) { - var $contents = $(".ci-spec-edit .jobs>.body>.contents"); + var $contents = $(".build-spec-edit .jobs>.body>.contents"); if (index1 < index2) { for (var i = 0; i < index2-index1; i++) @@ -84,7 +84,7 @@ onedev.server.ciSpec = { } }, trackJobNameChange: function(index) { - var $body = $(".ci-spec-edit .jobs>.body"); + var $body = $(".build-spec-edit .jobs>.body"); var $navs = $body.find(">.side>.navs"); var $nav = $navs.children().eq(index); var $contents = $body.children(".contents"); diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java index 7010c2884e..cc335bb287 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/folder/FolderViewPanel.java @@ -38,7 +38,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import io.onedev.server.OneDev; -import io.onedev.server.ci.CISpec; +import io.onedev.server.buildspec.BuildSpec; import io.onedev.server.git.Blob; import io.onedev.server.git.BlobIdent; import io.onedev.server.util.userident.UserIdent; @@ -98,11 +98,11 @@ public class FolderViewPanel extends Panel { Collections.sort(children); - BlobIdent ciSpecIdent = new BlobIdent(context.getBlobIdent().revision, - CISpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits()); - if (children.contains(ciSpecIdent)) { - children.remove(ciSpecIdent); - children.add(0, ciSpecIdent); + BlobIdent buildSpecIdent = new BlobIdent(context.getBlobIdent().revision, + BuildSpec.BLOB_PATH, FileMode.REGULAR_FILE.getBits()); + if (children.contains(buildSpecIdent)) { + children.remove(buildSpecIdent); + children.add(0, buildSpecIdent); } return children; } catch (IOException e) { @@ -191,7 +191,7 @@ public class FolderViewPanel extends Panel { iconClass = "fa fa-ext fa-folder-submodule-o"; else if (blobIdent.isSymbolLink()) iconClass = "fa fa-ext fa-folder-symbol-link-o"; - else if (blobIdent.path.equals(CISpec.BLOB_PATH)) + else if (blobIdent.path.equals(BuildSpec.BLOB_PATH)) iconClass = "fa fa-cog"; else iconClass = "fa fa-file-text-o"; @@ -219,7 +219,7 @@ public class FolderViewPanel extends Panel { if (context.getBlobIdent().path != null) pathLink.add(new Label("label", blobIdent.path.substring(context.getBlobIdent().path.length()+1))); - else if (blobIdent.path.equals(CISpec.BLOB_PATH)) + else if (blobIdent.path.equals(BuildSpec.BLOB_PATH)) pathLink.add(new Label("label", "" + HtmlEscape.escapeHtml5(blobIdent.path) + "").setEscapeModelStrings(false)); else pathLink.add(new Label("label", blobIdent.path)); diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html index 0eb66bbc68..fe5a839107 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/nocommits/NoCommitsPanel.html @@ -1,6 +1,6 @@
-
Project does not have any commits yet
+
Project does not have any code yet
You may initialize code of the project by adding files, or pushing an existing repository
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java index 0f02162c66..0480b29814 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceFormComponent.java @@ -80,7 +80,8 @@ abstract class SourceFormComponent extends FormComponentPanel { } else { jsonOfMark = "undefined"; } - String script = String.format("onedev.server.sourceEdit.onDomReady('%s', '%s', %s, '%s', %s, '%s', %b, '%s');", + String script = String.format("onedev.server.sourceEdit.onDomReady(" + + "'%s', '%s', %s, '%s', %s, '%s', %b, '%s');", getMarkupId(), JavaScriptEscape.escapeJavaScript(getContext().getNewPath()), jsonOfMark, diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java index 8cd1122993..f9f46e3639 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/SourceViewPanel.java @@ -907,8 +907,8 @@ public class SourceViewPanel extends BlobViewPanel implements Positionable, Sear explicit("action"), explicit("param1"), explicit("param2"), explicit("param3"), explicit("param4")); - String script = String.format("onedev.server.sourceView.onDomReady('%s', '%s', %s, %s, '%s', '%s', " - + "%s, %s, %s, %s, %s, '%s');", + String script = String.format("onedev.server.sourceView.onDomReady(" + + "'%s', '%s', %s, %s, '%s', '%s', %s, %s, %s, %s, %s, '%s');", JavaScriptEscape.escapeJavaScript(context.getBlobIdent().path), JavaScriptEscape.escapeJavaScript(blob.getText().getContent()), context.getOpenComment()!=null?getJsonOfComment(context.getOpenComment()):"undefined", diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js index dcce270ee9..04f22ccbc5 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-edit.js @@ -23,10 +23,7 @@ onedev.server.sourceEdit = { highlightIdentifiers: {delay: 500} }); - if (filePath.endsWith(".cbl") || filePath.endsWith(".pco")) - onedev.server.codemirror.setModeByName(cm, "cobol"); - else - onedev.server.codemirror.setModeByFileName(cm, filePath); + onedev.server.codemirror.setModeByFileName(cm, filePath); /* * AreYouSure can not track dirty correctly for CodeMirror generated diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js index f035bce4cf..d2375148be 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js +++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/source/source-view.js @@ -23,10 +23,7 @@ onedev.server.sourceView = { gutters: ["CodeMirror-linenumbers", "CodeMirror-foldgutter"] }); - if (filePath.endsWith(".cbl") || filePath.endsWith(".pco")) - onedev.server.codemirror.setModeByName(cm, "cobol"); - else - onedev.server.codemirror.setModeByFileName(cm, filePath); + onedev.server.codemirror.setModeByFileName(cm, filePath); $sourceView.data("callback", callback); $sourceView.data("blameMessageCallback", blameMessageCallback); diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java index 32cfd7aa94..a5f140bfd3 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java @@ -36,9 +36,9 @@ import com.google.common.collect.Sets; import io.onedev.commons.utils.LockUtils; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.paramspec.ParamSpec; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.git.GitUtils; import io.onedev.server.model.Build; diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java index 22be367a1f..8203ce1da3 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java @@ -45,9 +45,9 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; import io.onedev.server.OneDev; +import io.onedev.server.buildspec.BuildSpec; +import io.onedev.server.buildspec.job.Job; import io.onedev.server.cache.CommitInfoManager; -import io.onedev.server.ci.CISpec; -import io.onedev.server.ci.job.Job; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.CodeCommentManager; import io.onedev.server.git.BlobIdent; @@ -246,11 +246,11 @@ public class CommitDetailPage extends ProjectPage implements CommentSupport { @Override protected List load() { try { - CISpec ciSpec = getProject().getCISpec(getCommit().copy()); - if (ciSpec != null) - return ciSpec.getJobs(); + BuildSpec buildSpec = getProject().getBuildSpec(getCommit().copy()); + if (buildSpec != null) + return buildSpec.getJobs(); } catch (Exception e) { - logger.error("Error retrieving CI spec (project: {}, commit: {})", + logger.error("Error retrieving build spec (project: {}, commit: {})", getProject().getName(), getCommit().name(), e); } return new ArrayList<>(); diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java index 02ddd1bc96..fe377b1b5e 100644 --- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java +++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/secret/SecretListPage.java @@ -51,7 +51,7 @@ public class SecretListPage extends ProjectSettingPage { add(form); - String note = String.format("Define project secrets here to be used in CI jobs. Secret value less " + String note = String.format("Define project secrets here to be used in build jobs. Secret value less " + "than %d characters will not be masked in build log. For a given name, the first " + "authorized secret will be used", SecretInput.MASK.length()); add(new Label("note", note).setEscapeModelStrings(false)); diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java index a13a04dc5a..d737ac5210 100644 --- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java +++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java @@ -26,11 +26,11 @@ import io.onedev.commons.utils.LockUtils; import io.onedev.commons.utils.match.PatternApplied; import io.onedev.commons.utils.match.WildcardUtils; import io.onedev.server.OneDev; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobVariable; +import io.onedev.server.buildspec.job.VariableInterpolator; +import io.onedev.server.buildspec.job.paramspec.ParamSpec; import io.onedev.server.cache.CommitInfoManager; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobVariable; -import io.onedev.server.ci.job.VariableInterpolator; -import io.onedev.server.ci.job.paramspec.ParamSpec; import io.onedev.server.entitymanager.BuildManager; import io.onedev.server.entitymanager.GroupManager; import io.onedev.server.entitymanager.IssueManager; diff --git a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java index 8f6f254832..0c6f7cda06 100644 --- a/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java +++ b/server-core/src/main/java/org/apache/wicket/application/AbstractClassResolver.java @@ -29,7 +29,7 @@ import org.apache.wicket.Application; import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.util.collections.UrlExternalFormComparator; -import io.onedev.server.ci.job.paramsupply.ParamSupply; +import io.onedev.server.buildspec.job.paramsupply.ParamSupply; import io.onedev.server.util.IssueUtils; /** diff --git a/server-plugin/pom.xml b/server-plugin/pom.xml index 998f63d4b0..60c2fee48e 100644 --- a/server-plugin/pom.xml +++ b/server-plugin/pom.xml @@ -20,8 +20,8 @@ server-plugin-report-html server-plugin-executor-kubernetes server-plugin-executor-docker - server-plugin-cispec-maven - server-plugin-cispec-gradle - server-plugin-cispec-node + server-plugin-buildspec-maven + server-plugin-buildspec-gradle + server-plugin-buildspec-node diff --git a/server-plugin/server-plugin-cispec-gradle/pom.xml b/server-plugin/server-plugin-buildspec-gradle/pom.xml similarity index 79% rename from server-plugin/server-plugin-cispec-gradle/pom.xml rename to server-plugin/server-plugin-buildspec-gradle/pom.xml index 1e85f8dd5d..315340c3d7 100644 --- a/server-plugin/server-plugin-cispec-gradle/pom.xml +++ b/server-plugin/server-plugin-buildspec-gradle/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - server-plugin-cispec-gradle + server-plugin-buildspec-gradle io.onedev server-plugin @@ -15,6 +15,6 @@ - org.server.plugin.cispec.gradle.GradleModule + org.server.plugin.buildspec.gradle.GradleModule diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec/gradle/GradleJobSuggestion.java similarity index 89% rename from server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java rename to server-plugin/server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec/gradle/GradleJobSuggestion.java index 190f4b8fe8..463b72cc34 100644 --- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleJobSuggestion.java +++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec/gradle/GradleJobSuggestion.java @@ -1,4 +1,4 @@ -package org.server.plugin.cispec.gradle; +package org.server.plugin.buildspec.gradle; import java.util.ArrayList; import java.util.Collection; @@ -11,12 +11,12 @@ import org.eclipse.jgit.lib.ObjectId; import com.google.common.collect.Lists; -import io.onedev.server.ci.job.CacheSpec; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobSuggestion; -import io.onedev.server.ci.job.VariableInterpolator; -import io.onedev.server.ci.job.trigger.BranchUpdateTrigger; -import io.onedev.server.ci.job.trigger.PullRequestTrigger; +import io.onedev.server.buildspec.job.CacheSpec; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobSuggestion; +import io.onedev.server.buildspec.job.VariableInterpolator; +import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger; +import io.onedev.server.buildspec.job.trigger.PullRequestTrigger; import io.onedev.server.git.Blob; import io.onedev.server.git.BlobIdent; import io.onedev.server.model.Build; diff --git a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java b/server-plugin/server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec/gradle/GradleModule.java similarity index 76% rename from server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java rename to server-plugin/server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec/gradle/GradleModule.java index af41418878..a03aee8c80 100644 --- a/server-plugin/server-plugin-cispec-gradle/src/main/java/org/server/plugin/cispec/gradle/GradleModule.java +++ b/server-plugin/server-plugin-buildspec-gradle/src/main/java/org/server/plugin/buildspec/gradle/GradleModule.java @@ -1,9 +1,9 @@ -package org.server.plugin.cispec.gradle; +package org.server.plugin.buildspec.gradle; import com.google.common.collect.Lists; import io.onedev.commons.launcher.loader.AbstractPluginModule; -import io.onedev.server.ci.job.JobSuggestion; +import io.onedev.server.buildspec.job.JobSuggestion; import io.onedev.server.model.support.administration.GroovyScript; import io.onedev.server.util.script.ScriptContribution; @@ -26,7 +26,7 @@ public class GradleModule extends AbstractPluginModule { public GroovyScript getScript() { GroovyScript script = new GroovyScript(); script.setName(GradleJobSuggestion.DETERMINE_DOCKER_IMAGE); - script.setContent(Lists.newArrayList("org.server.plugin.cispec.gradle.GradleJobSuggestion.determineDockerImage()")); + script.setContent(Lists.newArrayList("org.server.plugin.buildspec.gradle.GradleJobSuggestion.determineDockerImage()")); return script; } diff --git a/server-plugin/server-plugin-cispec-maven/pom.xml b/server-plugin/server-plugin-buildspec-maven/pom.xml similarity index 74% rename from server-plugin/server-plugin-cispec-maven/pom.xml rename to server-plugin/server-plugin-buildspec-maven/pom.xml index 0642ac1c09..b4bbc3d116 100644 --- a/server-plugin/server-plugin-cispec-maven/pom.xml +++ b/server-plugin/server-plugin-buildspec-maven/pom.xml @@ -1,13 +1,13 @@ 4.0.0 - server-plugin-cispec-maven + server-plugin-buildspec-maven io.onedev server-plugin 3.0.4 - io.onedev.server.plugin.cispec.maven.MavenModule + io.onedev.server.plugin.buildspec.maven.MavenModule diff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java similarity index 92% rename from server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java rename to server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java index 5bd6497f08..5f120cd778 100644 --- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenJobSuggestion.java +++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenJobSuggestion.java @@ -1,4 +1,4 @@ -package io.onedev.server.plugin.cispec.maven; +package io.onedev.server.plugin.buildspec.maven; import java.io.StringReader; import java.util.ArrayList; @@ -17,11 +17,11 @@ import org.slf4j.LoggerFactory; import com.google.common.collect.Lists; -import io.onedev.server.ci.job.CacheSpec; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobSuggestion; -import io.onedev.server.ci.job.VariableInterpolator; -import io.onedev.server.ci.job.trigger.BranchUpdateTrigger; +import io.onedev.server.buildspec.job.CacheSpec; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobSuggestion; +import io.onedev.server.buildspec.job.VariableInterpolator; +import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger; import io.onedev.server.git.Blob; import io.onedev.server.git.BlobIdent; import io.onedev.server.model.Build; diff --git a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java similarity index 84% rename from server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java rename to server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java index 4ce729d0a1..58e77d4068 100644 --- a/server-plugin/server-plugin-cispec-maven/src/main/java/io/onedev/server/plugin/cispec/maven/MavenModule.java +++ b/server-plugin/server-plugin-buildspec-maven/src/main/java/io/onedev/server/plugin/buildspec/maven/MavenModule.java @@ -1,9 +1,9 @@ -package io.onedev.server.plugin.cispec.maven; +package io.onedev.server.plugin.buildspec.maven; import com.google.common.collect.Lists; import io.onedev.commons.launcher.loader.AbstractPluginModule; -import io.onedev.server.ci.job.JobSuggestion; +import io.onedev.server.buildspec.job.JobSuggestion; import io.onedev.server.model.support.administration.GroovyScript; import io.onedev.server.util.script.ScriptContribution; @@ -26,7 +26,7 @@ public class MavenModule extends AbstractPluginModule { public GroovyScript getScript() { GroovyScript script = new GroovyScript(); script.setName(MavenJobSuggestion.DETERMINE_DOCKER_IMAGE); - script.setContent(Lists.newArrayList("io.onedev.server.plugin.cispec.maven.MavenJobSuggestion.determineDockerImage()")); + script.setContent(Lists.newArrayList("io.onedev.server.plugin.buildspec.maven.MavenJobSuggestion.determineDockerImage()")); return script; } diff --git a/server-plugin/server-plugin-cispec-node/Dockerfile b/server-plugin/server-plugin-buildspec-node/Dockerfile similarity index 100% rename from server-plugin/server-plugin-cispec-node/Dockerfile rename to server-plugin/server-plugin-buildspec-node/Dockerfile diff --git a/server-plugin/server-plugin-cispec-node/pom.xml b/server-plugin/server-plugin-buildspec-node/pom.xml similarity index 74% rename from server-plugin/server-plugin-cispec-node/pom.xml rename to server-plugin/server-plugin-buildspec-node/pom.xml index 5ffe333e9e..c6c3eb5c9d 100644 --- a/server-plugin/server-plugin-cispec-node/pom.xml +++ b/server-plugin/server-plugin-buildspec-node/pom.xml @@ -1,14 +1,14 @@ 4.0.0 - server-plugin-cispec-node + server-plugin-buildspec-node io.onedev server-plugin 3.0.4 - io.onedev.server.plugin.cispec.node.NodePluginModule + io.onedev.server.plugin.buildspec.node.NodePluginModule diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java similarity index 96% rename from server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java rename to server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java index 78d2ca659d..d9b7cfed30 100644 --- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodeJobSuggestion.java +++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodeJobSuggestion.java @@ -1,4 +1,4 @@ -package io.onedev.server.plugin.cispec.node; +package io.onedev.server.plugin.buildspec.node; import java.io.IOException; import java.util.ArrayList; @@ -18,10 +18,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import io.onedev.server.OneDev; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobSuggestion; -import io.onedev.server.ci.job.VariableInterpolator; -import io.onedev.server.ci.job.trigger.BranchUpdateTrigger; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobSuggestion; +import io.onedev.server.buildspec.job.VariableInterpolator; +import io.onedev.server.buildspec.job.trigger.BranchUpdateTrigger; import io.onedev.server.git.Blob; import io.onedev.server.git.BlobIdent; import io.onedev.server.model.Build; @@ -55,7 +55,7 @@ public class NodeJobSuggestion implements JobSuggestion { if (content.indexOf("angular/core") != -1) { // Recognize angular projects Job job = new Job(); job.setName("angular ci"); - job.setImage("1dev/cispec-node:10.16-alpine-chrome"); + job.setImage("1dev/buildspec-node:10.16-alpine-chrome"); List commands = Lists.newArrayList( "echo \"##onedev[SetBuildVersion '@" + VariableInterpolator.SCRIPTS_PREFIX + GroovyScript.BUILTIN_PREFIX + DETERMINE_PROJECT_VERSION + "@']\"", "echo", diff --git a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java similarity index 84% rename from server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java rename to server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java index 2fc1aff0e2..9cd8fd52ab 100644 --- a/server-plugin/server-plugin-cispec-node/src/main/java/io/onedev/server/plugin/cispec/node/NodePluginModule.java +++ b/server-plugin/server-plugin-buildspec-node/src/main/java/io/onedev/server/plugin/buildspec/node/NodePluginModule.java @@ -1,9 +1,9 @@ -package io.onedev.server.plugin.cispec.node; +package io.onedev.server.plugin.buildspec.node; import com.google.common.collect.Lists; import io.onedev.commons.launcher.loader.AbstractPluginModule; -import io.onedev.server.ci.job.JobSuggestion; +import io.onedev.server.buildspec.job.JobSuggestion; import io.onedev.server.model.support.administration.GroovyScript; import io.onedev.server.util.script.ScriptContribution; @@ -26,7 +26,7 @@ public class NodePluginModule extends AbstractPluginModule { public GroovyScript getScript() { GroovyScript script = new GroovyScript(); script.setName(NodeJobSuggestion.DETERMINE_PROJECT_VERSION); - script.setContent(Lists.newArrayList("io.onedev.server.plugin.cispec.node.NodeJobSuggestion.determineProjectVersion()")); + script.setContent(Lists.newArrayList("io.onedev.server.plugin.buildspec.node.NodeJobSuggestion.determineProjectVersion()")); return script; } diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java index 7b69c10dc3..89c657aa69 100644 --- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java +++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerExecutor.java @@ -47,11 +47,11 @@ import io.onedev.k8shelper.CacheInstance; import io.onedev.k8shelper.KubernetesHelper; import io.onedev.server.OneDev; import io.onedev.server.OneException; -import io.onedev.server.ci.job.JobContext; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.JobService; -import io.onedev.server.ci.job.SubmoduleCredential; -import io.onedev.server.ci.job.EnvVar; +import io.onedev.server.buildspec.job.EnvVar; +import io.onedev.server.buildspec.job.JobContext; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.JobService; +import io.onedev.server.buildspec.job.SubmoduleCredential; import io.onedev.server.git.config.GitConfig; import io.onedev.server.model.support.RegistryLogin; import io.onedev.server.model.support.administration.jobexecutor.JobExecutor; @@ -68,7 +68,7 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue; import io.onedev.server.web.editable.annotation.OmitName; import io.onedev.server.web.util.Testable; -@Editable(order=200, description="This executor runs CI jobs as docker containers on OneDev server") +@Editable(order=200, description="This executor runs build jobs as docker containers on OneDev server") @ClassValidating @Horizontal public class DockerExecutor extends JobExecutor implements Testable, Validatable { diff --git a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java index be0395d19f..76aee8ea75 100644 --- a/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java +++ b/server-plugin/server-plugin-executor-docker/src/main/java/io/onedev/server/plugin/docker/DockerModule.java @@ -8,7 +8,7 @@ import io.onedev.commons.launcher.loader.AbstractPluginModule; import io.onedev.commons.launcher.loader.ImplementationProvider; import io.onedev.commons.utils.command.Commandline; import io.onedev.commons.utils.command.LineConsumer; -import io.onedev.server.ci.job.JobExecutorDiscoverer; +import io.onedev.server.buildspec.job.JobExecutorDiscoverer; import io.onedev.server.model.support.administration.jobexecutor.JobExecutor; /** diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java index 889d019a55..7abcdddda8 100644 --- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java +++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesExecutor.java @@ -46,10 +46,10 @@ import io.onedev.commons.utils.command.LineConsumer; import io.onedev.k8shelper.KubernetesHelper; import io.onedev.server.OneDev; import io.onedev.server.OneException; -import io.onedev.server.ci.job.CacheSpec; -import io.onedev.server.ci.job.EnvVar; -import io.onedev.server.ci.job.JobContext; -import io.onedev.server.ci.job.JobService; +import io.onedev.server.buildspec.job.CacheSpec; +import io.onedev.server.buildspec.job.EnvVar; +import io.onedev.server.buildspec.job.JobContext; +import io.onedev.server.buildspec.job.JobService; import io.onedev.server.entitymanager.SettingManager; import io.onedev.server.model.support.RegistryLogin; import io.onedev.server.model.support.administration.jobexecutor.JobExecutor; @@ -67,7 +67,7 @@ import io.onedev.server.web.editable.annotation.NameOfEmptyValue; import io.onedev.server.web.editable.annotation.OmitName; import io.onedev.server.web.util.Testable; -@Editable(order=100, description="This executor runs CI jobs as pods in a kubernetes cluster") +@Editable(order=100, description="This executor runs build jobs as pods in a kubernetes cluster") @Horizontal public class KubernetesExecutor extends JobExecutor implements Testable { diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java index 45969ae6db..fba59ec478 100644 --- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java +++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesModule.java @@ -10,7 +10,7 @@ import io.onedev.commons.launcher.loader.AbstractPluginModule; import io.onedev.commons.launcher.loader.ImplementationProvider; import io.onedev.commons.utils.command.Commandline; import io.onedev.commons.utils.command.LineConsumer; -import io.onedev.server.ci.job.JobExecutorDiscoverer; +import io.onedev.server.buildspec.job.JobExecutorDiscoverer; import io.onedev.server.model.support.administration.jobexecutor.JobExecutor; import io.onedev.server.rest.jersey.JerseyConfigurator; diff --git a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java index 6e092a8958..1b38b5dcf4 100644 --- a/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java +++ b/server-plugin/server-plugin-executor-kubernetes/src/main/java/io/onedev/server/plugin/executor/kubernetes/KubernetesResource.java @@ -32,9 +32,9 @@ import io.onedev.commons.utils.TarUtils; import io.onedev.k8shelper.CacheAllocationRequest; import io.onedev.k8shelper.CacheInstance; import io.onedev.server.OneException; -import io.onedev.server.ci.job.JobContext; -import io.onedev.server.ci.job.JobManager; -import io.onedev.server.ci.job.SubmoduleCredential; +import io.onedev.server.buildspec.job.JobContext; +import io.onedev.server.buildspec.job.JobManager; +import io.onedev.server.buildspec.job.SubmoduleCredential; @Path("/k8s") @Consumes(MediaType.WILDCARD) diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java index 2bc01cc745..d2db292f48 100644 --- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java +++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/HtmlReportModule.java @@ -13,7 +13,7 @@ import com.google.common.collect.Sets; import io.onedev.commons.launcher.loader.AbstractPluginModule; import io.onedev.commons.launcher.loader.ImplementationProvider; import io.onedev.commons.utils.LockUtils; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.model.Build; import io.onedev.server.util.SecurityUtils; import io.onedev.server.web.WebApplicationConfigurator; diff --git a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java index 4a1b7533c6..dd2bf2a96b 100644 --- a/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java +++ b/server-plugin/server-plugin-report-html/src/main/java/io/onedev/server/plugin/report/html/JobHtmlReport.java @@ -10,8 +10,8 @@ import org.hibernate.validator.constraints.NotEmpty; import io.onedev.commons.codeassist.InputSuggestion; import io.onedev.commons.utils.FileUtils; import io.onedev.commons.utils.LockUtils; -import io.onedev.server.ci.job.Job; -import io.onedev.server.ci.job.JobReport; +import io.onedev.server.buildspec.job.Job; +import io.onedev.server.buildspec.job.JobReport; import io.onedev.server.model.Build; import io.onedev.server.util.JobLogger; import io.onedev.server.util.validation.annotation.PathSegment; diff --git a/server-product/pom.xml b/server-product/pom.xml index 508ac305a3..c519dc01b5 100644 --- a/server-product/pom.xml +++ b/server-product/pom.xml @@ -22,17 +22,17 @@ io.onedev - server-plugin-cispec-maven + server-plugin-buildspec-maven ${project.version} io.onedev - server-plugin-cispec-node + server-plugin-buildspec-node ${project.version} io.onedev - server-plugin-cispec-gradle + server-plugin-buildspec-gradle ${project.version}