Restructure 'bootstrap' to use 'zero'

spring-zero-core/src/main/java/org/springframework/zero/Banner.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap;
+package org.springframework.zero;
 
 import java.io.PrintStream;
 
 /**
- * Writes the 'Spring Bootstrap' banner.
+ * Writes the 'Spring Zero' banner.
  * 
  * @author Phillip Webb
  */

spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java

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

spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java

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

spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java

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

spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap;
+package org.springframework.zero;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -123,7 +123,7 @@ 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.bootstrap."
+	public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework.zero."
 			+ "context.embedded.AnnotationConfigEmbeddedWebApplicationContext";
 
 	private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet",

spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java

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

spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java

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

spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java

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

spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java

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

spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java

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

spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java

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

spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.config;
+package org.springframework.zero.config;
 
 import java.util.List;
 import java.util.Map;

spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.config;
+package org.springframework.zero.config;
 
 import java.util.List;
 import java.util.Map;

spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java

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

spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java

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

spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java

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

spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java

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

spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java

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

spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.annotation;
+package org.springframework.zero.context.annotation;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.context.annotation;
+package org.springframework.zero.context.annotation;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java

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

spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.annotation;
+package org.springframework.zero.context.annotation;
 
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanCreationException;
@@ -22,14 +22,14 @@ 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.bootstrap.context.annotation.EnableConfigurationPropertiesImportSelector.ConfigurationPropertiesHolder;
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.support.DefaultConversionService;
 import org.springframework.core.env.PropertySources;
 import org.springframework.validation.Validator;
+import org.springframework.zero.bind.PropertiesConfigurationFactory;
+import org.springframework.zero.context.annotation.EnableConfigurationPropertiesImportSelector.ConfigurationPropertiesHolder;
 
 /**
  * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with

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

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

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

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

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

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

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

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

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

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

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.context.embedded;
+package org.springframework.zero.context.embedded;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.embedded.jetty;
+package org.springframework.zero.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-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.embedded.jetty;
+package org.springframework.zero.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-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.embedded.jetty;
+package org.springframework.zero.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-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java

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

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

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

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.embedded.tomcat;
+package org.springframework.zero.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-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.embedded.tomcat;
+package org.springframework.zero.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-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.embedded.tomcat;
+package org.springframework.zero.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-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java

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

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

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

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

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

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

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

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

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

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

@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.initializer;
+package org.springframework.zero.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;
@@ -31,6 +29,8 @@ 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-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.initializer;
+package org.springframework.zero.context.initializer;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -23,8 +23,6 @@ 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;
@@ -34,6 +32,8 @@ 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-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java

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

spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java

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

spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.properties;
+package org.springframework.zero.properties;
 
 import java.io.File;
 import java.net.InetAddress;
 
 import javax.validation.constraints.NotNull;
 
-import org.springframework.bootstrap.context.annotation.ConfigurationProperties;
+import org.springframework.zero.context.annotation.ConfigurationProperties;
 
 /**
  * Properties for the web server (e.g. port and path settings).

spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java

@@ -1,4 +1,4 @@
-package org.springframework.bootstrap.web;
+package org.springframework.zero.web;
 
 import javax.servlet.ServletContext;
 import javax.servlet.ServletContextEvent;
@@ -6,12 +6,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;
 
 /**
  * <p>

spring-zero-core/src/main/resources/META-INF/spring.factories

@@ -1,7 +1,7 @@
 # Application Context Initializers
 org.springframework.context.ApplicationContextInitializer=\
-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
+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

spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap;
+package org.springframework.zero;
 
 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/bootstrap/sample-beans.xml");
+				"classpath:org/springframework/zero/sample-beans.xml");
 		int loaded = loader.load();
 		assertThat(loaded, equalTo(1));
 		assertTrue(this.registry.containsBean("myXmlComponent"));

spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap;
+package org.springframework.zero;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -26,8 +26,6 @@ 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.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;
@@ -47,6 +45,12 @@ 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-zero-core/src/test/java/org/springframework/zero/TestUtils.java

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

spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.bind;
+package org.springframework.zero.bind;
 
 import javax.validation.Validation;
 import javax.validation.constraints.NotNull;
@@ -27,6 +27,7 @@ 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-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.bind;
+package org.springframework.zero.bind;
 
 import java.util.Collections;
 
@@ -24,6 +24,7 @@ import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertySource;
 import org.springframework.validation.DataBinder;
+import org.springframework.zero.bind.PropertySourcesPropertyValues;
 
 import static org.junit.Assert.assertEquals;
 

spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.bind;
+package org.springframework.zero.bind;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -45,6 +45,7 @@ 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-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.bind;
+package org.springframework.zero.bind;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -28,6 +28,7 @@ import org.springframework.context.support.StaticMessageSource;
 import org.springframework.validation.BindException;
 import org.springframework.validation.Validator;
 import org.springframework.validation.beanvalidation.SpringValidatorAdapter;
+import org.springframework.zero.bind.YamlConfigurationFactory;
 import org.yaml.snakeyaml.error.YAMLException;
 
 import static org.junit.Assert.assertEquals;

spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java

@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.config;
+package org.springframework.zero.config;
+
+import org.springframework.zero.config.JacksonJsonParser;
+import org.springframework.zero.config.JsonParser;
 
 /**
  * @author Dave Syer

spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java

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

spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java

@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.config;
+package org.springframework.zero.config;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Map;
 
 import org.junit.Test;
-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.YamlMapFactoryBean;
+import org.springframework.zero.config.YamlProcessor.ResolutionMethod;
 
 import static org.junit.Assert.assertEquals;
 

spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java

@@ -13,7 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.config;
+package org.springframework.zero.config;
+
+import org.springframework.zero.config.JsonParser;
+import org.springframework.zero.config.YamlJsonParser;
 
 /**
  * @author Dave Syer

spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.config;
+package org.springframework.zero.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.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.YamlPropertiesFactoryBean;
+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-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.bootstrap.context.annotation;
+package org.springframework.zero.context.annotation;
 
 import java.util.Arrays;
 
@@ -22,12 +22,12 @@ import javax.annotation.PostConstruct;
 import org.junit.Test;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.bootstrap.TestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.stereotype.Component;
+import org.springframework.zero.TestUtils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -150,7 +150,7 @@ public class EnableConfigurationPropertiesTests {
 	@EnableConfigurationProperties
 	protected static class TestBeanConfiguration {
 		@ConditionalOnMissingBean(TestProperties.class)
-		@Bean(name = "org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesTests$TestProperties")
+		@Bean(name = "org.springframework.zero.context.annotation.EnableConfigurationPropertiesTests$TestProperties")
 		public TestProperties testProperties() {
 			return new TestProperties();
 		}
@@ -168,7 +168,7 @@ public class EnableConfigurationPropertiesTests {
 	}
 
 	@Configuration
-	@ImportResource("org/springframework/bootstrap/context/annotation/testProperties.xml")
+	@ImportResource("org/springframework/zero/context/annotation/testProperties.xml")
 	protected static class DefaultXmlConfiguration {
 	}
 

spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java

@@ -14,12 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.annotation;
+package org.springframework.zero.context.annotation;
 
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.zero.context.annotation.ConditionalOnNotWebApplication;
+import org.springframework.zero.context.annotation.ConditionalOnWebApplication;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java

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

spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java

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

spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java

@@ -14,12 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.bootstrap.context.annotation;
+package org.springframework.zero.context.annotation;
 
 import org.junit.Test;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.zero.context.annotation.ConditionalOnExpression;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;