Renamed runner package to runner

pvdissel · pvdissel · commit aa2cd690997a · 2013-09-21T18:31:25.000+02:00
diff --git a/subprojects/runner/runner.gradle b/subprojects/runner/runner.gradle
@@ -4,7 +4,7 @@ apply from: script('cucumber')
 
 applicationName = 'pipe-runner'
 description = 'pipe-runner --the pipeline runner, executes the project pipeline from the project.pipe configuration'
-mainClassName = 'org.pipelinelabs.pipeline.pipe.cli.Pipeline'
+mainClassName = 'org.pipelinelabs.pipeline.runner.cli.Pipeline'
 
 dependencies {
     compile libraries.groovy
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/api/Task.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/api/Task.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/api/task/ShellCommand.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/api/task/ShellCommand.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/cli/Pipeline.groovy b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/cli/Pipeline.groovy
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/TaskDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/TaskDsl.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/DslExporter.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/DslExporter.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/InternalPipelineDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/InternalPipelineDsl.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/InternalStageDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/InternalStageDsl.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/InternalTaskDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/dsl/internal/InternalTaskDsl.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/runner/DefaultStage.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/pipe/runner/DefaultStage.java
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/Pipeline.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/Pipeline.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.api;
+package org.pipelinelabs.pipeline.runner.api;
 
 import java.util.Set;
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/Stage.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/Stage.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.api;
+package org.pipelinelabs.pipeline.runner.api;
 
 public interface Stage {
     void add(Task task);
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/Task.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/Task.java
@@ -0,0 +1,4 @@
+package org.pipelinelabs.pipeline.runner.api;
+
+public interface Task {
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/task/ShellCommand.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/api/task/ShellCommand.java
@@ -0,0 +1,6 @@
+package org.pipelinelabs.pipeline.runner.api.task;
+
+import org.pipelinelabs.pipeline.runner.api.Task;
+
+public interface ShellCommand extends Task {
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/Main.groovy b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/Main.groovy
@@ -1,9 +1,9 @@
-package org.pipelinelabs.pipeline.pipe.cli
+package org.pipelinelabs.pipeline.runner.cli
 
 import com.beust.jcommander.JCommander
 import com.beust.jcommander.ParameterException
-import org.pipelinelabs.pipeline.pipe.cli.command.*
-import org.pipelinelabs.pipeline.pipe.internal.ServiceRegistry
+import org.pipelinelabs.pipeline.runner.cli.command.*
+import org.pipelinelabs.pipeline.runner.internal.ServiceRegistry
 
 class Main {
     static final int EXIT_FAILURE = 1
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/Pipeline.groovy b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/Pipeline.groovy
@@ -0,0 +1,5 @@
+package org.pipelinelabs.pipeline.runner.cli
+
+def main = new Main()
+final exitStatus = main.run('pipe-runner', args)
+System.exit(exitStatus)
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/ServiceLocator.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/ServiceLocator.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli;
+package org.pipelinelabs.pipeline.runner.cli;
 
 import java.util.HashSet;
 import java.util.Iterator;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/ServiceLookupException.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/ServiceLookupException.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli;
+package org.pipelinelabs.pipeline.runner.cli;
 
 public class ServiceLookupException extends RuntimeException {
 }
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/Command.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/Command.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli.command;
+package org.pipelinelabs.pipeline.runner.cli.command;
 
 public interface Command {
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/FeedbackCommand.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/FeedbackCommand.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli.command;
+package org.pipelinelabs.pipeline.runner.cli.command;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/HelpCommand.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/HelpCommand.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli.command;
+package org.pipelinelabs.pipeline.runner.cli.command;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameters;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/MainCommand.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/MainCommand.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli.command;
+package org.pipelinelabs.pipeline.runner.cli.command;
 
 import com.beust.jcommander.Parameter;
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/RunCommand.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/command/RunCommand.java
@@ -1,10 +1,10 @@
-package org.pipelinelabs.pipeline.pipe.cli.command;
+package org.pipelinelabs.pipeline.runner.cli.command;
 
 import com.beust.jcommander.Parameter;
 import com.beust.jcommander.Parameters;
 import com.beust.jcommander.converters.FileConverter;
-import org.pipelinelabs.pipeline.pipe.cli.dsl.PipelineScriptRunner;
-import org.pipelinelabs.pipeline.pipe.internal.ServiceRegistry;
+import org.pipelinelabs.pipeline.runner.cli.dsl.PipelineScriptRunner;
+import org.pipelinelabs.pipeline.runner.internal.ServiceRegistry;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/dsl/PipelineScriptRunner.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/dsl/PipelineScriptRunner.java
@@ -1,10 +1,10 @@
-package org.pipelinelabs.pipeline.pipe.cli.dsl;
+package org.pipelinelabs.pipeline.runner.cli.dsl;
 
 import groovy.lang.GroovyShell;
 import org.codehaus.groovy.control.CompilerConfiguration;
-import org.pipelinelabs.pipeline.pipe.cli.dsl.script.PipelineScript;
-import org.pipelinelabs.pipeline.pipe.dsl.PipelineDsl;
-import org.pipelinelabs.pipeline.pipe.internal.ServiceRegistry;
+import org.pipelinelabs.pipeline.runner.cli.dsl.script.PipelineScript;
+import org.pipelinelabs.pipeline.runner.dsl.PipelineDsl;
+import org.pipelinelabs.pipeline.runner.internal.ServiceRegistry;
 
 import java.io.PrintStream;
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/dsl/script/PipelineScript.groovy b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/cli/dsl/script/PipelineScript.groovy
@@ -1,6 +1,6 @@
-package org.pipelinelabs.pipeline.pipe.cli.dsl.script
+package org.pipelinelabs.pipeline.runner.cli.dsl.script
 
-import org.pipelinelabs.pipeline.pipe.dsl.PipelineDsl
+import org.pipelinelabs.pipeline.runner.dsl.PipelineDsl
 
 public abstract class PipelineScript extends Script {
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/PipelineDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/PipelineDsl.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.dsl;
+package org.pipelinelabs.pipeline.runner.dsl;
 
 import groovy.lang.Closure;
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/StageDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/StageDsl.java
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.dsl;
+package org.pipelinelabs.pipeline.runner.dsl;
 
 public interface StageDsl {
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/TaskDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/TaskDsl.java
@@ -0,0 +1,4 @@
+package org.pipelinelabs.pipeline.runner.dsl;
+
+public interface TaskDsl {
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DefaultPipelineDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DefaultPipelineDsl.java
@@ -1,9 +1,9 @@
-package org.pipelinelabs.pipeline.pipe.dsl.internal;
+package org.pipelinelabs.pipeline.runner.dsl.internal;
 
 import groovy.lang.Closure;
-import org.pipelinelabs.pipeline.pipe.api.Pipeline;
-import org.pipelinelabs.pipeline.pipe.dsl.StageDsl;
-import org.pipelinelabs.pipeline.pipe.runner.DefaultPipeline;
+import org.pipelinelabs.pipeline.runner.api.Pipeline;
+import org.pipelinelabs.pipeline.runner.dsl.StageDsl;
+import org.pipelinelabs.pipeline.runner.runner.DefaultPipeline;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DefaultStageDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DefaultStageDsl.java
@@ -1,11 +1,11 @@
-package org.pipelinelabs.pipeline.pipe.dsl.internal;
+package org.pipelinelabs.pipeline.runner.dsl.internal;
 
 import org.apache.maven.shared.utils.cli.CommandLineException;
 import org.apache.maven.shared.utils.cli.CommandLineUtils;
 import org.apache.maven.shared.utils.cli.Commandline;
 import org.apache.maven.shared.utils.cli.WriterStreamConsumer;
-import org.pipelinelabs.pipeline.pipe.api.Stage;
-import org.pipelinelabs.pipeline.pipe.runner.DefaultStage;
+import org.pipelinelabs.pipeline.runner.api.Stage;
+import org.pipelinelabs.pipeline.runner.runner.DefaultStage;
 
 import java.io.BufferedWriter;
 import java.io.OutputStreamWriter;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DslExporter.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DslExporter.java
@@ -0,0 +1,6 @@
+package org.pipelinelabs.pipeline.runner.dsl.internal;
+
+public interface DslExporter<T> {
+
+    T export();
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/InternalPipelineDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/InternalPipelineDsl.java
@@ -0,0 +1,7 @@
+package org.pipelinelabs.pipeline.runner.dsl.internal;
+
+import org.pipelinelabs.pipeline.runner.api.Pipeline;
+import org.pipelinelabs.pipeline.runner.dsl.PipelineDsl;
+
+public interface InternalPipelineDsl extends PipelineDsl, DslExporter<Pipeline> {
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/InternalStageDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/InternalStageDsl.java
@@ -0,0 +1,7 @@
+package org.pipelinelabs.pipeline.runner.dsl.internal;
+
+import org.pipelinelabs.pipeline.runner.api.Stage;
+import org.pipelinelabs.pipeline.runner.dsl.StageDsl;
+
+public interface InternalStageDsl extends StageDsl, DslExporter<Stage> {
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/InternalTaskDsl.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/InternalTaskDsl.java
@@ -0,0 +1,7 @@
+package org.pipelinelabs.pipeline.runner.dsl.internal;
+
+import org.pipelinelabs.pipeline.runner.api.Task;
+import org.pipelinelabs.pipeline.runner.dsl.TaskDsl;
+
+public interface InternalTaskDsl extends TaskDsl, DslExporter<Task> {
+}
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/ShellCommandTaskDsl.groovy b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/ShellCommandTaskDsl.groovy
@@ -1,6 +1,6 @@
-package org.pipelinelabs.pipeline.pipe.dsl.internal
+package org.pipelinelabs.pipeline.runner.dsl.internal
 
-import org.pipelinelabs.pipeline.pipe.api.task.ShellCommand
+import org.pipelinelabs.pipeline.runner.api.task.ShellCommand
 
 class ShellCommandTaskDsl implements InternalTaskDsl {
     private String command;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/internal/DefaultServiceRegistry.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/internal/DefaultServiceRegistry.java
@@ -1,7 +1,7 @@
-package org.pipelinelabs.pipeline.pipe.internal;
+package org.pipelinelabs.pipeline.runner.internal;
 
-import org.pipelinelabs.pipeline.pipe.cli.ServiceLookupException;
-import org.pipelinelabs.pipeline.pipe.dsl.internal.DefaultPipelineDsl;
+import org.pipelinelabs.pipeline.runner.cli.ServiceLookupException;
+import org.pipelinelabs.pipeline.runner.dsl.internal.DefaultPipelineDsl;
 
 public class DefaultServiceRegistry implements ServiceRegistry {
 
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/internal/ServiceRegistry.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/internal/ServiceRegistry.java
@@ -1,6 +1,6 @@
-package org.pipelinelabs.pipeline.pipe.internal;
+package org.pipelinelabs.pipeline.runner.internal;
 
-import org.pipelinelabs.pipeline.pipe.cli.ServiceLookupException;
+import org.pipelinelabs.pipeline.runner.cli.ServiceLookupException;
 
 public interface ServiceRegistry {
 
@@ -11,7 +11,7 @@ public interface ServiceRegistry {
      * @param <T>         The service type.
      * @return The service instance. Never returns null.
      * @throws UnknownServiceException When there is no service of the given type available.
-     * @throws org.pipelinelabs.pipeline.pipe.cli.ServiceLookupException
+     * @throws org.pipelinelabs.pipeline.runner.cli.ServiceLookupException
      *                                 On failure to lookup the specified service.
      */
     <T> T get(Class<T> serviceType) throws ServiceLookupException;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/runner/DefaultPipeline.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/runner/DefaultPipeline.java
@@ -1,7 +1,7 @@
-package org.pipelinelabs.pipeline.pipe.runner;
+package org.pipelinelabs.pipeline.runner.runner;
 
-import org.pipelinelabs.pipeline.pipe.api.Pipeline;
-import org.pipelinelabs.pipeline.pipe.api.Stage;
+import org.pipelinelabs.pipeline.runner.api.Pipeline;
+import org.pipelinelabs.pipeline.runner.api.Stage;
 
 import java.util.LinkedHashSet;
 import java.util.Set;
diff --git a/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/runner/DefaultStage.java b/subprojects/runner/src/main/groovy/org/pipelinelabs/pipeline/runner/runner/DefaultStage.java
@@ -0,0 +1,11 @@
+package org.pipelinelabs.pipeline.runner.runner;
+
+import org.pipelinelabs.pipeline.runner.api.Stage;
+import org.pipelinelabs.pipeline.runner.api.Task;
+
+public class DefaultStage implements Stage {
+
+    @Override
+    public void add(Task task) {
+    }
+}
diff --git a/subprojects/runner/src/main/resources/META-INF/services/org.pipelinelabs.pipeline.pipe.internal.ServiceRegistry b/subprojects/runner/src/main/resources/META-INF/services/org.pipelinelabs.pipeline.pipe.internal.ServiceRegistry
diff --git a/subprojects/runner/src/main/resources/META-INF/services/org.pipelinelabs.pipeline.runner.internal.ServiceRegistry b/subprojects/runner/src/main/resources/META-INF/services/org.pipelinelabs.pipeline.runner.internal.ServiceRegistry
@@ -0,0 +1 @@
+org.pipelinelabs.pipeline.runner.internal.DefaultServiceRegistry
diff --git a/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/cli/MainSpec.groovy b/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/cli/MainSpec.groovy
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.cli
+package org.pipelinelabs.pipeline.runner.cli
 
 import spock.lang.Specification
 import spock.lang.Unroll
diff --git a/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/cli/dsl/PipelineScriptRunnerSpec.groovy b/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/cli/dsl/PipelineScriptRunnerSpec.groovy
@@ -1,6 +1,6 @@
-package org.pipelinelabs.pipeline.pipe.cli.dsl
+package org.pipelinelabs.pipeline.runner.cli.dsl
 
-import org.pipelinelabs.pipeline.pipe.internal.DefaultServiceRegistry
+import org.pipelinelabs.pipeline.runner.internal.DefaultServiceRegistry
 import spock.lang.Ignore
 import spock.lang.Specification
 
diff --git a/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/dsl/PipelineDslSpec.groovy b/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/dsl/PipelineDslSpec.groovy
@@ -1,7 +1,7 @@
-package org.pipelinelabs.pipeline.pipe.dsl
+package org.pipelinelabs.pipeline.runner.dsl
 
-import org.pipelinelabs.pipeline.pipe.api.Pipeline
-import org.pipelinelabs.pipeline.pipe.dsl.internal.DefaultPipelineDsl
+import org.pipelinelabs.pipeline.runner.api.Pipeline
+import org.pipelinelabs.pipeline.runner.dsl.internal.DefaultPipelineDsl
 import spock.lang.Specification
 
 class PipelineDslSpec extends Specification {
diff --git a/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DefaultPipelineDslSpec.groovy b/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/dsl/internal/DefaultPipelineDslSpec.groovy
@@ -1,4 +1,4 @@
-package org.pipelinelabs.pipeline.pipe.dsl.internal
+package org.pipelinelabs.pipeline.runner.dsl.internal
 
 import spock.lang.Specification
 
diff --git a/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/internal/DefaultServiceRegistrySpec.groovy b/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/internal/DefaultServiceRegistrySpec.groovy
@@ -1,8 +1,8 @@
-package org.pipelinelabs.pipeline.pipe.internal
+package org.pipelinelabs.pipeline.runner.internal
 
-import org.pipelinelabs.pipeline.pipe.cli.ServiceLookupException
-import org.pipelinelabs.pipeline.pipe.dsl.PipelineDsl
-import org.pipelinelabs.pipeline.pipe.dsl.internal.DefaultPipelineDsl
+import org.pipelinelabs.pipeline.runner.cli.ServiceLookupException
+import org.pipelinelabs.pipeline.runner.dsl.PipelineDsl
+import org.pipelinelabs.pipeline.runner.dsl.internal.DefaultPipelineDsl
 import spock.lang.Specification
 import spock.lang.Unroll
 
diff --git a/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/internal/ServiceLocatorSpec.groovy b/subprojects/runner/src/test/groovy/org/pipelinelabs/pipeline/runner/internal/ServiceLocatorSpec.groovy
@@ -1,7 +1,7 @@
-package org.pipelinelabs.pipeline.pipe.internal
+package org.pipelinelabs.pipeline.runner.internal
 
-import org.pipelinelabs.pipeline.pipe.cli.ServiceLocator
-import org.pipelinelabs.pipeline.pipe.cli.ServiceLookupException
+import org.pipelinelabs.pipeline.runner.cli.ServiceLocator
+import org.pipelinelabs.pipeline.runner.cli.ServiceLookupException
 import spock.lang.Specification
 
 class ServiceLocatorSpec extends Specification {
diff --git a/subprojects/runner/src/test/groovy/stepdefs/CliStep.groovy b/subprojects/runner/src/test/groovy/stepdefs/CliStep.groovy
diff --git a/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.pipe.internal.ServiceExpectedToBeImplementedByMultipleClasses b/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.pipe.internal.ServiceExpectedToBeImplementedByMultipleClasses
diff --git a/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.pipe.internal.ServiceExpectedToBeImplementedByOneClass b/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.pipe.internal.ServiceExpectedToBeImplementedByOneClass
diff --git a/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.runner.internal.ServiceExpectedToBeImplementedByMultipleClasses b/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.runner.internal.ServiceExpectedToBeImplementedByMultipleClasses
diff --git a/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.runner.internal.ServiceExpectedToBeImplementedByOneClass b/subprojects/runner/src/test/resources/META-INF/services/org.pipelinelabs.pipeline.runner.internal.ServiceExpectedToBeImplementedByOneClass
