Change package names zero->boot

* actuator -> boot-ops
* cli -> boot-cli
* launcher -> boot-load
* autoconfig -> boot-config
* bootstrap -> boot-strap
* starters -> boot-up

[#54095231] [bs-253] Refactor Zero->Boot

Author: dsyer

README.md

@@ -43,7 +43,7 @@ or above.
 
 An `alias` can be used for the Spring Zero command line tool:
 
-	$ alias spring="java -jar ~/.m2/repository/org/springframework/zero/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar"
+	$ alias spring="java -jar ~/.m2/repository/org/springframework/boot/spring-cli/0.5.0.BUILD-SNAPSHOT/spring-cli-0.5.0.BUILD-SNAPSHOT.jar"
 
 _Also see [docs/CONTRIBUTING](docs/CONTRIBUTING.md) if you want to submit pull requests._  
 
@@ -167,22 +167,22 @@ Groovy samples for use with the command line application are available in
 [spring-cli/samples](spring-cli/samples/#). To run the CLI samples type 
 `spring run <sample>.groovy` from samples directory.
 
-Java samples are available in [spring-zero-sample](spring-zero-samples/#) and should
+Java samples are available in [spring-boot-sample](spring-boot-samples/#) and should
 be build with maven and run use `java -jar target/<sample>.jar`. The following java
 samples are provided:
 
-* spring-zero-sample-simple - A simple command line application
-* spring-zero-sample-tomcat - Embedded Tomcat
-* spring-zero-sample-jetty - Embedded Jetty
-* spring-zero-sample-actuator - Simple REST service with production features
-* spring-zero-sample-actuator-ui - A web UI example with production features
-* spring-zero-sample-web-ui - A thymeleaf web application
+* spring-boot-sample-simple - A simple command line application
+* spring-boot-sample-tomcat - Embedded Tomcat
+* spring-boot-sample-jetty - Embedded Jetty
+* spring-boot-sample-actuator - Simple REST service with production features
+* spring-boot-sample-actuator-ui - A web UI example with production features
+* spring-boot-sample-web-ui - A thymeleaf web application
 * spring-sample-batch - Define and run a Batch job in a few lines of code
 * spring-sample-data-jpa - Spring Data JPA + Hibernate + HSQLDB
-* spring-zero-sample-integration - A spring integration application
-* spring-zero-sample-profile - example showing Spring's `@profile` support
-* spring-zero-sample-traditional - shows Spring Zero with more traditional WAR packaging 
+* spring-boot-sample-integration - A spring integration application
+* spring-boot-sample-profile - example showing Spring's `@profile` support
+* spring-boot-sample-traditional - shows Spring Zero with more traditional WAR packaging 
   (but also executable using `java -jar`)
-* spring-zero-sample-xml - Example show how Spring Zero can be mixed with trditional XML
+* spring-boot-sample-xml - Example show how Spring Zero can be mixed with trditional XML
   configuration
 

docs/CONTRIBUTING.md

@@ -45,7 +45,7 @@ changes just won't be automatically formatted._
 
 With the requisite eclipse plugins installed you can select 
 `import existing maven projects` from the `file` menu to import the code. You will
-need to import the root `spring-zero` pom and the `spring-zero-samples` pom separately. 
+need to import the root `spring-boot` pom and the `spring-boot-samples` pom separately. 
 
 
 ### Importing into eclipse without m2eclipse

pom.xml

@@ -2,8 +2,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.zero</groupId>
-	<artifactId>spring-zero</artifactId>
+	<groupId>org.springframework.boot</groupId>
+	<artifactId>spring-boot</artifactId>
 	<version>0.5.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<prerequisites>
@@ -25,9 +25,9 @@
         <reactor.version>1.0.0.M1</reactor.version>
 	</properties>
 	<scm>
-		<url>http://github.com/SpringSource/spring-bootstrap</url>
-		<connection>scm:git:git://github.com/SpringSource/spring-bootstrap.git</connection>
-		<developerConnection>scm:git:ssh://[email protected]/SpringSource/spring-bootstrap.git</developerConnection>
+		<url>http://github.com/SpringSource/spring-boot</url>
+		<connection>scm:git:git://github.com/SpringSource/spring-boot.git</connection>
+		<developerConnection>scm:git:ssh://[email protected]/SpringSource/spring-boot.git</developerConnection>
 	</scm>
 	<developers>
 		<developer>
@@ -37,14 +37,14 @@
 		</developer>
 	</developers>
 	<modules>
-		<module>spring-bootstrap</module>
-		<module>spring-autoconfigure</module>
-		<module>spring-starters</module>
-		<module>spring-actuator</module>
-		<module>spring-launcher</module>
-		<module>spring-package-maven-plugin</module>
-		<module>spring-cli</module>
-		<module>spring-zero-integration-tests</module>
+		<module>spring-boot-strap</module>
+		<module>spring-boot-config</module>
+		<module>spring-boot-ops</module>
+		<module>spring-boot-load</module>
+		<module>spring-boot-maven-plugin</module>
+		<module>spring-boot-ups</module>
+		<module>spring-boot-cli</module>
+		<module>spring-boot-integration-tests</module>
 	</modules>
 	<build>
 		<pluginManagement>
@@ -663,7 +663,7 @@
 		<downloadUrl>http://www.springsource.com/download/community</downloadUrl>
 		<site>
 			<id>spring-docs</id>
-			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version}</url>
+			<url>scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-boot/docs/${project.version}</url>
 		</site>
 		<repository>
 			<id>spring-repo-release</id>

spring-actuator/src/main/resources/META-INF/spring.factories

@@ -3,15 +3,15 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>org.springframework.zero</groupId>
-		<artifactId>spring-zero</artifactId>
+		<groupId>org.springframework.boot</groupId>
+		<artifactId>spring-boot</artifactId>
 		<version>0.5.0.BUILD-SNAPSHOT</version>
 	</parent>
-	<artifactId>spring-cli</artifactId>
+	<artifactId>spring-boot-cli</artifactId>
 	<packaging>jar</packaging>
 	<properties>
 		<main.basedir>${basedir}/..</main.basedir>
-		<start-class>org.springframework.cli.SpringCli</start-class>
+		<start-class>org.springframework.boot.cli.SpringCli</start-class>
 	</properties>
 	<dependencies>
 		<!-- Compile -->

spring-autoconfigure/src/main/resources/META-INF/spring.factories

@@ -1,6 +1,6 @@
 package org.test
 
-@Grab("org.springframework.zero:spring-actuator:0.5.0.BUILD-SNAPSHOT")
+@Grab("org.springframework.boot:spring-boot-up-ops:0.5.0.BUILD-SNAPSHOT")
 
 @Controller
 class SampleController {

spring-cli/README.md renamed to spring-boot-cli/README.md

@@ -1,6 +1,6 @@
 package org.test
 
-import static org.springframework.cli.template.GroovyTemplate.template;
+import static org.springframework.boot.cli.template.GroovyTemplate.template;
 
 @Component
 class Example implements CommandLineRunner {

spring-cli/pom.xml renamed to spring-boot-cli/pom.xml

@@ -23,7 +23,7 @@
     <dependencySets>
         <dependencySet>
           <includes>
-            <include>org.springframework.zero:spring-cli:jar:*</include>
+            <include>org.springframework.boot:spring-cli:jar:*</include>
           </includes>
           <outputDirectory>lib</outputDirectory>
         </dependencySet>

spring-cli/samples/app.groovy renamed to spring-boot-cli/samples/app.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli;
+package org.springframework.boot.cli;
 
 /**
  * A single command that can be run from the CLI.

spring-cli/samples/integration.groovy renamed to spring-boot-cli/samples/integration.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli;
+package org.springframework.boot.cli;
 
 import java.util.Collection;
 import java.util.ServiceLoader;

spring-cli/samples/job.groovy renamed to spring-boot-cli/samples/job.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli;
+package org.springframework.boot.cli;
 
 /**
  * Simple logger used by the CLI.

spring-cli/samples/actuator.groovy renamed to spring-boot-cli/samples/ops.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli;
+package org.springframework.boot.cli;
 
 /**
  * Exception thrown when an unknown command is specified.

spring-cli/samples/reactor.groovy renamed to spring-boot-cli/samples/reactor.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli;
+package org.springframework.boot.cli;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -76,7 +76,7 @@ public void setCommands(List<? extends Command> commands) {
 	/**
 	 * Run the CLI and handle and errors.
 	 * @param args the input arguments
-	 * @return a return status code (non zero is used to indicate an error)
+	 * @return a return status code (non boot is used to indicate an error)
 	 */
 	public int runAndHandleErrors(String... args) {
 		String[] argsWithoutDebugFlags = removeDebugFlags(args);

spring-cli/samples/runner.groovy renamed to spring-boot-cli/samples/runner.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli;
+package org.springframework.boot.cli;
 
 import java.util.Arrays;
 import java.util.Collections;

spring-cli/samples/runner.xml renamed to spring-boot-cli/samples/runner.xml

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
-import org.springframework.cli.Command;
+import org.springframework.boot.cli.Command;
 
 /**
  * Abstract {@link Command} implementation.

spring-cli/samples/template.groovy renamed to spring-boot-cli/samples/template.groovy

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -24,8 +24,8 @@
 import joptsimple.OptionSpec;
 
 import org.apache.ivy.util.FileUtil;
-import org.springframework.cli.Command;
-import org.springframework.cli.Log;
+import org.springframework.boot.cli.Command;
+import org.springframework.boot.cli.Log;
 
 /**
  * {@link Command} to 'clean' up grapes, removing cached dependencies and forcing a
@@ -80,8 +80,8 @@ private void clean(OptionSet options, File root, Layout layout) {
 				return;
 			}
 			ArrayList<Object> specs = new ArrayList<Object>(options.nonOptionArguments());
-			if (!specs.contains("org.springframework.zero") && layout == Layout.IVY) {
-				specs.add(0, "org.springframework.zero");
+			if (!specs.contains("org.springframework.boot") && layout == Layout.IVY) {
+				specs.add(0, "org.springframework.boot");
 			}
 			for (Object spec : specs) {
 				if (spec instanceof String) {
@@ -103,7 +103,7 @@ private void clean(OptionSet options, File root, Layout layout, String spec) {
 				return;
 			}
 
-			if (options.has(this.allOption) || group.equals("org.springframework.zero")) {
+			if (options.has(this.allOption) || group.equals("org.springframework.boot")) {
 				delete(file);
 				return;
 			}

spring-cli/samples/ui.groovy renamed to spring-boot-cli/samples/ui.groovy

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
 import joptsimple.OptionSet;
 
-import org.springframework.cli.Command;
+import org.springframework.boot.cli.Command;
 
 import static java.util.Arrays.asList;
 

spring-cli/samples/web.groovy renamed to spring-boot-cli/samples/web.groovy

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.cli.Command;
-import org.springframework.cli.CommandFactory;
+import org.springframework.boot.cli.Command;
+import org.springframework.boot.cli.CommandFactory;
 
 /**
  * Default implementation of {@link CommandFactory}.

spring-cli/src/main/assembly/descriptor.xml renamed to spring-boot-cli/src/main/assembly/descriptor.xml

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
 import groovy.lang.Closure;
 

spring-cli/src/main/java/org/springframework/cli/Command.java renamed to spring-boot-cli/src/main/java/org/springframework/boot/cli/Command.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
-import org.springframework.cli.Command;
+import org.springframework.boot.cli.Command;
 
 /**
  * Base class for a {@link Command} that pare options using an {@link OptionHandler}.

spring-cli/src/main/java/org/springframework/cli/CommandFactory.java renamed to spring-boot-cli/src/main/java/org/springframework/boot/cli/CommandFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
 import java.awt.Desktop;
 import java.io.File;
@@ -25,9 +25,9 @@
 import joptsimple.OptionSet;
 import joptsimple.OptionSpec;
 
-import org.springframework.cli.Command;
-import org.springframework.cli.runner.SpringApplicationRunner;
-import org.springframework.cli.runner.SpringApplicationRunnerConfiguration;
+import org.springframework.boot.cli.Command;
+import org.springframework.boot.cli.runner.SpringApplicationRunner;
+import org.springframework.boot.cli.runner.SpringApplicationRunnerConfiguration;
 
 import static java.util.Arrays.asList;
 

spring-cli/src/main/java/org/springframework/cli/Log.java renamed to spring-boot-cli/src/main/java/org/springframework/boot/cli/Log.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.cli.command;
+package org.springframework.boot.cli.command;
 
 import groovy.lang.Closure;
 import groovy.lang.GroovyObjectSupport;
@@ -30,9 +30,9 @@
 
 import org.apache.ivy.util.FileUtil;
 import org.codehaus.groovy.control.CompilationFailedException;
-import org.springframework.cli.Command;
-import org.springframework.cli.compiler.GroovyCompiler;
-import org.springframework.cli.compiler.GroovyCompilerConfiguration;
+import org.springframework.boot.cli.Command;
+import org.springframework.boot.cli.compiler.GroovyCompiler;
+import org.springframework.boot.cli.compiler.GroovyCompilerConfiguration;
 
 /**
  * {@link Command} to run a Groovy script.