Skip to content
This repository has been archived by the owner on Dec 15, 2021. It is now read-only.

Commit

Permalink
[JENKINS-31153] Rename Workflow to Pipeline. All the display names in…
Browse files Browse the repository at this point in the history 
… the user interface
  • Loading branch information
Manuel Recena committed Jan 11, 2016
1 parent 92fe988 commit b91ba5c
Show file tree
Hide file tree
Showing 27 changed files with 37 additions and 37 deletions.
16 changes: 8 additions & 8 deletions aggregator/src/test/java/org/jenkinsci/plugins/workflow/WorkflowJobNonRestartingTest.java
View file
Expand Up @@ -148,14 +148,14 @@ public void testRetry() throws Exception {

idx = 0;
for (String msg : new String[] {
"[Workflow] Retry the body up to N times : Start",
"[Workflow] retry {",
"[Workflow] } //retry",
"[Workflow] retry {",
"[Workflow] } //retry",
"[Workflow] retry {",
"[Workflow] } //retry",
"[Workflow] Retry the body up to N times : End",
"[Pipeline] Retry the body up to N times : Start",
"[Pipeline] retry {",
"[Pipeline] } //retry",
"[Pipeline] retry {",
"[Pipeline] } //retry",
"[Pipeline] retry {",
"[Pipeline] } //retry",
"[Pipeline] Retry the body up to N times : End",
}) {
idx = log.indexOf(msg, idx + 1);
assertTrue(msg + " not found", idx != -1);
Expand Down
4 changes: 2 additions & 2 deletions ...or/src/test/java/org/jenkinsci/plugins/workflow/cps/global/WorkflowLibRepositoryTest.java
View file
Expand Up @@ -127,7 +127,7 @@ public void userDefinedGlobalVariable() throws Exception {
WorkflowJob p = jenkins.createProject(WorkflowJob.class, "p");

p.setDefinition(new CpsFlowDefinition(
"acmeVar.hello('Workflow');" +
"acmeVar.hello('Pipeline');" +
"acmeVar.foo('seed');" +
"echo '['+acmeVar.bar()+']';"+
"acmeFunc(1,2);"+
Expand All @@ -137,7 +137,7 @@ public void userDefinedGlobalVariable() throws Exception {
// build this workflow
WorkflowRun b = story.j.assertBuildStatusSuccess(p.scheduleBuild2(0));

story.j.assertLogContains("Hello Workflow", b);
story.j.assertLogContains("Hello Pipeline", b);
story.j.assertLogContains("[seed-set-get]", b);
story.j.assertLogContains("call(1,2)", b);
story.j.assertLogContains("title was yolo", b);
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/org/jenkinsci/plugins/workflow/graph/FlowEndNode.java
View file
Expand Up @@ -47,6 +47,6 @@ public Result getResult() {

@Override
protected String getTypeDisplayName() {
return "End of Workflow";
return "End of Pipeline";
}
}
2 changes: 1 addition & 1 deletion api/src/main/java/org/jenkinsci/plugins/workflow/graph/FlowStartNode.java
View file
Expand Up @@ -51,6 +51,6 @@ public List<FlowNode> getParents() {

@Override
protected String getTypeDisplayName() {
return "Start of Workflow";
return "Start of Pipeline";
}
}
2 changes: 1 addition & 1 deletion cps/package.json
View file
@@ -1,7 +1,7 @@
{
"name": "workflow-ui",
"version": "1.0.0",
"description": "Jenkins Workflow UI",
"description": "Jenkins Pipeline UI",
"author": "Tom Fennelly <tom.fennelly@gmail.com> (https://github.com/tfennelly)",
"license": "MIT",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowDefinition.java
View file
Expand Up @@ -111,7 +111,7 @@ public static class DescriptorImpl extends FlowDefinitionDescriptor {

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

public FormValidation doCheckScript(@QueryParameter String value, @QueryParameter boolean sandbox) {
Expand Down
2 changes: 1 addition & 1 deletion cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsFlowExecution.java
View file
Expand Up @@ -359,7 +359,7 @@ private Env createInitialEnv() {

private CpsScript parseScript() throws IOException {
shell = new CpsGroovyShell(this);
CpsScript s = (CpsScript) shell.reparse("WorkflowScript",script);
CpsScript s = (CpsScript) shell.reparse("WorkflowScript", script);

for (Entry<String, String> e : loadedScripts.entrySet()) {
shell.reparse(e.getKey(), e.getValue());
Expand Down
2 changes: 1 addition & 1 deletion cps/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition.java
View file
Expand Up @@ -136,7 +136,7 @@ private String getFilePathSuffix() {
@Inject public Snippetizer snippetizer;

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

public Collection<? extends SCMDescriptor<?>> getApplicableDescriptors() {
Expand Down
2 changes: 1 addition & 1 deletion cps/src/main/java/org/jenkinsci/plugins/workflow/cps/Snippetizer.java
View file
Expand Up @@ -237,7 +237,7 @@ public HttpResponse doGenerateSnippet(StaplerRequest req, @QueryParameter String
public void doStatic(StaplerRequest req, StaplerResponse rsp) throws Exception {
rsp.setContentType("text/html;charset=UTF-8");
PrintWriter pw = rsp.getWriter();
pw.println("<html><head><title>Jenkins Workflow Reference</title></head><body>");
pw.println("<html><head><title>Jenkins Pipeline Reference</title></head><body>");
pw.println("<h1>Steps</h1>");
for (StepDescriptor d : getStepDescriptors(false)) {
generateStepHelp(d, pw);
Expand Down
2 changes: 1 addition & 1 deletion cps/src/main/resources/index.jelly
View file
Expand Up @@ -25,5 +25,5 @@ THE SOFTWARE.

<?jelly escape-by-default='true'?>
<div>
Workflow execution engine based on continuation passing style transformation of Groovy scripts.
Pipeline execution engine based on continuation passing style transformation of Groovy scripts.
</div>
2 changes: 1 addition & 1 deletion ...in/resources/org/jenkinsci/plugins/workflow/cps/CpsScmFlowDefinition/help-scriptPath.html
View file
@@ -1,5 +1,5 @@
<div>
Relative location within the checkout of your Workflow script.
Relative location within the checkout of your Pipeline script.
Note that it will always be run inside a Groovy sandbox.
<code>Jenkinsfile</code> is conventional and allows you to switch easily to a multibranch project
(just use <code>checkout scm</code> to retrieve sources from the same location as is configured here).
Expand Down
4 changes: 2 additions & 2 deletions cps/src/main/resources/org/jenkinsci/plugins/workflow/cps/EnvActionImpl/Binder/help.jelly
View file
Expand Up @@ -13,7 +13,7 @@ node {
</p>
<p>
These definitions will also be available via the REST API during the build or after its completion,
and from upstream Workflow builds using the <code>build</code> step.
and from upstream Pipeline builds using the <code>build</code> step.
</p>
<p>
However any variables set this way are global to the workflow build.
Expand All @@ -24,7 +24,7 @@ node {
<p>
A set of environment variables are made available to all Jenkins projects, including workflows.
The following is a general list of variables (by name) that are available;
see the notes below the list for Workflow-specific details.
see the notes below the list for Pipeline-specific details.
</p>
<!-- Cf. EnvironmentContributor/EnvVarsHtml/index.groovy -->
<j:forEach var="ec" items="${it.environmentContributors}">
Expand Down
4 changes: 2 additions & 2 deletions job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowJob.java
View file
Expand Up @@ -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() {
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion job/src/main/java/org/jenkinsci/plugins/workflow/job/console/WorkflowRunConsoleNote.java
View file
Expand Up @@ -40,7 +40,7 @@ public class WorkflowRunConsoleNote extends ConsoleNote<Run<?, ?>> {
/**
* Prefix used in metadata lines.
*/
public static final String CONSOLE_NOTE_PREFIX = "[Workflow] ";
public static final String CONSOLE_NOTE_PREFIX = "[Pipeline] ";

/**
* CSS color selector.
Expand Down
2 changes: 1 addition & 1 deletion job/src/main/java/org/jenkinsci/plugins/workflow/job/views/FlowGraphTableAction.java
View file
Expand Up @@ -45,7 +45,7 @@ private FlowGraphTableAction(WorkflowRun run) {
}

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

@Override public String getUrlName() {
Expand Down
2 changes: 1 addition & 1 deletion job/src/main/resources/index.jelly
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion ...src/main/resources/org/jenkinsci/plugins/workflow/job/WorkflowJob/configure-entries.jelly
View file
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion multibranch/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMBinder.java
View file
Expand Up @@ -92,7 +92,7 @@ class SCMBinder extends FlowDefinition {
@Inject public Snippetizer snippetizer;

@Override public String getDisplayName() {
return "Workflow script from " + WorkflowMultiBranchProject.SCRIPT;
return "Pipeline script from " + WorkflowMultiBranchProject.SCRIPT;
}

}
Expand Down
2 changes: 1 addition & 1 deletion multibranch/src/main/java/org/jenkinsci/plugins/workflow/multibranch/SCMVar.java
View file
Expand Up @@ -60,7 +60,7 @@
Run<?,?> build = script.$build();
// TODO some code overlap with SCMBinder.create, but not obvious how to factor out common parts
if (!(build instanceof WorkflowRun)) {
throw new AbortException("not available outside a workflow build");
throw new AbortException("not available outside a Pipeline build");
}
Job<?,?> job = build.getParent();
BranchJobProperty property = job.getProperty(BranchJobProperty.class);
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProject.java
View file
Expand Up @@ -68,7 +68,7 @@ public WorkflowMultiBranchProject(ItemGroup parent, String name) {
@Extension public static class DescriptorImpl extends MultiBranchProjectDescriptor {

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

@Override public TopLevelItem newInstance(ItemGroup parent, String name) {
Expand Down
2 changes: 1 addition & 1 deletion ...in/java/org/jenkinsci/plugins/workflow/multibranch/WorkflowMultiBranchProjectFactory.java
View file
Expand Up @@ -54,7 +54,7 @@ public class WorkflowMultiBranchProjectFactory extends MultiBranchProjectFactory
}

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

}
Expand Down
2 changes: 1 addition & 1 deletion ...nsci/plugins/workflow/multibranch/WorkflowMultiBranchProject/newInstanceDetail.properties
View file
Expand Up @@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

body=Creates a set of Workflow projects according to detected branches in one SCM repository.
body=Creates a set of Pipeline projects according to detected branches in one SCM repository.
2 changes: 1 addition & 1 deletion stm/src/main/java/org/jenkinsci/plugins/workflow/stm/STMFlowDefinition.java
View file
Expand Up @@ -69,7 +69,7 @@ public List<State> getStates() {
@Extension public static final class DescriptorImpl extends FlowDefinitionDescriptor {

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

}
Expand Down
2 changes: 1 addition & 1 deletion ...ort/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java
View file
Expand Up @@ -305,7 +305,7 @@ private Object readResolve() {
@Override public String getDisplayName() {
// TODO more generic to check whether FlowExecution.owner.executable is a ModelObject
Run<?,?> r = run();
return r != null ? "part of " + r.getFullDisplayName() : "Unknown workflow node step";
return r != null ? "part of " + r.getFullDisplayName() : "Unknown Pipeline node step";
}

@Override public String getName() {
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/org/jenkinsci/plugins/workflow/support/steps/build/BuildTriggerCancelledCause.java
View file
Expand Up @@ -22,6 +22,6 @@ public BuildTriggerCancelledCause(Throwable cause) {

@Override
public String getShortDescription() {
return "Calling workflow was cancelled";
return "Calling Pipeline was cancelled";
}
}
2 changes: 1 addition & 1 deletion support/src/main/java/org/jenkinsci/plugins/workflow/support/steps/input/InputStep.java
View file
Expand Up @@ -47,7 +47,7 @@ public class InputStep extends AbstractStepImpl implements Serializable {
@DataBoundConstructor
public InputStep(String message) {
if (message==null)
message = "Workflow has paused and needs your input before proceeding";
message = "Pipeline has paused and needs your input before proceeding";
this.message = message;
}

Expand Down
2 changes: 1 addition & 1 deletion support/src/main/resources/index.jelly
View file
Expand Up @@ -24,5 +24,5 @@

<?jelly escape-by-default='true'?>
<div>
Common utility implementations to build workflow plugin
Common utility implementations to build Pipeline Plugin
</div>

0 comments on commit b91ba5c

Please sign in to comment.