Package restructure

spring-actuator/docs/Features.md

@@ -1,12 +1,12 @@
-# Spring Zero Actuator Feature Guide
+# Spring Actuator Feature Guide
 
-Here are some (most, hopefully all) the features of Spring Zero
+Here are some (most, hopefully all) the features of Spring Actuator 
-Actuator with some commentary to help you start using them.  We
+with some commentary to help you start using them.  We
 recommend you first build a project with the Actuator (e.g. the
 getting started project from the main README), and then try each
 feature in turn there.
 
-TODO: some of these are features of Spring Zero (or
+TODO: some of these are features of Spring Bootstrap (or
 `SpringApplication`) not the Actuator.
 
 TODO: group things together and break them out into separate files.
@@ -33,7 +33,7 @@ The default value comes after the first colon (":").
 
 ## Externalized Configuration
 
-In addition to command line option arguments, Spring Zero will
+In addition to command line option arguments, Spring Bootstrap will
 pick up a file called `application.properties` in the root of your
 classpath (if there is one) and add those properties to the Spring
 `Environment`.  The search path for `application.properties` is
@@ -49,7 +49,7 @@ previously defined values (e.g. from System properties), e.g.
     app.name: MyApp
     app.description: ${app.name} is a Cool New App
 
-Spring Zero also binds the properties to any bean in your
+Spring Bootstrap also binds the properties to any bean in your
 application context whose type is `@ConfigurationProperties`.  The
 Actuator provides some of those beans out of the box, so you can
 easily customize server and management properties (ports etc.),
@@ -63,7 +63,7 @@ configuration and make it only available in certain environments.  Any
 `@Component` that is marked with `@Profile` will only be loaded in the
 profile specified by the latter annotation.
 
-Spring Zero takes it a stage further.  If you include in your
+Spring Bootstap takes it a stage further.  If you include in your
 `application.properties` a value for a property named
 `spring.active.profiles` then those profiles will be active by
 default.  E.g.
@@ -72,7 +72,7 @@ default.  E.g.
 
 ## Profile-dependent configuration
 
-Spring Zero loads additional properties files if there are active
+Spring Bootstrap loads additional properties files if there are active
 profiles using a naming convention `application-{profile}.properties`.
 Property values from those files override trhe default ones.
 
@@ -98,7 +98,7 @@ to one of your `@Configuration` (or `@Component`) classes.  Then you can
 
 in any of your component classes to grab that configuration and use it.
 
-Spring Zero uses some relaxed rules for binding `Environment`
+Spring Bootstrap uses some relaxed rules for binding `Environment`
 properties to `@ConfigurationProperties` beans, so there doesn't need
 to be an exact match between the `Environment` property name and the
 bean property name.  Common examples where this is useful include
@@ -137,7 +137,7 @@ compiler or IDE.
 
 YAML is a superset of JSON, and as such is a very convenient format
 for specifying hierarchical configuration data, such as that supported
-by Spring Zero Actuator.  If you prefer to use
+by Spring Actuator.  If you prefer to use
 [YAML](http://yaml.org) instead of Properties files you just need to
 include a file called `application.yml` in the root of your classpath
 
@@ -212,7 +212,7 @@ properties in the application properties (see
 * To enable the Tomcat access log valve (very common in production environments)
 
 More fine-grained control of the Tomcat container is available if you
-need it.  Instead of letting Spring Zero create the container for
+need it.  Instead of letting Spring Actuator create the container for
 you, just create a bean of type
 `TomcatEmbeddedServletContainerFactory` and override one of its
 methods, or inject some customizations, e.g.
@@ -256,7 +256,7 @@ this.
 
 ## Customizing Logging
 
-Spring Zero uses SLF4J for logging, but leaves the implementation
+Spring Actuator uses SLF4J for logging, but leaves the implementation
 open.  The Starter projects and the Actuator use JDK native logging by
 default, purely because it is always available.  A default
 configuration file is provided for JDK logging, and also for log4j and
@@ -286,11 +286,11 @@ from the Spring `Environment` to System properties:
 
 All the logging systems supported can consult System properties when
 parsing their configuration files.  See the default configurations in
-`spring-zero-core.jar` for examples.
+`spring-bootstrap.jar` for examples.
 
 ## Application Context Initializers
 
-To add additional application context initializers to the Zero
+To add additional application context initializers to the bootstrap
 startup process, add a comma-delimited list of class names to the
 `Environment` property `context.initializer.classes` (can be specified
 via `application.properties`).

spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit;
+package org.springframework.actuate.audit;
 
 import java.io.Serializable;
 import java.util.Collections;

spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit;
+package org.springframework.actuate.audit;
 
 import java.util.Date;
 import java.util.List;

spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java

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

spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit.listener;
+package org.springframework.actuate.audit.listener;
 
 import java.util.Date;
 import java.util.Map;
 
+import org.springframework.actuate.audit.AuditEvent;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.util.Assert;
-import org.springframework.zero.actuate.audit.AuditEvent;
 
 /**
  * Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s.

spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit.listener;
+package org.springframework.actuate.audit.listener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.AuditEventRepository;
 import org.springframework.context.ApplicationListener;
-import org.springframework.zero.actuate.audit.AuditEvent;
-import org.springframework.zero.actuate.audit.AuditEventRepository;
 
 /**
  * {@link ApplicationListener} that listens for {@link AuditEvent}s and stores them in a

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
+import org.springframework.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.AuditEventRepository;
+import org.springframework.actuate.audit.InMemoryAuditEventRepository;
+import org.springframework.actuate.audit.listener.AuditListener;
+import org.springframework.actuate.security.AuthenticationAuditListener;
+import org.springframework.actuate.security.AuthorizationAuditListener;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.audit.AuditEvent;
-import org.springframework.zero.actuate.audit.AuditEventRepository;
-import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository;
-import org.springframework.zero.actuate.audit.listener.AuditListener;
-import org.springframework.zero.actuate.security.AuthenticationAuditListener;
-import org.springframework.zero.actuate.security.AuthorizationAuditListener;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s.

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java

@@ -14,40 +14,40 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Properties;
 
+import org.springframework.actuate.endpoint.BeansEndpoint;
+import org.springframework.actuate.endpoint.DumpEndpoint;
+import org.springframework.actuate.endpoint.Endpoint;
+import org.springframework.actuate.endpoint.EnvironmentEndpoint;
+import org.springframework.actuate.endpoint.HealthEndpoint;
+import org.springframework.actuate.endpoint.InfoEndpoint;
+import org.springframework.actuate.endpoint.MetricsEndpoint;
+import org.springframework.actuate.endpoint.PublicMetrics;
+import org.springframework.actuate.endpoint.ShutdownEndpoint;
+import org.springframework.actuate.endpoint.TraceEndpoint;
+import org.springframework.actuate.endpoint.VanillaPublicMetrics;
+import org.springframework.actuate.health.HealthIndicator;
+import org.springframework.actuate.health.VanillaHealthIndicator;
+import org.springframework.actuate.metrics.InMemoryMetricRepository;
+import org.springframework.actuate.metrics.MetricRepository;
+import org.springframework.actuate.trace.InMemoryTraceRepository;
+import org.springframework.actuate.trace.TraceRepository;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.bootstrap.bind.PropertiesConfigurationFactory;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.StandardEnvironment;
 import org.springframework.core.io.Resource;
 import org.springframework.core.io.support.PropertiesLoaderUtils;
-import org.springframework.zero.actuate.endpoint.BeansEndpoint;
-import org.springframework.zero.actuate.endpoint.DumpEndpoint;
-import org.springframework.zero.actuate.endpoint.Endpoint;
-import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint;
-import org.springframework.zero.actuate.endpoint.HealthEndpoint;
-import org.springframework.zero.actuate.endpoint.InfoEndpoint;
-import org.springframework.zero.actuate.endpoint.MetricsEndpoint;
-import org.springframework.zero.actuate.endpoint.PublicMetrics;
-import org.springframework.zero.actuate.endpoint.ShutdownEndpoint;
-import org.springframework.zero.actuate.endpoint.TraceEndpoint;
-import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics;
-import org.springframework.zero.actuate.health.HealthIndicator;
-import org.springframework.zero.actuate.health.VanillaHealthIndicator;
-import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
-import org.springframework.zero.actuate.metrics.MetricRepository;
-import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
-import org.springframework.zero.actuate.trace.TraceRepository;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.bind.PropertiesConfigurationFactory;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for common management

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java

@@ -14,14 +14,27 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import javax.servlet.Servlet;
 
+import org.springframework.actuate.endpoint.Endpoint;
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter;
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
+import org.springframework.actuate.properties.ManagementServerProperties;
+import org.springframework.autoconfigure.AutoConfigureAfter;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
+import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.autoconfigure.web.WebMvcAutoConfiguration;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
+import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
+import org.springframework.bootstrap.context.embedded.properties.ServerProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ApplicationListener;
@@ -31,19 +44,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.event.ContextClosedEvent;
 import org.springframework.context.event.ContextRefreshedEvent;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.zero.actuate.endpoint.Endpoint;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.autoconfigure.AutoConfigureAfter;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
-import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
-import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
-import org.springframework.zero.context.embedded.properties.ServerProperties;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java

@@ -14,27 +14,27 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import javax.servlet.Filter;
 
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter;
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
+import org.springframework.actuate.properties.ManagementServerProperties;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.bootstrap.context.condition.ConditionalOnBean;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.HandlerAdapter;
 import org.springframework.web.servlet.HandlerMapping;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.context.condition.ConditionalOnBean;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.EmbeddedServletContainer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
 
 /**
  * Configuration for triggered from {@link EndpointWebMvcAutoConfiguration} when a new

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java

@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import javax.servlet.Servlet;
 
+import org.springframework.actuate.web.BasicErrorController;
+import org.springframework.actuate.web.ErrorController;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
+import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.bootstrap.context.embedded.ErrorPage;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.zero.actuate.web.BasicErrorController;
-import org.springframework.zero.actuate.web.ErrorController;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
-import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.zero.context.embedded.ErrorPage;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} to render errors via a MVC error

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
+import org.springframework.actuate.properties.ManagementServerProperties;
+import org.springframework.autoconfigure.AutoConfigureAfter;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
+import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.autoconfigure.AutoConfigureAfter;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for the
@@ -36,7 +36,7 @@ import org.springframework.zero.context.properties.EnableConfigurationProperties
 @EnableConfigurationProperties
 public class ManagementServerPropertiesAutoConfiguration {
 
-	@Bean(name = "org.springframework.zero.actuate.properties.ManagementServerProperties")
+	@Bean(name = "org.springframework.actuate.properties.ManagementServerProperties")
 	@ConditionalOnMissingBean
 	public ManagementServerProperties serverProperties() {
 		return new ManagementServerProperties();

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import java.io.IOException;
 
@@ -27,7 +27,13 @@ import javax.servlet.ServletResponse;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.springframework.actuate.metrics.CounterService;
+import org.springframework.actuate.metrics.GaugeService;
+import org.springframework.autoconfigure.AutoConfigureAfter;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.bootstrap.context.condition.ConditionalOnBean;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
@@ -35,12 +41,6 @@ import org.springframework.core.annotation.Order;
 import org.springframework.util.StopWatch;
 import org.springframework.web.filter.GenericFilterBean;
 import org.springframework.web.util.UrlPathHelper;
-import org.springframework.zero.actuate.metrics.CounterService;
-import org.springframework.zero.actuate.metrics.GaugeService;
-import org.springframework.zero.autoconfigure.AutoConfigureAfter;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnBean;
-import org.springframework.zero.context.condition.ConditionalOnClass;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
+import org.springframework.actuate.metrics.CounterService;
+import org.springframework.actuate.metrics.DefaultCounterService;
+import org.springframework.actuate.metrics.DefaultGaugeService;
+import org.springframework.actuate.metrics.GaugeService;
+import org.springframework.actuate.metrics.InMemoryMetricRepository;
+import org.springframework.actuate.metrics.MetricRepository;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.metrics.CounterService;
-import org.springframework.zero.actuate.metrics.DefaultCounterService;
-import org.springframework.zero.actuate.metrics.DefaultGaugeService;
-import org.springframework.zero.actuate.metrics.GaugeService;
-import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
-import org.springframework.zero.actuate.metrics.MetricRepository;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for metrics services.

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java

@@ -14,13 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import org.springframework.actuate.endpoint.Endpoint;
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
+import org.springframework.actuate.properties.SecurityProperties;
+import org.springframework.actuate.web.ErrorController;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
@@ -37,14 +45,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint;
-import org.springframework.zero.actuate.endpoint.Endpoint;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
-import org.springframework.zero.actuate.properties.SecurityProperties;
-import org.springframework.zero.actuate.web.ErrorController;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or
@@ -84,7 +84,7 @@ import org.springframework.zero.context.properties.EnableConfigurationProperties
 @EnableConfigurationProperties
 public class SecurityAutoConfiguration {
 
-	@Bean(name = "org.springframework.zero.actuate.properties.SecurityProperties")
+	@Bean(name = "org.springframework.actuate.properties.SecurityProperties")
 	@ConditionalOnMissingBean
 	public SecurityProperties securityProperties() {
 		return new SecurityProperties();

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
+import org.springframework.actuate.trace.InMemoryTraceRepository;
+import org.springframework.actuate.trace.TraceRepository;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
-import org.springframework.zero.actuate.trace.TraceRepository;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}.

spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java

@@ -14,20 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import javax.servlet.Servlet;
 
+import org.springframework.actuate.trace.TraceRepository;
+import org.springframework.actuate.trace.WebRequestTraceFilter;
+import org.springframework.autoconfigure.AutoConfigureAfter;
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.web.servlet.DispatcherServlet;
-import org.springframework.zero.actuate.trace.TraceRepository;
-import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
-import org.springframework.zero.autoconfigure.AutoConfigureAfter;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnClass;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter

spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;

spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 /**
  * Tagging interface used to indicate that {@link Endpoint} that performs some action.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import org.springframework.beans.BeansException;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.support.LiveBeansView;
 import org.springframework.core.env.Environment;
 import org.springframework.http.MediaType;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * Exposes JSON view of Spring beans. If the {@link Environment} contains a key setting

spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.lang.management.ManagementFactory;
 import java.lang.management.ThreadInfo;
 import java.util.Arrays;
 import java.util.List;
 
-import org.springframework.zero.context.properties.ConfigurationProperties;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose thread info.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import org.springframework.http.MediaType;
 

spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.context.EnvironmentAware;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.EnumerablePropertySource;
 import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 import org.springframework.core.env.StandardEnvironment;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
+import org.springframework.actuate.health.HealthIndicator;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
-import org.springframework.zero.actuate.health.HealthIndicator;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose application health.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose arbitrary application information.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
 
+import org.springframework.actuate.metrics.Metric;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
-import org.springframework.zero.actuate.metrics.Metric;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose {@link PublicMetrics}.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collection;
 
-import org.springframework.zero.actuate.metrics.Metric;
+import org.springframework.actuate.metrics.Metric;
 
 /**
  * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collections;
 import java.util.Map;
 
+import org.springframework.actuate.properties.ManagementServerProperties;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link ActionEndpoint} to shutdown the {@link ApplicationContext}.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.List;
 
+import org.springframework.actuate.trace.Trace;
+import org.springframework.actuate.trace.TraceRepository;
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.util.Assert;
-import org.springframework.zero.actuate.trace.Trace;
-import org.springframework.zero.actuate.trace.TraceRepository;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * {@link Endpoint} to expose {@link Trace} information.

spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collection;
 import java.util.LinkedHashSet;
 
+import org.springframework.actuate.metrics.Metric;
+import org.springframework.actuate.metrics.MetricRepository;
 import org.springframework.util.Assert;
-import org.springframework.zero.actuate.metrics.Metric;
-import org.springframework.zero.actuate.metrics.MetricRepository;
 
 /**
  * Default implementation of {@link PublicMetrics} that exposes all metrics from the

spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint.mvc;
+package org.springframework.actuate.endpoint.mvc;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.springframework.actuate.endpoint.Endpoint;
 import org.springframework.http.MediaType;
 import org.springframework.http.converter.HttpMessageConverter;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
@@ -39,7 +40,6 @@ import org.springframework.web.servlet.HandlerAdapter;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 import org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor;
-import org.springframework.zero.actuate.endpoint.Endpoint;
 
 import com.fasterxml.jackson.databind.SerializationFeature;
 

spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint.mvc;
+package org.springframework.actuate.endpoint.mvc;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,6 +23,8 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.actuate.endpoint.ActionEndpoint;
+import org.springframework.actuate.endpoint.Endpoint;
 import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.ApplicationContext;
@@ -32,8 +34,6 @@ import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.HandlerExecutionChain;
 import org.springframework.web.servlet.HandlerMapping;
 import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping;
-import org.springframework.zero.actuate.endpoint.ActionEndpoint;
-import org.springframework.zero.actuate.endpoint.Endpoint;
 
 /**
  * {@link HandlerMapping} to map {@link Endpoint}s to URLs via {@link Endpoint#getPath()}.

spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.fixme;
+package org.springframework.actuate.fixme;
 
 import java.io.IOException;
 
@@ -24,10 +24,20 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.springframework.actuate.properties.ManagementServerProperties;
+import org.springframework.actuate.web.BasicErrorController;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.HierarchicalBeanFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.bootstrap.context.condition.ConditionalOnBean;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.ErrorPage;
+import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -36,16 +46,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.web.filter.GenericFilterBean;
 import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.config.annotation.EnableWebMvc;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.actuate.web.BasicErrorController;
-import org.springframework.zero.context.condition.ConditionalOnBean;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.ErrorPage;
-import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 
 /**
  * Configuration for creating a new container (e.g. tomcat) for the management endpoints.

spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.health;
+package org.springframework.actuate.health;
 
 /**
  * Strategy interface used to provide an indication of application health.

spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.health;
+package org.springframework.actuate.health;
 
 /**
  * Default implementation of {@link HealthIndicator} that simply returns "ok".

spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 /**
  * A service that can be used to increment, decrement and reset a {@link Metric}.

spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import java.util.Date;
 

spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import java.util.Date;
 

spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 /**
  * A service that can be used to manage a {@link Metric} as a gauge.

spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java

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

spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import java.util.Date;
 

spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;

spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import java.util.Collection;
 import java.util.Date;

spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java

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

spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.properties;
+package org.springframework.actuate.properties;
 
+import org.springframework.bootstrap.context.properties.ConfigurationProperties;
 import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy;
-import org.springframework.zero.context.properties.ConfigurationProperties;
 
 /**
  * Properties for the security aspects of an application.

spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.security;
+package org.springframework.actuate.security;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.listener.AuditApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.security.authentication.event.AbstractAuthenticationEvent;
 import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent;
 import org.springframework.security.web.authentication.switchuser.AuthenticationSwitchUserEvent;
-import org.springframework.zero.actuate.audit.AuditEvent;
-import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent;
 
 /**
  * {@link ApplicationListener} expose Spring Security {@link AbstractAuthenticationEvent

spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java

@@ -14,19 +14,19 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.security;
+package org.springframework.actuate.security;
 
 import java.util.HashMap;
 import java.util.Map;
 
+import org.springframework.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.listener.AuditApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationEventPublisherAware;
 import org.springframework.context.ApplicationListener;
 import org.springframework.security.access.event.AbstractAuthorizationEvent;
 import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent;
 import org.springframework.security.access.event.AuthorizationFailureEvent;
-import org.springframework.zero.actuate.audit.AuditEvent;
-import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent;
 
 /**
  * {@link ApplicationListener} expose Spring Security {@link AbstractAuthorizationEvent

spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java

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

spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java

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

spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java

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

spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.trace;
+package org.springframework.actuate.trace;
 
 import java.io.IOException;
 import java.util.Collections;

spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.web;
+package org.springframework.actuate.web;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
-import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory;
 
 /**
  * Basic global error {@link Controller}, rendering servlet container error codes and

spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.web;
+package org.springframework.actuate.web;
 
 import org.springframework.stereotype.Controller;
 

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

@@ -1,11 +1,11 @@
-org.springframework.zero.autoconfigure.EnableAutoConfiguration=\
+org.springframework.autoconfigure.EnableAutoConfiguration=\
-org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\
+org.springframework.actuate.autoconfigure.AuditAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\
+org.springframework.actuate.autoconfigure.EndpointAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
+org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.ErrorMvcAutoConfiguration,\
+org.springframework.actuate.autoconfigure.ErrorMvcAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
+org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration,\
+org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
+org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration,\
+org.springframework.actuate.autoconfigure.SecurityAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
+org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\
-org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration
+org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration

spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit;
+package org.springframework.actuate.audit;
 
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.AuditEvent;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit;
+package org.springframework.actuate.audit;
 
 import java.util.Date;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.AuditEvent;
-import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository;
+import org.springframework.actuate.audit.InMemoryAuditEventRepository;
 
 import static org.junit.Assert.assertEquals;
 

spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java

@@ -14,13 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.audit.listener;
+package org.springframework.actuate.audit.listener;
 
 import java.util.Collections;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.audit.AuditEvent;
+import org.springframework.actuate.audit.AuditEvent;
-import org.springframework.zero.actuate.audit.AuditEventRepository;
+import org.springframework.actuate.audit.AuditEventRepository;
+import org.springframework.actuate.audit.listener.AuditApplicationEvent;
+import org.springframework.actuate.audit.listener.AuditListener;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Test;
+import org.springframework.actuate.audit.AuditEventRepository;
+import org.springframework.actuate.audit.InMemoryAuditEventRepository;
+import org.springframework.actuate.autoconfigure.AuditAutoConfiguration;
+import org.springframework.actuate.security.AuthenticationAuditListener;
+import org.springframework.actuate.security.AuthorizationAuditListener;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.audit.AuditEventRepository;
-import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository;
-import org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration;
-import org.springframework.zero.actuate.security.AuthenticationAuditListener;
-import org.springframework.zero.actuate.security.AuthorizationAuditListener;
 
 import static org.hamcrest.Matchers.instanceOf;
 import static org.junit.Assert.assertNotNull;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java

@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.EndpointAutoConfiguration;
+import org.springframework.actuate.endpoint.BeansEndpoint;
+import org.springframework.actuate.endpoint.DumpEndpoint;
+import org.springframework.actuate.endpoint.EnvironmentEndpoint;
+import org.springframework.actuate.endpoint.HealthEndpoint;
+import org.springframework.actuate.endpoint.InfoEndpoint;
+import org.springframework.actuate.endpoint.MetricsEndpoint;
+import org.springframework.actuate.endpoint.ShutdownEndpoint;
+import org.springframework.actuate.endpoint.TraceEndpoint;
+import org.springframework.bootstrap.TestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.zero.TestUtils;
-import org.springframework.zero.actuate.endpoint.BeansEndpoint;
-import org.springframework.zero.actuate.endpoint.DumpEndpoint;
-import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint;
-import org.springframework.zero.actuate.endpoint.HealthEndpoint;
-import org.springframework.zero.actuate.endpoint.InfoEndpoint;
-import org.springframework.zero.actuate.endpoint.MetricsEndpoint;
-import org.springframework.zero.actuate.endpoint.ShutdownEndpoint;
-import org.springframework.zero.actuate.endpoint.TraceEndpoint;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import java.io.FileNotFoundException;
 import java.net.SocketException;
@@ -23,6 +23,17 @@ import java.nio.charset.Charset;
 
 import org.junit.After;
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration;
+import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration;
+import org.springframework.actuate.endpoint.AbstractEndpoint;
+import org.springframework.actuate.endpoint.Endpoint;
+import org.springframework.actuate.properties.ManagementServerProperties;
+import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
+import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration;
+import org.springframework.autoconfigure.web.WebMvcAutoConfiguration;
+import org.springframework.bootstrap.TestUtils;
+import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
@@ -33,15 +44,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.util.StreamUtils;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.zero.TestUtils;
-import org.springframework.zero.actuate.endpoint.AbstractEndpoint;
-import org.springframework.zero.actuate.endpoint.Endpoint;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
-import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration;
-import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration;
-import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration;
-import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java

@@ -14,13 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration;
+import org.springframework.actuate.properties.ManagementServerProperties;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import javax.servlet.Filter;
 import javax.servlet.FilterChain;
@@ -22,14 +22,14 @@ import javax.servlet.FilterChain;
 import org.junit.Test;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
+import org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration;
+import org.springframework.actuate.metrics.CounterService;
+import org.springframework.actuate.metrics.GaugeService;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration;
-import org.springframework.zero.actuate.metrics.CounterService;
-import org.springframework.zero.actuate.metrics.GaugeService;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration;
+import org.springframework.actuate.metrics.CounterService;
+import org.springframework.actuate.metrics.DefaultCounterService;
+import org.springframework.actuate.metrics.DefaultGaugeService;
+import org.springframework.actuate.metrics.GaugeService;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration;
-import org.springframework.zero.actuate.metrics.CounterService;
-import org.springframework.zero.actuate.metrics.DefaultCounterService;
-import org.springframework.zero.actuate.metrics.DefaultGaugeService;
-import org.springframework.zero.actuate.metrics.GaugeService;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertNotNull;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java

@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.EndpointAutoConfiguration;
+import org.springframework.actuate.autoconfigure.SecurityAutoConfiguration;
+import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.mock.web.MockServletContext;
@@ -25,9 +28,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
-import org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration;
-import org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration;
-import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
+import org.springframework.actuate.trace.InMemoryTraceRepository;
+import org.springframework.actuate.trace.TraceRepository;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
-import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
-import org.springframework.zero.actuate.trace.TraceRepository;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertNotNull;

spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.autoconfigure;
+package org.springframework.actuate.autoconfigure;
 
 import org.junit.Test;
+import org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
+import org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration;
+import org.springframework.actuate.trace.WebRequestTraceFilter;
+import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-import org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration;
-import org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration;
-import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
-import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration;
 
 import static org.junit.Assert.assertNotNull;
 

spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java

@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collections;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.actuate.endpoint.Endpoint;
+import org.springframework.bootstrap.TestUtils;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.PropertySource;
 import org.springframework.http.MediaType;
-import org.springframework.zero.TestUtils;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.BeansEndpoint;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
-import org.springframework.zero.actuate.endpoint.BeansEndpoint;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.containsString;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.lang.management.ThreadInfo;
 import java.util.List;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.DumpEndpoint;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.DumpEndpoint;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.EnvironmentEndpoint;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.greaterThan;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.HealthEndpoint;
+import org.springframework.actuate.health.HealthIndicator;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.HealthEndpoint;
-import org.springframework.zero.actuate.health.HealthIndicator;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.InfoEndpoint;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.InfoEndpoint;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collection;
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.MetricsEndpoint;
+import org.springframework.actuate.endpoint.PublicMetrics;
+import org.springframework.actuate.metrics.Metric;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.MetricsEndpoint;
-import org.springframework.zero.actuate.endpoint.PublicMetrics;
-import org.springframework.zero.actuate.metrics.Metric;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.ShutdownEndpoint;
+import org.springframework.actuate.properties.ManagementServerProperties;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.ShutdownEndpoint;
-import org.springframework.zero.actuate.properties.ManagementServerProperties;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.startsWith;
 import static org.junit.Assert.assertFalse;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.TraceEndpoint;
+import org.springframework.actuate.trace.InMemoryTraceRepository;
+import org.springframework.actuate.trace.Trace;
+import org.springframework.actuate.trace.TraceRepository;
+import org.springframework.bootstrap.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.actuate.endpoint.TraceEndpoint;
-import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
-import org.springframework.zero.actuate.trace.Trace;
-import org.springframework.zero.actuate.trace.TraceRepository;
-import org.springframework.zero.context.properties.EnableConfigurationProperties;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint;
+package org.springframework.actuate.endpoint;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics;
+import org.springframework.actuate.endpoint.VanillaPublicMetrics;
-import org.springframework.zero.actuate.metrics.InMemoryMetricRepository;
+import org.springframework.actuate.metrics.InMemoryMetricRepository;
-import org.springframework.zero.actuate.metrics.Metric;
+import org.springframework.actuate.metrics.Metric;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint.mvc;
+package org.springframework.actuate.endpoint.mvc;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.endpoint.Endpoint;
+import org.springframework.actuate.endpoint.Endpoint;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter;
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;

spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.endpoint.mvc;
+package org.springframework.actuate.endpoint.mvc;
 
 import java.util.Arrays;
 
 import org.junit.Test;
+import org.springframework.actuate.endpoint.AbstractEndpoint;
+import org.springframework.actuate.endpoint.ActionEndpoint;
+import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.zero.actuate.endpoint.AbstractEndpoint;
-import org.springframework.zero.actuate.endpoint.ActionEndpoint;
-import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.nullValue;

spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.fixme;
+package org.springframework.actuate.fixme;
 
 /**
  * @author Dave Syer

spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java

@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.health;
+package org.springframework.actuate.health;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.health.VanillaHealthIndicator;
+import org.springframework.actuate.health.VanillaHealthIndicator;
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.junit.Assert.assertThat;

spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.zero.actuate.metrics.DefaultCounterService;
+import org.springframework.actuate.metrics.DefaultCounterService;
 
 import static org.junit.Assert.fail;
 

spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.zero.actuate.metrics.DefaultGaugeService;
+import org.springframework.actuate.metrics.DefaultGaugeService;
 
 import static org.junit.Assert.fail;
 

spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java

@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.metrics;
+package org.springframework.actuate.metrics;
 
 import org.junit.Ignore;
 import org.junit.Test;
+import org.springframework.actuate.metrics.InMemoryMetricRepository;
 
 import static org.junit.Assert.fail;
 

spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.properties;
+package org.springframework.actuate.properties;
 
 import java.util.Collections;
 
 import org.junit.Test;
+import org.springframework.actuate.properties.SecurityProperties;
 import org.springframework.beans.MutablePropertyValues;
+import org.springframework.bootstrap.bind.RelaxedDataBinder;
 import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.zero.actuate.properties.SecurityProperties;
-import org.springframework.zero.bind.RelaxedDataBinder;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;

spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.security;
+package org.springframework.actuate.security;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.zero.actuate.security.AuthenticationAuditListener;
+import org.springframework.actuate.security.AuthenticationAuditListener;
 
 import static org.junit.Assert.fail;
 

spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.security;
+package org.springframework.actuate.security;
 
 import org.junit.Ignore;
 import org.junit.Test;
-import org.springframework.zero.actuate.security.AuthenticationAuditListener;
+import org.springframework.actuate.security.AuthenticationAuditListener;
 
 import static org.junit.Assert.fail;
 

spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.trace;
+package org.springframework.actuate.trace;
 
 import java.util.Collections;
 import java.util.List;
 
 import org.junit.Test;
-import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
+import org.springframework.actuate.trace.InMemoryTraceRepository;
-import org.springframework.zero.actuate.trace.Trace;
+import org.springframework.actuate.trace.Trace;
 
 import static org.junit.Assert.assertEquals;
 

spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.actuate.trace;
+package org.springframework.actuate.trace;
 
 import java.util.Map;
 
 import org.junit.Test;
+import org.springframework.actuate.trace.InMemoryTraceRepository;
+import org.springframework.actuate.trace.WebRequestTraceFilter;
 import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.zero.actuate.trace.InMemoryTraceRepository;
-import org.springframework.zero.actuate.trace.WebRequestTraceFilter;
 
 import static org.junit.Assert.assertEquals;
 

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java

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

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java

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

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java

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

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java

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

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure;
+package org.springframework.autoconfigure;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
@@ -22,15 +22,15 @@ import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
+import org.springframework.bootstrap.context.condition.ConditionalOnBean;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
+import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory;
+import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 import org.springframework.core.io.support.SpringFactoriesLoader;
-import org.springframework.zero.context.condition.ConditionalOnBean;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
-import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory;
-import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory;
 
 /**
  * Enable auto-configuration of the Spring Application Context, attempting to guess and

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java

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

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure;
+package org.springframework.autoconfigure;
 
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}.

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure;
+package org.springframework.autoconfigure;
 
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.support.PropertySourcesPlaceholderConfigurer;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java

@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure.batch;
+package org.springframework.autoconfigure.batch;
 
+import org.springframework.autoconfigure.EnableAutoConfiguration;
 import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.bootstrap.CommandLineRunner;
+import org.springframework.bootstrap.ExitCodeGenerator;
+import org.springframework.bootstrap.context.condition.ConditionalOnBean;
+import org.springframework.bootstrap.context.condition.ConditionalOnClass;
+import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.zero.CommandLineRunner;
-import org.springframework.zero.ExitCodeGenerator;
-import org.springframework.zero.autoconfigure.EnableAutoConfiguration;
-import org.springframework.zero.context.condition.ConditionalOnBean;
-import org.springframework.zero.context.condition.ConditionalOnClass;
-import org.springframework.zero.context.condition.ConditionalOnMissingBean;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Spring Batch.

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure.batch;
+package org.springframework.autoconfigure.batch;
 
 import javax.annotation.PostConstruct;
 import javax.sql.DataSource;

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure.batch;
+package org.springframework.autoconfigure.batch;
 
 import org.springframework.batch.core.JobExecution;
 import org.springframework.context.ApplicationEvent;

spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package org.springframework.zero.autoconfigure.batch;
+package org.springframework.autoconfigure.batch;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.springframework.batch.core.JobExecution;
+import org.springframework.bootstrap.ExitCodeGenerator;
 import org.springframework.context.ApplicationListener;
-import org.springframework.zero.ExitCodeGenerator;
 
 /**
  * {@link ExitCodeGenerator} for {@link JobExecutionEvent}s.