Package restructure

spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java

@@ -14,24 +14,23 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import java.io.PrintStream;
 
 /**
- * Writes the 'Spring Zero' banner.
+ * Writes the 'Spring' banner.
  * 
  * @author Phillip Webb
  */
 abstract class Banner {
 
-	private static final String[] BANNER = {
-			"  .   ____          _             _____             __ _",
-			" /\\\\ / ___'_ __ _ _(_)_ __  __ _ |__   /___ _ __ ___\\ \\ \\",
-			"( ( )\\___ | '_ | '_| | '_ \\/ _` |  /  // _ \\ '__/ _ \\\\ \\ \\",
-			" \\\\/  ___)| |_)| | | | | || (_| | /  /|  __/ | | (/) |} } }",
-			"  '  |____| .__|_| |_|_| |_\\__, |'_____\\___|_|  \\___// / /",
-			" =========|_|==============|___/====================/_/_/" };
+	private static final String[] BANNER = { "  .   ____          _            __ _ _",
+			" /\\\\ / ___'_ __ _ _(_)_ __  __ _ \\ \\ \\ \\",
+			"( ( )\\___ | '_ | '_| | '_ \\/ _` | \\ \\ \\ \\",
+			" \\\\/  ___)| |_)| | | | | || (_| |  ) ) ) )",
+			"  '  |____| .__|_| |_|_| |_\\__, | / / / /",
+			" =========|_|==============|___/=/_/_/_/" };
 
 	/**
 	 * Write the banner to the specified print stream.

spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import java.util.HashSet;
 import java.util.Set;

spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;

spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 /**
  * Interface used to generate an 'exit code' from a running command line

spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -123,8 +123,8 @@ public class SpringApplication {
 	private static final String DEFAULT_CONTEXT_CLASS = "org.springframework.context."
 			+ "annotation.AnnotationConfigApplicationContext";
 
-	public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework.zero."
-			+ "context.embedded.AnnotationConfigEmbeddedWebApplicationContext";
+	public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework."
+			+ "bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext";
 
 	private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet",
 			"org.springframework.web.context.ConfigurableWebApplicationContext" };

spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.beans.IntrospectionException;
 import java.util.HashMap;

spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.beans.PropertyEditor;
 import java.beans.PropertyEditorSupport;

spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.util.Locale;
 import java.util.Properties;

spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.util.Collection;
 import java.util.Map;

spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.net.InetAddress;
 import java.util.LinkedHashMap;

spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.nio.charset.Charset;
 import java.util.Collections;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.List;
 import java.util.Map;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.List;
 import java.util.Map;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import org.springframework.util.ClassUtils;
 

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.ArrayList;
 import java.util.HashMap;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.List;
 import java.util.Map;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.io.IOException;
 import java.util.Collection;

spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.Map;
 import java.util.Properties;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.springframework.core.type.AnnotatedTypeMetadata;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.springframework.context.annotation.Condition;
 

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.util.ArrayList;
 import java.util.List;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.util.List;
 

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.util.ArrayList;
 import java.util.List;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.util.ArrayList;
 import java.util.List;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.io.File;
 import java.io.IOException;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.io.File;
 import java.net.InetAddress;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 /**
  * Simple interface that represents a fully configured embedded servlet container (for

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 /**
  * Strategy interface for customizing auto-configured embedded servlet containers. Any

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.util.ArrayList;
 import java.util.Collection;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 /**
  * Exceptions thrown by an embedded servlet container.

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
-import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 
 /**
  * Factory interface that can be used to create {@link EmbeddedServletContainer}s.

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.util.ArrayList;
 import java.util.Collection;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import org.springframework.http.HttpStatus;
 import org.springframework.util.ObjectUtils;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.util.Arrays;
 import java.util.Collection;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import java.util.Arrays;
 import java.util.Collection;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletContext;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.jetty;
+package org.springframework.bootstrap.context.embedded.jetty;
 
 import org.eclipse.jetty.server.Server;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException;
 import org.springframework.util.Assert;
-import org.springframework.zero.context.embedded.EmbeddedServletContainer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerException;
 
 /**
  * {@link EmbeddedServletContainer} that can be used to control an embedded Jetty server.

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.jetty;
+package org.springframework.bootstrap.context.embedded.jetty;
 
 import java.io.File;
 import java.net.InetSocketAddress;
@@ -32,16 +32,16 @@ import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
+import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.ErrorPage;
+import org.springframework.bootstrap.context.embedded.ServletContextInitializer;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.EmbeddedServletContainer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.ErrorPage;
-import org.springframework.zero.context.embedded.ServletContextInitializer;
 
 /**
  * {@link EmbeddedServletContainerFactory} that can be used to create

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.jetty;
+package org.springframework.bootstrap.context.embedded.jetty;
 
 import javax.servlet.ServletContext;
 
@@ -23,8 +23,8 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle;
 import org.eclipse.jetty.webapp.AbstractConfiguration;
 import org.eclipse.jetty.webapp.Configuration;
 import org.eclipse.jetty.webapp.WebAppContext;
+import org.springframework.bootstrap.context.embedded.ServletContextInitializer;
 import org.springframework.util.Assert;
-import org.springframework.zero.context.embedded.ServletContextInitializer;
 
 /**
  * Jetty {@link Configuration} that calls {@link ServletContextInitializer}s.

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java

@@ -15,7 +15,7 @@
  */
 
 /**
- * Support for Jetty {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
+ * Support for Jetty {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
  */
-package org.springframework.zero.context.embedded.jetty;
+package org.springframework.bootstrap.context.embedded.jetty;
 

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java

@@ -16,8 +16,8 @@
 
 /**
  * Support for embedded servlet containers.
- * @see org.springframework.zero.context.embedded.EmbeddedServletContainerFactory
- * @see org.springframework.zero.context.embedded.EmbeddedWebApplicationContext
+ * @see org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory
+ * @see org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext
  */
-package org.springframework.zero.context.embedded;
+package org.springframework.bootstrap.context.embedded;
 

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.properties;
+package org.springframework.bootstrap.context.embedded.properties;
 
 import java.io.File;
 import java.net.InetAddress;
@@ -23,13 +23,13 @@ import javax.validation.constraints.NotNull;
 
 import org.apache.catalina.valves.AccessLogValve;
 import org.apache.catalina.valves.RemoteIpValve;
+import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link ConfigurationProperties properties} for a web server (e.g. port and path

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.tomcat;
+package org.springframework.bootstrap.context.embedded.tomcat;
 
 import javax.servlet.ServletException;
 
@@ -22,8 +22,8 @@ import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
 import org.apache.catalina.core.StandardContext;
+import org.springframework.bootstrap.context.embedded.ServletContextInitializer;
 import org.springframework.util.Assert;
-import org.springframework.zero.context.embedded.ServletContextInitializer;
 
 /**
  * Tomcat {@link LifecycleListener} that calls {@link ServletContextInitializer}s.

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.tomcat;
+package org.springframework.bootstrap.context.embedded.tomcat;
 
 import org.apache.catalina.LifecycleException;
 import org.apache.catalina.startup.Tomcat;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException;
 import org.springframework.util.Assert;
-import org.springframework.zero.context.embedded.EmbeddedServletContainer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerException;
 
 /**
  * {@link EmbeddedServletContainer} that can be used to control an embedded Tomcat server.

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.tomcat;
+package org.springframework.bootstrap.context.embedded.tomcat;
 
 import java.io.File;
 import java.io.IOException;
@@ -38,16 +38,16 @@ import org.apache.catalina.loader.WebappLoader;
 import org.apache.catalina.startup.Tomcat;
 import org.apache.catalina.startup.Tomcat.FixContextListener;
 import org.apache.coyote.AbstractProtocol;
+import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.ErrorPage;
+import org.springframework.bootstrap.context.embedded.ServletContextInitializer;
 import org.springframework.context.ResourceLoaderAware;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.EmbeddedServletContainer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerException;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.ErrorPage;
-import org.springframework.zero.context.embedded.ServletContextInitializer;
 
 /**
  * {@link EmbeddedServletContainerFactory} that can be used to create

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.embedded.tomcat;
+package org.springframework.bootstrap.context.embedded.tomcat;
 
 import java.net.URL;
 import java.net.URLClassLoader;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java

@@ -15,7 +15,7 @@
  */
 
 /**
- * Support for Tomcat {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
+ * Support for Tomcat {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}.
  */
-package org.springframework.zero.context.embedded.tomcat;
+package org.springframework.bootstrap.context.embedded.tomcat;
 

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.initializer;
+package org.springframework.bootstrap.context.initializer;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,6 +23,10 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 
+import org.springframework.bootstrap.config.YamlPropertiesFactoryBean;
+import org.springframework.bootstrap.config.YamlProcessor.ArrayDocumentMatcher;
+import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher;
+import org.springframework.bootstrap.config.YamlProcessor.MatchStatus;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.PropertySource;
@@ -33,10 +37,6 @@ import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.config.YamlProcessor.ArrayDocumentMatcher;
-import org.springframework.zero.config.YamlProcessor.DocumentMatcher;
-import org.springframework.zero.config.YamlProcessor.MatchStatus;
-import org.springframework.zero.config.YamlPropertiesFactoryBean;
 
 /**
  * {@link ApplicationContextInitializer} that configures the context environment by

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.initializer;
+package org.springframework.bootstrap.context.initializer;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.initializer;
+package org.springframework.bootstrap.context.initializer;
 
 import java.util.ArrayList;
 import java.util.Collections;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.initializer;
+package org.springframework.bootstrap.context.initializer;
 
 import java.lang.management.ManagementFactory;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.bootstrap.logging.JavaLoggerConfigurer;
+import org.springframework.bootstrap.logging.LogbackConfigurer;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
@@ -29,8 +31,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.Log4jConfigurer;
-import org.springframework.zero.logging.JavaLoggerConfigurer;
-import org.springframework.zero.logging.LogbackConfigurer;
 
 /**
  * An {@link ApplicationContextInitializer} that configures a logging framework depending

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.initializer;
+package org.springframework.bootstrap.context.initializer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,6 +23,8 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 
+import org.springframework.bootstrap.config.JsonParser;
+import org.springframework.bootstrap.config.JsonParserFactory;
 import org.springframework.context.ApplicationContextInitializer;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.core.Ordered;
@@ -32,8 +34,6 @@ import org.springframework.core.env.Environment;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertiesPropertySource;
 import org.springframework.util.StringUtils;
-import org.springframework.zero.config.JsonParser;
-import org.springframework.zero.config.JsonParserFactory;
 
 /**
  * An {@link ApplicationContextInitializer} that knows where to find VCAP (a.k.a. Cloud

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.properties;
+package org.springframework.bootstrap.context.properties;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.properties;
+package org.springframework.bootstrap.context.properties;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,8 +32,6 @@ import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.PropertySources;
 import org.springframework.validation.Validator;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * Configuration for binding externalized application properties to

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.properties;
+package org.springframework.bootstrap.context.properties;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;
@@ -22,6 +22,7 @@ import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.ListableBeanFactory;
 import org.springframework.beans.factory.config.BeanPostProcessor;
+import org.springframework.bootstrap.bind.PropertiesConfigurationFactory;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
@@ -29,7 +30,6 @@ import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.PropertySources;
 import org.springframework.util.StringUtils;
 import org.springframework.validation.Validator;
-import org.springframework.zero.bind.PropertiesConfigurationFactory;
 
 /**
  * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.properties;
+package org.springframework.bootstrap.context.properties;
 
 /**
  * Properties holder registered by {@link EnableConfigurationPropertiesImportSelector} to

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.properties;
+package org.springframework.bootstrap.context.properties;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.properties;
+package org.springframework.bootstrap.context.properties;
 
 import java.util.ArrayList;
 import java.util.List;

spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.logging;
+package org.springframework.bootstrap.logging;
 
 import java.io.FileNotFoundException;
 import java.util.logging.LogManager;

spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.logging;
+package org.springframework.bootstrap.logging;
 
 import java.io.FileNotFoundException;
 import java.net.URL;

spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.web;
+package org.springframework.bootstrap.web;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -22,12 +22,12 @@ import javax.servlet.ServletException;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.bootstrap.SpringApplication;
+import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.context.ApplicationContext;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 
 /**
  * A handy opinionated {@link WebApplicationInitializer} for applications that only have

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

@@ -1,7 +1,7 @@
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\
-org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer,\
-org.springframework.zero.context.initializer.ContextIdApplicationContextInitializer,\
-org.springframework.zero.context.initializer.EnvironmentDelegateApplicationContextInitializer,\
-org.springframework.zero.context.initializer.LoggingApplicationContextInitializer,\
-org.springframework.zero.context.initializer.VcapApplicationContextInitializer
+org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer,\
+org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer

spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.bootstrap.sampleconfig.MyComponent;
 import org.springframework.context.support.StaticApplicationContext;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.zero.sampleconfig.MyComponent;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -82,7 +82,7 @@ public class BeanDefinitionLoaderTests {
 	@Test
 	public void loadResourceName() throws Exception {
 		BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry,
-				"classpath:org/springframework/zero/sample-beans.xml");
+				"classpath:org/springframework/bootstrap/sample-beans.xml");
 		int loaded = loader.load();
 		assertThat(loaded, equalTo(1));
 		assertTrue(this.registry.containsBean("myXmlComponent"));

spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -26,6 +26,12 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanNameGenerator;
 import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
+import org.springframework.bootstrap.BeanDefinitionLoader;
+import org.springframework.bootstrap.CommandLineRunner;
+import org.springframework.bootstrap.ExitCodeGenerator;
+import org.springframework.bootstrap.SpringApplication;
+import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationContextInitializer;
@@ -45,12 +51,6 @@ import org.springframework.core.io.DefaultResourceLoader;
 import org.springframework.core.io.ResourceLoader;
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.web.context.support.StaticWebApplicationContext;
-import org.springframework.zero.BeanDefinitionLoader;
-import org.springframework.zero.CommandLineRunner;
-import org.springframework.zero.ExitCodeGenerator;
-import org.springframework.zero.SpringApplication;
-import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.instanceOf;

spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero;
+package org.springframework.bootstrap;
 
 import java.util.HashMap;
 import java.util.Map;

spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import javax.validation.Validation;
 import javax.validation.constraints.NotNull;
 
 import org.junit.Test;
 import org.springframework.beans.NotWritablePropertyException;
+import org.springframework.bootstrap.bind.PropertiesConfigurationFactory;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Validator;
 import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
-import org.springframework.zero.bind.PropertiesConfigurationFactory;
 
 import static org.junit.Assert.assertEquals;
 

spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.bootstrap.bind.PropertySourcesPropertyValues;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;

spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -36,6 +36,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.springframework.beans.MutablePropertyValues;
+import org.springframework.bootstrap.bind.RelaxedDataBinder;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.DefaultConversionService;
@@ -45,7 +46,6 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.DataBinder;
 import org.springframework.validation.FieldError;
 import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean;
-import org.springframework.zero.bind.RelaxedDataBinder;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import static org.junit.Assert.assertEquals;

spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.bind;
+package org.springframework.bootstrap.bind;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -24,6 +24,7 @@ import javax.validation.Validation;
 import javax.validation.constraints.NotNull;
 
 import org.junit.Test;
+import org.springframework.bootstrap.bind.YamlConfigurationFactory;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Validator;

spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
+
+import org.springframework.bootstrap.config.JacksonJsonParser;
+import org.springframework.bootstrap.config.JsonParser;
 
 
 /**

spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.List;
 import java.util.Map;
 
 import org.junit.Test;
+import org.springframework.bootstrap.config.JsonParser;
+import org.springframework.bootstrap.config.SimpleJsonParser;
 
 import static org.junit.Assert.assertEquals;
 

spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java

@@ -14,7 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
+
+import org.springframework.bootstrap.config.JsonParser;
+import org.springframework.bootstrap.config.YamlJsonParser;
 
 
 /**

spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java

@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
 import org.junit.Test;
+import org.springframework.bootstrap.config.YamlMapFactoryBean;
+import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod;
 import org.springframework.core.io.AbstractResource;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
-import org.springframework.zero.config.YamlProcessor.ResolutionMethod;
 
 import static org.junit.Assert.assertEquals;
 

spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.config;
+package org.springframework.bootstrap.config;
 
 import java.util.Arrays;
 import java.util.Map;
@@ -22,12 +22,13 @@ import java.util.Properties;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.bootstrap.config.YamlPropertiesFactoryBean;
+import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher;
+import org.springframework.bootstrap.config.YamlProcessor.MatchStatus;
+import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
-import org.springframework.zero.config.YamlProcessor.DocumentMatcher;
-import org.springframework.zero.config.YamlProcessor.MatchStatus;
-import org.springframework.zero.config.YamlProcessor.ResolutionMethod;
 import org.yaml.snakeyaml.Yaml;
 
 import static org.junit.Assert.assertEquals;

spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -23,9 +23,9 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.springframework.beans.factory.BeanFactory;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Conditional;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link Conditional} that only matches when the specified bean classes and/or names are

spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import java.util.List;
 
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.bootstrap.context.condition.OnMissingBeanCondition;
 import org.springframework.context.annotation.Condition;
 import org.springframework.context.annotation.ConditionContext;
 import org.springframework.core.type.AnnotatedTypeMetadata;
-import org.springframework.zero.context.condition.OnMissingBeanCondition;
 
 /**
  * {@link Condition} that checks that specific beans are missing.

spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.zero.context.condition.ConditionalOnBean;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -103,13 +102,13 @@ public class OnBeanConditionTests {
 	}
 
 	@Configuration
-	@ImportResource("org/springframework/zero/context/annotation/foo.xml")
+	@ImportResource("org/springframework/bootstrap/context/annotation/foo.xml")
 	protected static class XmlConfiguration {
 	}
 
 	@Configuration
 	@Import(OnBeanNameConfiguration.class)
-	@ImportResource("org/springframework/zero/context/annotation/foo.xml")
+	@ImportResource("org/springframework/bootstrap/context/annotation/foo.xml")
 	protected static class CombinedXmlConfiguration {
 	}
 }

spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
@@ -95,13 +95,13 @@ public class OnClassConditionTests {
 	}
 
 	@Configuration
-	@ImportResource("org/springframework/zero/context/foo.xml")
+	@ImportResource("org/springframework/bootstrap/context/foo.xml")
 	protected static class XmlConfiguration {
 	}
 
 	@Configuration
 	@Import(BasicConfiguration.class)
-	@ImportResource("org/springframework/zero/context/foo.xml")
+	@ImportResource("org/springframework/bootstrap/context/foo.xml")
 	protected static class CombinedXmlConfiguration {
 	}
 }

spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java

@@ -14,9 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.junit.Test;
+import org.springframework.bootstrap.context.condition.ConditionalOnExpression;
+import org.springframework.bootstrap.context.condition.OnExpressionCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.context.condition;
+package org.springframework.bootstrap.context.condition;
 
 import org.junit.Test;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
+import org.springframework.bootstrap.context.condition.OnMissingBeanCondition;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
-import org.springframework.zero.context.condition.OnMissingBeanCondition;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertEquals;