Skip to content
Permalink
Browse files

Merge pull request #296 from recena/JENKINS-31153

[JENKINS-31153] Rename Workflow to Pipeline
Originally-Committed-As: 118b89e1b1828a39f50fb955942ffcbbe69e653e
  • Loading branch information...
jglick committed Jan 15, 2016
2 parents 4129e02 + a71b83a commit 07e8dd5279cb5d613d530343818fb00d7af8d0de
@@ -51,6 +51,6 @@ public FlowStartNode(FlowExecution exec, String id) {

@Override
protected String getTypeDisplayName() {
return "Start of Workflow";
return "Start of Pipeline";
}
}
@@ -32,7 +32,7 @@
</parent>
<artifactId>workflow-job</artifactId>
<packaging>hpi</packaging>
<name>Workflow: Job</name>
<name>Pipeline: Job</name>
<url>https://wiki.jenkins-ci.org/display/JENKINS/Workflow+Plugin</url>
<dependencies>
<dependency>
@@ -402,7 +402,7 @@ public void setConcurrentBuild(boolean b) throws IOException {
}

@Override public String getPronoun() {
return AlternativeUiTextProvider.get(PRONOUN, this, "Workflow");
return AlternativeUiTextProvider.get(PRONOUN, this, "Pipeline");
}

@Override public TopLevelItemDescriptor getDescriptor() {
@@ -560,7 +560,7 @@ public static void alias() {
@Extension(ordinal=1) public static final class DescriptorImpl extends TopLevelItemDescriptor {

@Override public String getDisplayName() {
return "Workflow";
return "Pipeline";
}

@Override public TopLevelItem newInstance(ItemGroup parent, String name) {
@@ -40,7 +40,7 @@
/**
* Prefix used in metadata lines.
*/
public static final String CONSOLE_NOTE_PREFIX = "[Workflow] ";
public static final String CONSOLE_NOTE_PREFIX = "[Pipeline] ";

/**
* CSS color selector.
@@ -45,7 +45,7 @@ private FlowGraphTableAction(WorkflowRun run) {
}

@Override public String getDisplayName() {
return "Workflow Steps";
return "Pipeline Steps";
}

@Override public String getUrlName() {
@@ -25,5 +25,5 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<div>
Defines a new job type for workflows and provides their generic user interface.
Defines a new job type for pipelines and provides their generic user interface.
</div>
@@ -37,7 +37,7 @@
</f:advanced>
</f:section>

<f:section title="Workflow">
<f:section title="Pipeline">
<f:dropdownDescriptorSelector title="Definition" field="definition" descriptors="${descriptor.getDefinitionDescriptors(it)}"/>
</f:section>
</j:jelly>
@@ -26,6 +26,6 @@

<j:jelly xmlns:j="jelly:core">
Orchestrates long-running activities that can span multiple build slaves. Suitable for
building pipelines and/or organizing complex activities that do not easily fit
building pipelines (formerly known as workflows) and/or organizing complex activities that do not easily fit
in free-style job type.
</j:jelly>
@@ -25,7 +25,7 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:l="/lib/layout">
<l:layout title="${it.run.fullDisplayName} Workflow Steps">
<l:layout title="${it.run.fullDisplayName} Pipeline steps">
<st:include page="sidepanel.jelly" it="${it.run}"/>
<l:main-panel>
<st:include it="${it.flowGraph}" page="ajax"/>

0 comments on commit 07e8dd5

Please sign in to comment.
You can’t perform that action at this time.