diff --git a/spring-actuator/docs/Features.md b/spring-actuator/docs/Features.md index e2aa542a012..e84748eb8fa 100644 --- a/spring-actuator/docs/Features.md +++ b/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 -Actuator with some commentary to help you start using them. We +Here are some (most, hopefully all) the features of Spring Actuator +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`). diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java index 61561a753b2..73b26542470 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java index 6349f6ae7b8..874fdbb7dd9 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java index 5a564094d68..399863364be 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java index a2034b8f60e..2fe8910e3c0 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java similarity index 88% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java index 8f1707c86f2..78c07fdad0d 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java similarity index 73% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java index a502a954e89..22fd35ec0a1 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java similarity index 78% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java index daed4987a74..0c1c56404c2 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 84% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 7064f240c2c..a2ce8775e2e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 82% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index e5b4e23a7b0..96d9948346e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 69% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index 6fc8c40d37b..0f77f010a3d 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 66% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index a91a51e057e..cda2d971b09 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/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(); diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 5c883c2ff80..1ff656bd446 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 68% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index ec3b14cc81c..ae9132b1682 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java similarity index 91% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java index 27f7350fe61..9a3ad6b6bbe 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/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(); diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 75% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index ecdc89e308c..bedc829059f 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/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}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 80% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index 79a25fd5fc6..81efc9ed0e0 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java index 7294fbfaded..86bb2d551d0 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java index 373e99fa40d..2c7139de7b1 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java index c23bd42cfff..c71b513e0ca 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java index d7a809513a9..754c2078f3f 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java index fde590ffd44..a1770d22248 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java index 5dd0f88a719..42e09427a6a 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java similarity index 87% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java index 17cb85ca32a..0da4f1e6b3e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java index 4545b893416..701dd82e35c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java index 799222f350a..508fa696077 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java +++ b/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}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java index fa6101321a6..72836aef623 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java +++ b/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}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java index ec9e8092bb8..7a10b7684e0 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java +++ b/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}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java similarity index 84% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java index a471f2eb9cb..3fdbc9acbbd 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java index b2f3dab66eb..44fcf1f0715 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java index 1691cf06864..c7984ae2b45 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java index ea2f38a1ad5..b37634c9941 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/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()}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java similarity index 83% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java index 777af6fe6f5..bfcd5a159d6 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java b/spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java rename to spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java index ddfc96aea2a..11e85dd672d 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java b/spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java rename to spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java index 32369f8be03..968a6249a9a 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java +++ b/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". diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java index 59fc685be9a..a42d0012665 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java +++ b/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}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java index bdb9110aa93..973dd0b54fa 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java index 1b47d4d63a2..39cb28733da 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java index ec22869dc3c..c682a2c9a48 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java index 3c11311a4cb..7480b479865 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java index 32e0327fa1d..653707da9ef 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java index 9726fb07aab..2250a3f9a1b 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java index afc746cb43a..291cc13b29b 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java b/spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java rename to spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java index cc0bd0e0f45..86429bbd01e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java +++ b/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.zero.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; /** * Properties for the management server (e.g. port and path settings). diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java b/spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java rename to spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java index d2ec43191d2..ca866889a6c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java +++ b/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. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java b/spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java rename to spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java index 57b45583cda..ecf10b7bd2c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java b/spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java similarity index 93% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java rename to spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java index 5723a5e5df6..f0df73c7bb5 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java index 01067ea38d8..16b3aa61c5b 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java index 090aa729839..bfa9951e9c3 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java index 3eac458ce9f..eb93239c770 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java index 19e87b8e6d8..d3543cefa5f 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java +++ b/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; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java b/spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java rename to spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java index a88d145daa7..5929cae533f 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java +++ b/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 diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java b/spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java rename to spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java index 372fc25ee9a..f9952eb41ad 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java +++ b/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; diff --git a/spring-actuator/src/main/resources/META-INF/spring.factories b/spring-actuator/src/main/resources/META-INF/spring.factories index 0448f3aa7bc..0c8c1c617e8 100644 --- a/spring-actuator/src/main/resources/META-INF/spring.factories +++ b/spring-actuator/src/main/resources/META-INF/spring.factories @@ -1,11 +1,11 @@ -org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ -org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration +org.springframework.autoconfigure.EnableAutoConfiguration=\ +org.springframework.actuate.autoconfigure.AuditAutoConfiguration,\ +org.springframework.actuate.autoconfigure.EndpointAutoConfiguration,\ +org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ +org.springframework.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ +org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ +org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration,\ +org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ +org.springframework.actuate.autoconfigure.SecurityAutoConfiguration,\ +org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ +org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java b/spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java similarity index 93% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java index 3016173ed9d..114adff90e3 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java index 9cbe0b89636..f35d85aee14 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/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.zero.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.InMemoryAuditEventRepository; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java index 8ea87c33370..5ffdba06503 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java +++ b/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.zero.actuate.audit.AuditEventRepository; +import org.springframework.actuate.audit.AuditEvent; +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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java similarity index 83% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java index e5b3df9e671..9718dc805bb 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java index b78a7b97813..debfb531fc5 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 4085fe94793..66d3862a7f2 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 90% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index ab5e6bb75da..65893ef8e97 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 91% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index e29e8cd3409..cec7a2cd99e 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 83% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java index b5c2cdb618d..672d4a69e92 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java similarity index 90% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java index 12ee2232a09..1a82a5d4568 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java index a35ae93c4c3..fb4f41f0277 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 76% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java index 1272bf2302b..6dca0c1a765 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java similarity index 95% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java index 9c17c70e3e2..080b1763545 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java index e921cc3c0a9..deda3e4afeb 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java index a48fe34f97c..481ab9fc7ef 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java index bd88a88a868..f4cf456cbb5 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java similarity index 85% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java index cc7f70b7c21..42c9d655a67 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java index eb6a1319333..955331a031e 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java similarity index 84% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java index a9c5aa4f4c1..aae788d7346 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java index e97d2285bd5..babc5507cd7 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java index e8691659c28..092cbb5b1a2 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java similarity index 85% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java index 982b41d4a8c..dcada6d2ca1 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java +++ b/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.zero.actuate.metrics.InMemoryMetricRepository; -import org.springframework.zero.actuate.metrics.Metric; +import org.springframework.actuate.endpoint.VanillaPublicMetrics; +import org.springframework.actuate.metrics.InMemoryMetricRepository; +import org.springframework.actuate.metrics.Metric; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 86% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java index 3b044d8c41a..4d0e3d3736a 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java +++ b/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.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 93% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java index d587765a954..7f2012467e0 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java similarity index 96% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java index d0a182aaa08..069572ffae1 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java +++ b/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 diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java b/spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java index b1afb330799..bb028061046 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java b/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java index 19bfaffca0d..096cd82772e 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java b/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java index 35d09982e69..11a83466ba6 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java index 89cd71d3446..bea311bea42 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java b/spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java similarity index 91% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java index 083b4464fd3..8f4bd1ba5f4 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java index 01828be482d..cf453a13835 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java index 227d1832215..5de62f12e52 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java +++ b/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; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java index 67cf674a343..1b134e17fa8 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/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.zero.actuate.trace.Trace; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.Trace; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java b/spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java index 644c354c2c3..94abd500f88 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java similarity index 99% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java index 6655d71525c..6bb5e6c25bc 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java index d3cc9d24643..703237db73d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java similarity index 95% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java index bbb37370024..41262f74bc9 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java similarity index 99% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java index 5dcbe71f223..6f4ce56f6b8 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java similarity index 85% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java index 7c98ac90168..ed0713e0d79 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java +++ b/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 diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java similarity index 98% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java index 19ba4860ab3..2c8965038db 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java index 5752c7f528b..08614955196 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java +++ b/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}. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java index ba8f356fcae..130ea022015 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/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 diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java similarity index 77% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java index 23e4c7a9b8c..caf7921571d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java +++ b/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. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java index 0f0fb24a487..2f1a89247c0 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java similarity index 95% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java index c7bb4468c26..45de40a4322 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java +++ b/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; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java similarity index 93% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java index cdab3f50ef7..a34c38524e8 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java +++ b/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. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java index d022441bcf7..6ebdaa48b5a 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import java.util.Arrays; import java.util.Collection; @@ -30,11 +30,11 @@ import org.springframework.batch.core.converter.DefaultJobParametersConverter; import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.CommandLineRunner; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import org.springframework.zero.CommandLineRunner; /** * {@link CommandLineRunner} to {@link JobLauncher launch} Spring Batch jobs. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java similarity index 83% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index 6993c5c6a1b..38bcd8698aa 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; -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 Spring Data's JPA Repositories. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java index ab10117d9fd..5645016437d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; import java.util.Collection; import java.util.List; +import org.springframework.autoconfigure.AutoConfigurationUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; @@ -38,7 +39,6 @@ import org.springframework.data.repository.config.RepositoryBeanNameGenerator; import org.springframework.data.repository.config.RepositoryConfiguration; import org.springframework.data.repository.config.RepositoryConfigurationExtension; import org.springframework.util.Assert; -import org.springframework.zero.autoconfigure.AutoConfigurationUtils; /** * {@link ImportBeanDefinitionRegistrar} used to auto-configure Spring Data JPA diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java similarity index 98% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java index 27530273174..bbe06ebb059 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java index f43b25fbc99..c2f3f480f2c 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.sql.SQLException; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java index bfb97f2ac5e..0d6955af0dc 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.util.ArrayList; import java.util.Arrays; @@ -25,9 +25,13 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionLogUtils; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -46,10 +50,6 @@ import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionLogUtils; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link DataSource}. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java similarity index 83% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index ef0c1b2045a..3d45dad44de 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; +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.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; -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 diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java index 1882c7eb36f..6087ebc1812 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.util.LinkedHashMap; import java.util.Map; @@ -22,13 +22,13 @@ import java.util.Map; import javax.annotation.PreDestroy; import javax.sql.DataSource; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.util.ClassUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for embedded databases. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java index dc58696595d..f666315dfe2 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.annotation.PreDestroy; import javax.sql.DataSource; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/main/Spring.java similarity index 94% rename from spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/main/Spring.java index c43563b7965..554e7a985c4 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/main/Spring.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.main; +package org.springframework.autoconfigure.main; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.LogFactory; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.SpringVersion; import org.springframework.util.ClassUtils; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; /** * Very simple main class that can be used to launch an application from sources (class, diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java similarity index 94% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index 6bbce4d8773..f01a4d105fb 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa; +package org.springframework.autoconfigure.orm.jpa; import java.util.LinkedHashMap; import java.util.Map; import org.hibernate.ejb.HibernateEntityManager; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; @@ -30,8 +32,6 @@ import org.springframework.orm.jpa.vendor.Database; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.util.StringUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} for Hibernate JPA. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaAutoConfiguration.java similarity index 90% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaAutoConfiguration.java index e52feac6b94..c11f9b39946 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -14,19 +14,24 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa; +package org.springframework.autoconfigure.orm.jpa; import java.util.List; import javax.persistence.EntityManager; import javax.sql.DataSource; +import org.springframework.autoconfigure.AutoConfigurationUtils; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaVendorAdapter; @@ -34,11 +39,6 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.util.Assert; -import org.springframework.zero.autoconfigure.AutoConfigurationUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; /** * Base {@link EnableAutoConfiguration Auto-configuration} for JPA. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java similarity index 90% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index f5d3c71b70b..1b083d61068 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.thymeleaf; +package org.springframework.autoconfigure.thymeleaf; import java.io.IOException; import java.io.InputStream; @@ -25,18 +25,18 @@ import javax.servlet.Servlet; import nz.net.ultraq.web.thymeleaf.LayoutDialect; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; 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.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -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.condition.ConditionalOnMissingClass; import org.thymeleaf.TemplateProcessingParameters; import org.thymeleaf.resourceresolver.IResourceResolver; import org.thymeleaf.spring3.SpringTemplateEngine; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java similarity index 78% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java index f392c99eb04..119adecd579 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.Servlet; import org.apache.catalina.startup.Tomcat; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.Loader; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.web.servlet.DispatcherServlet; -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.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ServletContextInitializer; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet containers. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java similarity index 81% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java index 618ce17e100..20d66acca0d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.MultipartConfigElement; import javax.servlet.Servlet; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.multipart.support.StandardServletMultipartResolver; -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.embedded.EmbeddedWebApplicationContext; /** * {@link EnableAutoConfiguration Auto-configuration} for multi-part uploads. Adds a diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java similarity index 76% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java index cbdc3f4d922..8d24953d2d8 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.BeansException; +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.properties.ServerProperties; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -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.properties.ServerProperties; -import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} that configures the @@ -44,7 +44,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar private ApplicationContext applicationContext; - @Bean(name = "org.springframework.zero.properties.ServerProperties") + @Bean(name = "org.springframework.bootstrap.context.embedded.properties.ServerProperties") @ConditionalOnMissingBean public ServerProperties serverProperties() { return new ServerProperties(); diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java index 7ab425327da..bb366344111 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import java.util.Arrays; import java.util.Collection; @@ -22,9 +22,14 @@ import java.util.Collections; import javax.servlet.Servlet; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; 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.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -48,11 +53,6 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.servlet.resource.ResourceHttpRequestHandler; import org.springframework.web.servlet.view.BeanNameViewResolver; import org.springframework.web.servlet.view.ContentNegotiatingViewResolver; -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; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link EnableWebMvc Web MVC}. @@ -121,7 +121,7 @@ public class WebMvcAutoConfiguration { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { // FIXME exposing the root classpath is a security risk - // eg http://localhost:8080/org/springframework/zero/Banner.class + // eg http://localhost:8080/org/springframework/bootstrap/Banner.class registry.addResourceHandler("/resources/**").addResourceLocations("/") .addResourceLocations("classpath:/META-INF/resources/") .addResourceLocations("classpath:/resources/") diff --git a/spring-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-autoconfigure/src/main/resources/META-INF/spring.factories index 5e294a113e7..8c5efd03489 100644 --- a/spring-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,14 +1,14 @@ # Auto Configure -org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ -org.springframework.zero.autoconfigure.MessageSourceAutoConfiguration,\ -org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration,\ -org.springframework.zero.autoconfigure.batch.BatchAutoConfiguration,\ -org.springframework.zero.autoconfigure.data.JpaRepositoriesAutoConfiguration,\ -org.springframework.zero.autoconfigure.jdbc.DataSourceAutoConfiguration,\ -org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\ -org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\ -org.springframework.zero.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.MultipartAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration +org.springframework.autoconfigure.EnableAutoConfiguration=\ +org.springframework.autoconfigure.MessageSourceAutoConfiguration,\ +org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration,\ +org.springframework.autoconfigure.batch.BatchAutoConfiguration,\ +org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration,\ +org.springframework.autoconfigure.jdbc.DataSourceAutoConfiguration,\ +org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\ +org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\ +org.springframework.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\ +org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\ +org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration,\ +org.springframework.autoconfigure.web.MultipartAutoConfiguration,\ +org.springframework.autoconfigure.web.WebMvcAutoConfiguration diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java similarity index 82% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java index a0bf3f333f0..5b91abf4722 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; -import org.springframework.zero.main.SimpleMainTests; +import org.springframework.autoconfigure.main.SimpleMainTests; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; /** * A test suite for probing weird ordering problems in the tests. diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java index 2af5c7e8843..515e64ccdee 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.util.Arrays; import java.util.List; @@ -23,6 +23,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.autoconfigure.AutoConfigurationSorter; +import org.springframework.autoconfigure.AutoConfigureAfter; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.core.io.DefaultResourceLoader; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java similarity index 88% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java index d9062888178..d9080225e68 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; +import org.springframework.autoconfigure.ComponentScanDetector; import org.springframework.context.annotation.Import; -import org.springframework.zero.autoconfigure.ComponentScanDetector; /** * Simple configuration to import {@link ComponentScanDetector} for tests. diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java index a3518be1cd5..954cf8a8c46 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.util.HashMap; import java.util.Locale; import java.util.Map; import org.junit.Test; +import org.springframework.autoconfigure.MessageSourceAutoConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java similarity index 85% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java index dc99ba8a6c7..f634acb6144 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.SpringJUnitTests.TestConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.zero.autoconfigure.SpringJUnitTests.TestConfiguration; -import org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java index e1e2d2e9e02..a05424ba4f6 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -14,12 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import java.util.Collection; import java.util.Collections; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.batch.BatchAutoConfiguration; +import org.springframework.autoconfigure.batch.JobLauncherCommandLineRunner; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -33,8 +37,6 @@ import org.springframework.batch.core.repository.JobRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java index c30dea10259..1433f03cde1 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import org.junit.Test; +import org.springframework.autoconfigure.batch.JobExecutionEvent; +import org.springframework.autoconfigure.batch.JobExecutionExitCodeGenerator; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java similarity index 77% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index 6b8a9962592..3aa7f88c50a 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java @@ -14,21 +14,22 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; import javax.persistence.EntityManagerFactory; import org.junit.Test; +import org.springframework.autoconfigure.ComponentScanDetectorConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration; +import org.springframework.autoconfigure.data.test.City; +import org.springframework.autoconfigure.data.test.CityRepository; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.data.test.City; -import org.springframework.zero.autoconfigure.data.test.CityRepository; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java similarity index 80% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java index 5678f3d1dd3..58656ee336b 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java @@ -14,20 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; import org.junit.Ignore; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration; +import org.springframework.autoconfigure.data.test.City; +import org.springframework.autoconfigure.data.test.CityRepository; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.repository.support.DomainClassConverter; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.data.test.City; -import org.springframework.zero.autoconfigure.data.test.CityRepository; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java similarity index 96% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java index 9ce6daa1e02..1bab8dd0a3b 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data.test; +package org.springframework.autoconfigure.data.test; import java.io.Serializable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java index 7b7ff2d61a3..7879b2c96fc 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data.test; +package org.springframework.autoconfigure.data.test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java index 77fe2c1af29..4e25fefb337 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.jdbc.BasicDataSourceConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java similarity index 95% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index 95fedfcec43..0625fd40e96 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.util.HashMap; import java.util.Map; @@ -23,6 +23,8 @@ import javax.sql.DataSource; import org.apache.commons.dbcp.BasicDataSource; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,7 +33,6 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.util.ClassUtils; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 7565bbc2a11..59628667be2 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.jdbc.datasource.DataSourceTransactionManager; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java index b64dd093b8d..d407542eebf 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 95a3863fa92..604f14a029e 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.lang.reflect.Field; import java.util.HashMap; @@ -24,10 +24,12 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.jdbc.TomcatDataSourceConfiguration; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.util.ReflectionUtils; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/main/SimpleMainTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/main/SimpleMainTests.java index 3f6e03ed5e8..2d0adf6225a 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/main/SimpleMainTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.main; +package org.springframework.autoconfigure.main; import org.junit.After; import org.junit.Test; +import org.springframework.autoconfigure.main.Spring; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.ClassUtils; @@ -57,7 +58,7 @@ public class SimpleMainTests { @Test public void xmlContext() throws Exception { Spring.main(new String[] { Spring.class.getName(), - "org/springframework/zero/sample-beans.xml" }); + "org/springframework/bootstrap/sample-beans.xml" }); this.context = Spring.getApplicationContext(); assertNotNull(this.context); } diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java similarity index 81% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index a27213ff480..f3a0ac4b726 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa; +package org.springframework.autoconfigure.orm.jpa; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.ComponentScanDetectorConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; +import org.springframework.autoconfigure.orm.jpa.test.City; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.test.City; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java similarity index 96% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java index c630aff5482..0b812115014 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa.test; +package org.springframework.autoconfigure.orm.jpa.test; import java.io.Serializable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java index a5f9d355bd9..5998be72c9e 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.thymeleaf; +package org.springframework.autoconfigure.thymeleaf; import java.util.Collections; import java.util.HashMap; @@ -22,6 +22,8 @@ import java.util.Locale; import java.util.Map; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.mock.web.MockHttpServletRequest; @@ -29,7 +31,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.servlet.support.RequestContext; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; import org.thymeleaf.spring3.view.ThymeleafView; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java similarity index 84% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java index 61a8208c62d..f1f31df840d 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.Servlet; import org.junit.Test; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.bootstrap.context.condition.ConditionalOnExpression; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +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.MockEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnExpression; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -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.MockEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java similarity index 92% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java index 624f1f78a2c..d36e25cee6e 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.MultipartConfigElement; @@ -22,6 +22,11 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.autoconfigure.web.MultipartAutoConfiguration; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Controller; @@ -32,11 +37,6 @@ import org.springframework.web.multipart.MultipartResolver; import org.springframework.web.multipart.support.StandardServletMultipartResolver; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.autoconfigure.web.MultipartAutoConfiguration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java similarity index 82% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java index d543131c2c9..2ad73a28d1f 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import java.io.File; @@ -24,17 +24,18 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.TestUtils; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.properties.ServerProperties; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java similarity index 87% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java index 6031ab0d180..be2d0017d12 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import org.junit.Ignore; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; /** * Tests for {@link WebMvcAutoConfiguration}. diff --git a/spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql b/spring-autoconfigure/src/test/resources/org/springframework/autoconfigure/jdbc/schema.sql similarity index 100% rename from spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql rename to spring-autoconfigure/src/test/resources/org/springframework/autoconfigure/jdbc/schema.sql diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/Banner.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java similarity index 66% rename from spring-bootstrap/src/main/java/org/springframework/zero/Banner.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java index 6da3a483095..19318d4e5c1 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/Banner.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java @@ -14,24 +14,23 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.io.PrintStream; /** - * Writes the 'Spring Zero' banner. + * Writes the 'Spring' banner. * * @author Phillip Webb */ abstract class Banner { - private static final String[] BANNER = { - " . ____ _ _____ __ _", - " /\\\\ / ___'_ __ _ _(_)_ __ __ _ |__ /___ _ __ ___\\ \\ \\", - "( ( )\\___ | '_ | '_| | '_ \\/ _` | / // _ \\ '__/ _ \\\\ \\ \\", - " \\\\/ ___)| |_)| | | | | || (_| | / /| __/ | | (/) |} } }", - " ' |____| .__|_| |_|_| |_\\__, |'_____\\___|_| \\___// / /", - " =========|_|==============|___/====================/_/_/" }; + private static final String[] BANNER = { " . ____ _ __ _ _", + " /\\\\ / ___'_ __ _ _(_)_ __ __ _ \\ \\ \\ \\", + "( ( )\\___ | '_ | '_| | '_ \\/ _` | \\ \\ \\ \\", + " \\\\/ ___)| |_)| | | | | || (_| | ) ) ) )", + " ' |____| .__|_| |_|_| |_\\__, | / / / /", + " =========|_|==============|___/=/_/_/_/" }; /** * Write the banner to the specified print stream. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java index 50ad915775e..0853caac9b0 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.HashSet; import java.util.Set; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java index 457fd28ba63..0911a009914 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java index 8b3d5933ea8..565cab2774e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; /** * Interface used to generate an 'exit code' from a running command line diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java index da07a747a7e..fb931c14028 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.ArrayList; import java.util.Arrays; @@ -123,8 +123,8 @@ public class SpringApplication { private static final String DEFAULT_CONTEXT_CLASS = "org.springframework.context." + "annotation.AnnotationConfigApplicationContext"; - public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework.zero." - + "context.embedded.AnnotationConfigEmbeddedWebApplicationContext"; + public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework." + + "bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext"; private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet", "org.springframework.web.context.ConfigurableWebApplicationContext" }; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java index d2d54280876..6e368106424 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.beans.IntrospectionException; import java.util.HashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java index 7866ffe471e..e6cadd2f977 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.beans.PropertyEditor; import java.beans.PropertyEditorSupport; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java index cd9806d12e9..f477cc6312d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Locale; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java index 671af9ce01a..f5e2e347e24 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Collection; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java index 8d7ca09621d..c253767b310 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.net.InetAddress; import java.util.LinkedHashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java index 4bb49bfec47..8a356e82dc5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.nio.charset.Charset; import java.util.Collections; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java index df64c81d49c..3239e346027 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java index 84332763907..fe342652722 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java index cf92a8aec22..8409bcc1a9a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import org.springframework.util.ClassUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java index 742d82b3f0c..e609cccfd54 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java index 6eb723d4d70..8c0463923e5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java index fa87770770a..f0712783541 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java index de1fc092b11..059fa3964c6 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.io.IOException; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java index 42fc4d9eaa9..a0abb26e47e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.Map; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java index cb16ac442bc..aeac65a736b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java index d896c24631f..7ab5c397187 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java index ab10b3d6e65..c9a795c12f7 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java index c8e50cce82e..6721801fbea 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java index 56467161913..2f38e4f29a0 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java index d77074b6365..c15194f57b4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java index e1014526a10..5e0bfa45efe 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java index fef457de671..f98289d9fd5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java index aae6b17f79b..4123513d08e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java index a13ae08b9a7..cbe6256ba8b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java index 7da41e8f6ab..70f378c6174 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.springframework.context.annotation.Condition; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java index c3b16c0228a..8b051929edf 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java index 03f1f28886f..b21a3db2dd2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java index 51480c35f6a..e13ca077fb8 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java index f5e4062f689..a9d53bcdc01 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java index 92d9cb84725..1aa96c10341 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java index 81124c8002c..60898e4635e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java index 5b7f738b18a..4aea37fbcaf 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java index 5a068f4ac5c..434e7a28348 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.File; import java.io.IOException; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java index 81bb275455c..3bf7739b1bd 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java index 293e3328494..6be6ba538ad 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.File; import java.net.InetAddress; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java index bb733ab3640..8688703bb38 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; /** * Simple interface that represents a fully configured embedded servlet container (for diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java index bcc8658cf12..c8f554d03dd 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; /** * Strategy interface for customizing auto-configured embedded servlet containers. Any diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java index dfaa91df2e2..32f876678a1 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java index ef18666be46..23bc99c8cba 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; /** * Exceptions thrown by an embedded servlet container. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java similarity index 85% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java index e9f59aa9bd8..cf78c4a1e5e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * Factory interface that can be used to create {@link EmbeddedServletContainer}s. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java index 7267d37ce5f..cad231892bf 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java index d639ee94e16..b2fce25bb25 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import org.springframework.http.HttpStatus; import org.springframework.util.ObjectUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java index bbe3af8745f..9cbca04c681 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java index bbda2bf0221..c3c732a8f4c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java index eb30ca2c2ad..d771e042e31 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java index 312dcf45b80..7f0a3cbf11a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java index b634a56129f..9eaa7b726a2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java index 60a3b0c0c93..bec96588509 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import org.springframework.beans.BeansException; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java similarity index 89% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java index 052c7e27d26..9d2c4c57203 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import org.eclipse.jetty.server.Server; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerException; /** * {@link EmbeddedServletContainer} that can be used to control an embedded Jetty server. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 50ebb61aed7..512b2ba7666 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import java.io.File; import java.net.InetSocketAddress; @@ -32,16 +32,16 @@ import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ErrorPage; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ErrorPage; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * {@link EmbeddedServletContainerFactory} that can be used to create diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java index 1a9d8f43de3..2f5c1218e76 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import javax.servlet.ServletContext; @@ -23,8 +23,8 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * Jetty {@link Configuration} that calls {@link ServletContextInitializer}s. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java similarity index 76% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java index 62d603c5415..532ff9779f8 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Jetty {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Jetty {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java similarity index 74% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java index 5cbac790bba..de3401d2277 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java @@ -16,8 +16,8 @@ /** * Support for embedded servlet containers. - * @see org.springframework.zero.context.embedded.EmbeddedServletContainerFactory - * @see org.springframework.zero.context.embedded.EmbeddedWebApplicationContext + * @see org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory + * @see org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java similarity index 86% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java index 4d65c39c4de..578862435bd 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.properties; +package org.springframework.bootstrap.context.embedded.properties; import java.io.File; import java.net.InetAddress; @@ -23,13 +23,13 @@ import javax.validation.constraints.NotNull; import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.valves.RemoteIpValve; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.util.StringUtils; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link ConfigurationProperties properties} for a web server (e.g. port and path diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java similarity index 93% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java index d5f4a869a35..94452e4f9b8 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import javax.servlet.ServletException; @@ -22,8 +22,8 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.apache.catalina.core.StandardContext; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * Tomcat {@link LifecycleListener} that calls {@link ServletContextInitializer}s. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java similarity index 91% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index f9a45d08936..3d1d6d54f26 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerException; /** * {@link EmbeddedServletContainer} that can be used to control an embedded Tomcat server. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 7ecf5983401..66983895be6 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import java.io.File; import java.io.IOException; @@ -38,16 +38,16 @@ import org.apache.catalina.loader.WebappLoader; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat.FixContextListener; import org.apache.coyote.AbstractProtocol; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ErrorPage; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerException; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ErrorPage; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * {@link EmbeddedServletContainerFactory} that can be used to create diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java index 56a4eb22598..6b81c3fd13b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import java.net.URL; import java.net.URLClassLoader; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java similarity index 76% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java index 6899819b5ce..802345a1f90 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Tomcat {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Tomcat {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java index 8db25ecb8d1..5133c086fe3 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.io.IOException; import java.util.ArrayList; @@ -23,6 +23,10 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import org.springframework.bootstrap.config.YamlPropertiesFactoryBean; +import org.springframework.bootstrap.config.YamlProcessor.ArrayDocumentMatcher; +import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; +import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.PropertySource; @@ -33,10 +37,6 @@ import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.util.StringUtils; -import org.springframework.zero.config.YamlProcessor.ArrayDocumentMatcher; -import org.springframework.zero.config.YamlProcessor.DocumentMatcher; -import org.springframework.zero.config.YamlProcessor.MatchStatus; -import org.springframework.zero.config.YamlPropertiesFactoryBean; /** * {@link ApplicationContextInitializer} that configures the context environment by diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java index 454d939bc7f..c2c1f1b23a4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java index 839af13ad19..8f765bb0c75 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java index 868d92644e6..f40e90c849f 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.lang.management.ManagementFactory; import java.util.HashMap; import java.util.Map; +import org.springframework.bootstrap.logging.JavaLoggerConfigurer; +import org.springframework.bootstrap.logging.LogbackConfigurer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -29,8 +31,6 @@ import org.springframework.core.env.Environment; import org.springframework.core.io.ClassPathResource; import org.springframework.util.ClassUtils; import org.springframework.util.Log4jConfigurer; -import org.springframework.zero.logging.JavaLoggerConfigurer; -import org.springframework.zero.logging.LogbackConfigurer; /** * An {@link ApplicationContextInitializer} that configures a logging framework depending diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java index a981cb6a6e6..b1470162913 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.Collection; import java.util.Collections; @@ -23,6 +23,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import org.springframework.bootstrap.config.JsonParser; +import org.springframework.bootstrap.config.JsonParserFactory; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; @@ -32,8 +34,6 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.util.StringUtils; -import org.springframework.zero.config.JsonParser; -import org.springframework.zero.config.JsonParserFactory; /** * An {@link ApplicationContextInitializer} that knows where to find VCAP (a.k.a. Cloud diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java index e1e4fa2c96e..936a79b91e5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java index b47f15c2d1f..1d5fb675c92 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -30,8 +32,6 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySources; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * Configuration for binding externalized application properties to diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java index 1ef09fbb791..6494d83424a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanCreationException; @@ -22,6 +22,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; @@ -29,7 +30,6 @@ import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.env.PropertySources; import org.springframework.util.StringUtils; import org.springframework.validation.Validator; -import org.springframework.zero.bind.PropertiesConfigurationFactory; /** * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java index 8ee28ecfb05..2e6f9bdc007 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; /** * Properties holder registered by {@link EnableConfigurationPropertiesImportSelector} to diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java index d7c8402592e..90880b6f55b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java index 097f21fa95a..95c170621fe 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java index f4ae67c05f7..e94394fba25 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.FileNotFoundException; import java.util.logging.LogManager; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java index f5ae1b5ce10..143e0cf8363 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.FileNotFoundException; import java.net.URL; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java index 5bafb1216f6..a21f490b1ae 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.web; +package org.springframework.bootstrap.web; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -22,12 +22,12 @@ import javax.servlet.ServletException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.ApplicationContext; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.WebApplicationContext; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; /** * A handy opinionated {@link WebApplicationInitializer} for applications that only have diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories index 33e29d52608..03db1ac821f 100644 --- a/spring-bootstrap/src/main/resources/META-INF/spring.factories +++ b/spring-bootstrap/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ # Application Context Initializers org.springframework.context.ApplicationContextInitializer=\ -org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer,\ -org.springframework.zero.context.initializer.ContextIdApplicationContextInitializer,\ -org.springframework.zero.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ -org.springframework.zero.context.initializer.LoggingApplicationContextInitializer,\ -org.springframework.zero.context.initializer.VcapApplicationContextInitializer +org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer diff --git a/spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties b/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties rename to spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties diff --git a/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml b/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml rename to spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml diff --git a/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties b/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties rename to spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java index f6dc5408710..9e56f5a71c7 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.sampleconfig.MyComponent; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.io.ClassPathResource; -import org.springframework.zero.sampleconfig.MyComponent; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -82,7 +82,7 @@ public class BeanDefinitionLoaderTests { @Test public void loadResourceName() throws Exception { BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry, - "classpath:org/springframework/zero/sample-beans.xml"); + "classpath:org/springframework/bootstrap/sample-beans.xml"); int loaded = loader.load(); assertThat(loaded, equalTo(1)); assertTrue(this.registry.containsBean("myXmlComponent")); diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java index 44ba0a90a4a..4c37f56beec 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.concurrent.atomic.AtomicReference; @@ -26,6 +26,12 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.DefaultBeanNameGenerator; +import org.springframework.bootstrap.BeanDefinitionLoader; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.ExitCodeGenerator; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextInitializer; @@ -45,12 +51,6 @@ import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.StaticWebApplicationContext; -import org.springframework.zero.BeanDefinitionLoader; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.ExitCodeGenerator; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java index f9f35eaedeb..e58267b9e21 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.HashMap; import java.util.Map; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java index ac5b9662200..a19f4583d19 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import javax.validation.Validation; import javax.validation.constraints.NotNull; import org.junit.Test; import org.springframework.beans.NotWritablePropertyException; +import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.validation.BindException; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.SpringValidatorAdapter; -import org.springframework.zero.bind.PropertiesConfigurationFactory; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java index 9ad499fd806..ceec5e2d660 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Collections; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.bind.PropertySourcesPropertyValues; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java similarity index 99% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java index 8f5881f3a48..9beeedc9f88 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -36,6 +36,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.MutablePropertyValues; +import org.springframework.bootstrap.bind.RelaxedDataBinder; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; @@ -45,7 +46,6 @@ import org.springframework.validation.BindingResult; import org.springframework.validation.DataBinder; import org.springframework.validation.FieldError; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.springframework.zero.bind.RelaxedDataBinder; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java index 20e5a9aea82..b95dc387259 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Collections; import java.util.HashMap; @@ -24,6 +24,7 @@ import javax.validation.Validation; import javax.validation.constraints.NotNull; import org.junit.Test; +import org.springframework.bootstrap.bind.YamlConfigurationFactory; import org.springframework.context.support.StaticMessageSource; import org.springframework.validation.BindException; import org.springframework.validation.Validator; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java similarity index 83% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java index 271de278aef..5f06d06d243 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; + +import org.springframework.bootstrap.config.JacksonJsonParser; +import org.springframework.bootstrap.config.JsonParser; /** diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java index 5beea86618e..fc8cc9e2f2f 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; import org.junit.Test; +import org.springframework.bootstrap.config.JsonParser; +import org.springframework.bootstrap.config.SimpleJsonParser; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java similarity index 83% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java index 1cda3586e54..b00fe8b1278 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; + +import org.springframework.bootstrap.config.JsonParser; +import org.springframework.bootstrap.config.YamlJsonParser; /** diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java index ea7afe8dc1a..101e434f1ab 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.io.IOException; import java.io.InputStream; import java.util.Map; import org.junit.Test; +import org.springframework.bootstrap.config.YamlMapFactoryBean; +import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; -import org.springframework.zero.config.YamlProcessor.ResolutionMethod; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java index 8b31b027483..6b6815037a2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.Arrays; import java.util.Map; @@ -22,12 +22,13 @@ import java.util.Properties; import org.junit.Ignore; import org.junit.Test; +import org.springframework.bootstrap.config.YamlPropertiesFactoryBean; +import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; +import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.zero.config.YamlProcessor.DocumentMatcher; -import org.springframework.zero.config.YamlProcessor.MatchStatus; -import org.springframework.zero.config.YamlProcessor.ResolutionMethod; import org.yaml.snakeyaml.Yaml; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java index b3ee08e0fdf..59eaa7c7812 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,9 +23,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.beans.factory.BeanFactory; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Conditional; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link Conditional} that only matches when the specified bean classes and/or names are diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java index 22868093157..cd3af4903b5 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.List; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.bootstrap.context.condition.OnMissingBeanCondition; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -import org.springframework.zero.context.condition.OnMissingBeanCondition; /** * {@link Condition} that checks that specific beans are missing. diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java index 724e396666d..9ce448c7c28 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Ignore; import org.junit.Test; @@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; -import org.springframework.zero.context.condition.ConditionalOnBean; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -103,13 +102,13 @@ public class OnBeanConditionTests { } @Configuration - @ImportResource("org/springframework/zero/context/annotation/foo.xml") + @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(OnBeanNameConfiguration.class) - @ImportResource("org/springframework/zero/context/annotation/foo.xml") + @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java index cfffc9d6dbd..f0d542e098c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -95,13 +95,13 @@ public class OnClassConditionTests { } @Configuration - @ImportResource("org/springframework/zero/context/foo.xml") + @ImportResource("org/springframework/bootstrap/context/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(BasicConfiguration.class) - @ImportResource("org/springframework/zero/context/foo.xml") + @ImportResource("org/springframework/bootstrap/context/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java similarity index 89% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java index fb4f208f377..40e187c69b5 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnExpression; +import org.springframework.bootstrap.context.condition.OnExpressionCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java index ce88856359b..4a7b8a2fb0f 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.condition.OnMissingBeanCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.condition.OnMissingBeanCondition; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java index b2696b7b077..2ab8b1c44c3 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -51,7 +51,7 @@ public class OnMissingClassConditionTests { } @Configuration - @ConditionalOnMissingClass("org.springframework.zero.context.condition.OnMissingClassConditionTests") + @ConditionalOnMissingClass("org.springframework.bootstrap.context.condition.OnMissingClassConditionTests") protected static class BasicConfiguration { @Bean public String bar() { diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java similarity index 85% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java index dce56319071..19fb587c107 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnNotWebApplication; +import org.springframework.bootstrap.context.condition.ConditionalOnWebApplication; +import org.springframework.bootstrap.context.condition.OnNotWebApplicationCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.context.condition.ConditionalOnNotWebApplication; -import org.springframework.zero.context.condition.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java similarity index 90% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java index 493c23d6819..8e304820be1 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnResource; +import org.springframework.bootstrap.context.condition.OnResourceCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java similarity index 87% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java index ad729822b2e..95171af5375 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnNotWebApplication; +import org.springframework.bootstrap.context.condition.ConditionalOnWebApplication; +import org.springframework.bootstrap.context.condition.OnWebApplicationCondition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.zero.context.condition.ConditionalOnNotWebApplication; -import org.springframework.zero.context.condition.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index d1e8485929b..5278e5b0a94 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.FileWriter; import java.io.IOException; @@ -38,18 +38,18 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.mockito.InOrder; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.FilterRegistrationBean; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.util.FileCopyUtils; import org.springframework.util.StreamUtils; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.FilterRegistrationBean; -import org.springframework.zero.context.embedded.ServletContextInitializer; -import org.springframework.zero.context.embedded.ServletRegistrationBean; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java index fbf60f98a8b..573c0c0dfea 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.Servlet; import javax.servlet.ServletContext; import org.junit.Test; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.context.ServletContextAware; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index dc50a6248b3..5c83bdd31be 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.net.URI; import java.nio.charset.Charset; @@ -22,6 +22,8 @@ import java.nio.charset.Charset; import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -36,8 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -117,7 +117,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { @Configuration @EnableWebMvc - @PropertySource("classpath:/org/springframework/zero/context/embedded/conf.properties") + @PropertySource("classpath:/org/springframework/bootstrap/context/embedded/conf.properties") public static class AdvancedConfig { @Autowired diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java index adc48e3a4ea..5a693962e29 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.lang.reflect.Field; import java.util.Properties; @@ -33,6 +33,10 @@ import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.FilterRegistrationBean; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import org.springframework.context.ApplicationContextException; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java index add605cbbbb..ec9a287638c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java index 1976d636b0a..be9ec5fe829 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java index b4bbca6156c..39dd0c2937a 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collections; @@ -32,8 +32,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.zero.context.embedded.FilterRegistrationBean; -import org.springframework.zero.context.embedded.ServletRegistrationBean; +import org.springframework.bootstrap.context.embedded.FilterRegistrationBean; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.*; import static org.mockito.Matchers.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java index e14ac2228eb..f9b891b9231 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.ArrayList; import java.util.Enumeration; @@ -31,10 +31,10 @@ import javax.servlet.ServletRegistration; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyObject; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java index 50002ee20a4..4cc05216977 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java index 9920000ab1f..b40ff18c6d5 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java index cfaa3a374c7..00a74a952d2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collections; @@ -34,6 +34,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyObject; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java index 05ca433ab99..94834f00502 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.Servlet; import org.junit.Test; +import org.springframework.bootstrap.context.embedded.XmlEmbeddedWebApplicationContext; import org.springframework.core.io.ClassPathResource; -import org.springframework.zero.context.embedded.XmlEmbeddedWebApplicationContext; import static org.mockito.Mockito.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java similarity index 73% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java index 03648786436..5b0a0a9b3b6 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.config; +package org.springframework.bootstrap.context.embedded.config; import javax.servlet.Servlet; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.MockServlet; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.MockEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.MockServlet; /** * Example {@code @Configuration} for use with diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java similarity index 84% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 4b6b2c30432..8b4526e90e7 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import java.util.Arrays; @@ -22,9 +22,9 @@ import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; import org.junit.Test; import org.mockito.InOrder; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainer; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java index f73888b4332..304947cbcc7 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.properties; +package org.springframework.bootstrap.context.embedded.properties; import java.net.InetAddress; import java.util.Collections; @@ -23,8 +23,8 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; -import org.springframework.zero.bind.RelaxedDataBinder; -import org.springframework.zero.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.bind.RelaxedDataBinder; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java similarity index 84% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java index 7181f58ea3b..19e83e134a1 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import java.util.Arrays; @@ -22,9 +22,9 @@ import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.junit.Test; import org.mockito.InOrder; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainer; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.inOrder; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java index dbeae1005bc..c80d70bec5e 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.SimpleCommandLinePropertySource; -import org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java index 3c805295209..a62762a0bda 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import org.junit.Test; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.TestUtils; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java index dc38df730d2..838cdce9b38 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.HashMap; import java.util.Map; @@ -22,6 +22,7 @@ import java.util.Map; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -31,7 +32,6 @@ import org.springframework.core.annotation.Order; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; import org.springframework.web.context.ConfigurableWebApplicationContext; -import org.springframework.zero.context.initializer.EnvironmentDelegateApplicationContextInitializer; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java index 0d57fcc6366..046d2e2d3de 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import org.junit.Test; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.TestUtils; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java index f4bb2e23792..738f3f9ab09 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.util.Arrays; @@ -23,14 +23,14 @@ import javax.annotation.PostConstruct; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.condition.AssertMissingBean; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.stereotype.Component; -import org.springframework.zero.TestUtils; -import org.springframework.zero.context.condition.AssertMissingBean; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -155,7 +155,7 @@ public class EnableConfigurationPropertiesTests { @EnableConfigurationProperties protected static class TestBeanConfiguration { @ConditionalOnMissingBean(TestProperties.class) - @Bean(name = "org.springframework.zero.context.annotation.EnableConfigurationPropertiesTests$TestProperties") + @Bean(name = "org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesTests$TestProperties") public TestProperties testProperties() { return new TestProperties(); } @@ -173,7 +173,7 @@ public class EnableConfigurationPropertiesTests { } @Configuration - @ImportResource("org/springframework/zero/context/properties/testProperties.xml") + @ImportResource("org/springframework/bootstrap/context/properties/testProperties.xml") protected static class DefaultXmlConfiguration { } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java index 52232c9307f..d62388d12ce 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.context.test; +package org.springframework.bootstrap.context.test; import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; -import org.springframework.zero.context.properties.ConfigurationProperties; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java index 0d0048cb321..19899e230b5 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.logging.JavaLoggerConfigurer; import static org.junit.Assert.assertTrue; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java index 8accbccc7ce..503cefaa398 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -64,7 +64,7 @@ public class LogbackConfigurerTests { logger.info("Hello world"); String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.contains("Hello world")); - assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/springzero.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/spring.log")); } @Test(expected = FileNotFoundException.class) diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java index 200f49c1c7f..34bb2128b75 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -24,9 +24,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.env.PropertySource; -import org.springframework.zero.context.initializer.LoggingApplicationContextInitializer; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -94,7 +94,7 @@ public class LoggingApplicationContextInitializerTests { String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.contains("Hello world")); assertFalse("Wrong output:\n" + output, output.contains("???")); - assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/springzero.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/spring.log")); } @Test @@ -140,7 +140,7 @@ public class LoggingApplicationContextInitializerTests { Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); - assertTrue("Wrong output:\n" + output, output.startsWith("foo/springzero.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("foo/spring.log")); } } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java index 5ab6d99b48c..91278029f64 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.util.logging.Formatter; import java.util.logging.LogRecord; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java index 6fe2d4e4596..1e43159bb8c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sampleconfig; +package org.springframework.bootstrap.sampleconfig; import org.springframework.stereotype.Component; diff --git a/spring-bootstrap/src/test/resources/logback-nondefault.xml b/spring-bootstrap/src/test/resources/logback-nondefault.xml index 2b19b3a54f1..4752a677e91 100644 --- a/spring-bootstrap/src/test/resources/logback-nondefault.xml +++ b/spring-bootstrap/src/test/resources/logback-nondefault.xml @@ -1,6 +1,6 @@ - + ${LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n diff --git a/spring-bootstrap/src/test/resources/logback-test.xml b/spring-bootstrap/src/test/resources/logback-test.xml index 359b71e547e..9cc6069b88f 100644 --- a/spring-bootstrap/src/test/resources/logback-test.xml +++ b/spring-bootstrap/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - + ${LOG_PATTERN} - - + + diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml similarity index 63% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml index d734da72279..c4a4d1737a0 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml +++ b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + class="org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory" /> - + diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/foo.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/foo.xml diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml similarity index 61% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml index 6784fc206b9..24a4b905ec9 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml +++ b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + id="org.springframework.bootstrap.context.properties.EnableConfigurationPropertiesTests$TestProperties" + class="org.springframework.bootstrap.context.properties.EnableConfigurationPropertiesTests$TestProperties"> diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml similarity index 83% rename from spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml index 369bd05ecbc..3658eb12749 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml +++ b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml @@ -5,5 +5,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/spring-cli/pom.xml b/spring-cli/pom.xml index 79421c5c0f3..e1563143427 100644 --- a/spring-cli/pom.xml +++ b/spring-cli/pom.xml @@ -11,7 +11,7 @@ jar ${basedir}/.. - org.springframework.zero.cli.SpringZeroCli + org.springframework.cli.SpringCli diff --git a/spring-cli/samples/actuator.groovy b/spring-cli/samples/actuator.groovy index 56d341d611c..cfeb37e84ce 100644 --- a/spring-cli/samples/actuator.groovy +++ b/spring-cli/samples/actuator.groovy @@ -1,6 +1,6 @@ package org.test -@Grab("org.springframework.zero:spring-zero-actuator:0.5.0.BUILD-SNAPSHOT") +@Grab("org.springframework.zero:spring-actuator:0.5.0.BUILD-SNAPSHOT") @Controller class SampleController { diff --git a/spring-cli/samples/template.groovy b/spring-cli/samples/template.groovy index 719311dd269..28bd7e0b58e 100644 --- a/spring-cli/samples/template.groovy +++ b/spring-cli/samples/template.groovy @@ -1,6 +1,6 @@ package org.test -import static org.springframework.zero.cli.template.GroovyTemplate.template; +import static org.springframework.cli.template.GroovyTemplate.template; @Component class Example implements CommandLineRunner { diff --git a/spring-cli/src/main/assembly/descriptor.xml b/spring-cli/src/main/assembly/descriptor.xml index 2f25a1f0ed1..7ed0d63ecde 100644 --- a/spring-cli/src/main/assembly/descriptor.xml +++ b/spring-cli/src/main/assembly/descriptor.xml @@ -23,7 +23,7 @@ - org.springframework.zero:spring-zero-cli:jar:* + org.springframework.zero:spring-cli:jar:* lib diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/Command.java b/spring-cli/src/main/java/org/springframework/cli/Command.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/zero/cli/Command.java rename to spring-cli/src/main/java/org/springframework/cli/Command.java index 7e668f32547..61bd9da595f 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/Command.java +++ b/spring-cli/src/main/java/org/springframework/cli/Command.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; /** * A single command that can be run from the CLI. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java b/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java rename to spring-cli/src/main/java/org/springframework/cli/CommandFactory.java index 4274b24b473..96f57bc262d 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java +++ b/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.Collection; import java.util.ServiceLoader; diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/Log.java b/spring-cli/src/main/java/org/springframework/cli/Log.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/zero/cli/Log.java rename to spring-cli/src/main/java/org/springframework/cli/Log.java index b13e0428a0b..c1d48d51947 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/Log.java +++ b/spring-cli/src/main/java/org/springframework/cli/Log.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; /** * Simple logger used by the CLI. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java b/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java similarity index 86% rename from spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java rename to spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java index ea8b0e2ac4f..dde2e75a526 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java +++ b/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; /** * Exception thrown when an unknown command is specified. * * @author Phillip Webb */ -class NoSuchCommandException extends SpringZeroCliException { +class NoSuchCommandException extends SpringCliException { private static final long serialVersionUID = 1L; public NoSuchCommandException(String name) { super(String.format("%1$s: '%2$s' is not a valid command. See '%1$s --help'.", - SpringZeroCli.CLI_APP, name)); + SpringCli.CLI_APP, name)); } } diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java b/spring-cli/src/main/java/org/springframework/cli/SpringCli.java similarity index 83% rename from spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java rename to spring-cli/src/main/java/org/springframework/cli/SpringCli.java index 2cc2161275a..bd14a0b6d86 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java +++ b/spring-cli/src/main/java/org/springframework/cli/SpringCli.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.ArrayList; import java.util.Arrays; @@ -24,9 +24,9 @@ import java.util.ServiceLoader; import java.util.Set; /** - * Spring Zero Command Line Interface. This is the main entry-point for the Spring Zero - * command line application. This class will parse input arguments and delegate to a - * suitable {@link Command} implementation based on the first argument. + * Spring Command Line Interface. This is the main entry-point for the Spring command line + * application. This class will parse input arguments and delegate to a suitable + * {@link Command} implementation based on the first argument. * *

* The '-d' and '--debug' switches are handled by this class, however, most argument @@ -34,22 +34,22 @@ import java.util.Set; * * @author Phillip Webb * @see #main(String...) - * @see SpringZeroCliException + * @see SpringCliException * @see Command */ -public class SpringZeroCli { +public class SpringCli { public static final String CLI_APP = "spring"; - private static final Set NO_EXCEPTION_OPTIONS = EnumSet - .noneOf(SpringZeroCliException.Option.class); + private static final Set NO_EXCEPTION_OPTIONS = EnumSet + .noneOf(SpringCliException.Option.class); private List commands; /** - * Create a new {@link SpringZeroCli} implementation with the default set of commands. + * Create a new {@link SpringCli} implementation with the default set of commands. */ - public SpringZeroCli() { + public SpringCli() { setCommands(ServiceLoader.load(CommandFactory.class, getClass().getClassLoader())); } @@ -97,17 +97,17 @@ public class SpringZeroCli { } private int handleError(boolean debug, Exception ex) { - Set options = NO_EXCEPTION_OPTIONS; - if (ex instanceof SpringZeroCliException) { - options = ((SpringZeroCliException) ex).getOptions(); + Set options = NO_EXCEPTION_OPTIONS; + if (ex instanceof SpringCliException) { + options = ((SpringCliException) ex).getOptions(); } if (!(ex instanceof NoHelpCommandArgumentsException)) { errorMessage(ex.getMessage()); } - if (options.contains(SpringZeroCliException.Option.SHOW_USAGE)) { + if (options.contains(SpringCliException.Option.SHOW_USAGE)) { showUsage(); } - if (debug || options.contains(SpringZeroCliException.Option.STACK_TRACE)) { + if (debug || options.contains(SpringCliException.Option.STACK_TRACE)) { printStackTrace(ex); } return 1; @@ -189,7 +189,7 @@ public class SpringZeroCli { throw new NoHelpCommandArgumentsException(); } String commandName = args[0]; - for (Command command : SpringZeroCli.this.commands) { + for (Command command : SpringCli.this.commands) { if (command.getName().equals(commandName)) { Log.info(CLI_APP + " " + command.getName() + " - " + command.getDescription()); @@ -230,7 +230,7 @@ public class SpringZeroCli { } - static class NoHelpCommandArgumentsException extends SpringZeroCliException { + static class NoHelpCommandArgumentsException extends SpringCliException { private static final long serialVersionUID = 1L; @@ -240,7 +240,7 @@ public class SpringZeroCli { } - static class NoArgumentsException extends SpringZeroCliException { + static class NoArgumentsException extends SpringCliException { private static final long serialVersionUID = 1L; @@ -251,7 +251,7 @@ public class SpringZeroCli { * @param args CLI arguments */ public static void main(String... args) { - int exitCode = new SpringZeroCli().runAndHandleErrors(args); + int exitCode = new SpringCli().runAndHandleErrors(args); if (exitCode != 0) { System.exit(exitCode); } diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java b/spring-cli/src/main/java/org/springframework/cli/SpringCliException.java similarity index 75% rename from spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java rename to spring-cli/src/main/java/org/springframework/cli/SpringCliException.java index 346eb213250..b6b9913d7b5 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java +++ b/spring-cli/src/main/java/org/springframework/cli/SpringCliException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.Arrays; import java.util.Collections; @@ -23,41 +23,41 @@ import java.util.Set; /** * Runtime exception wrapper that defines additional {@link Option}s that are understood - * by the {@link SpringZeroCli}. + * by the {@link SpringCli}. * * @author Phillip Webb */ -public class SpringZeroCliException extends RuntimeException { +public class SpringCliException extends RuntimeException { private static final long serialVersionUID = 0L; private final EnumSet

    *
  • {@link CompilerAutoConfiguration} strategies will be read from - * META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration + * META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration * (per the standard java {@link ServiceLoader} contract) and applied during compilation
    • * *
  • Multiple classes can be returned if the Groovy source defines more than one Class
    • diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java similarity index 95% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java index 213e566b214..8a1376db0fb 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler; +package org.springframework.cli.compiler; /** * Configuration for the {@link GroovyCompiler}. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java similarity index 91% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java index c318b606c12..b1a631008ed 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.AstUtils; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.AstUtils; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Batch. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java similarity index 81% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java index 31864a9ef2b..bbba80a3689 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import groovy.lang.GroovyClassLoader; @@ -24,23 +24,24 @@ import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; -import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.GroovyCompilerConfiguration; /** - * {@link CompilerAutoConfiguration} for Spring Zero. + * {@link CompilerAutoConfiguration} for Spring. * * @author Dave Syer * @author Phillip Webb */ -public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration { @Override public void applyDependencies(DependencyCustomizer dependencies) { - dependencies.ifAnyMissingClasses("org.springframework.zero.SpringApplication") - .add("org.springframework.zero", "spring-zero-autoconfigure", - "0.5.0.BUILD-SNAPSHOT"); + dependencies.ifAnyMissingClasses( + "org.springframework.bootstrap.SpringApplication").add( + "org.springframework.zero", "spring-autoconfigure", + "0.5.0.BUILD-SNAPSHOT"); dependencies.ifAnyResourcesPresent("logback.xml").add("ch.qos.logback", "logback-classic", "1.0.7"); dependencies.ifNotAdded("cg.qos.logback", "logback-classic") @@ -75,8 +76,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati "org.springframework.context.MessageSource", "org.springframework.core.annotation.Order", "org.springframework.core.io.ResourceLoader", - "org.springframework.zero.CommandLineRunner", - "org.springframework.zero.context.annotation.EnableAutoConfiguration"); + "org.springframework.bootstrap.CommandLineRunner", + "org.springframework.autoconfigure.EnableAutoConfiguration"); imports.addStarImports("org.springframework.stereotype"); } @@ -92,10 +93,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati ClassNode classNode) { if (!hasEnableAutoConfigureAnnotation(classNode)) { try { - Class annotationClass = source - .getClassLoader() - .loadClass( - "org.springframework.zero.context.annotation.EnableAutoConfiguration"); + Class annotationClass = source.getClassLoader().loadClass( + "org.springframework.autoconfigure.EnableAutoConfiguration"); AnnotationNode annotationNode = new AnnotationNode(new ClassNode( annotationClass)); classNode.addAnnotation(annotationNode); diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java similarity index 91% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index 398bc2ad6f9..d621989e66a 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,9 +24,9 @@ import java.lang.annotation.Target; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.AstUtils; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.AstUtils; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Integration. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java similarity index 86% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index 6355e058fcf..63dfb9e5839 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.AstUtils; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.AstUtils; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring MVC. @@ -58,7 +58,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio imports.addStarImports("org.springframework.web.bind.annotation", "org.springframework.web.servlet.config.annotation", "org.springframework.http"); - imports.addStaticImport("org.springframework.zero.cli.template.GroovyTemplate", + imports.addStaticImport("org.springframework.cli.template.GroovyTemplate", "template"); } diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java similarity index 89% rename from spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java rename to spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java index 1330089e053..ade7d11b96f 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java +++ b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.cli.runner; +package org.springframework.cli.runner; import java.io.File; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.springframework.zero.cli.compiler.GroovyCompiler; +import org.springframework.cli.compiler.GroovyCompiler; /** * Compiles Groovy code running the resulting classes using a {@code SpringApplication}. @@ -31,11 +31,11 @@ import org.springframework.zero.cli.compiler.GroovyCompiler; * @author Phillip Webb * @author Dave Syer */ -public class SpringZeroRunner { +public class SpringApplicationRunner { // FIXME logging - private SpringZeroRunnerConfiguration configuration; + private SpringApplicationRunnerConfiguration configuration; private final File[] files; @@ -48,13 +48,14 @@ public class SpringZeroRunner { private FileWatchThread fileWatchThread; /** - * Create a new {@link SpringZeroRunner} instance. + * Create a new {@link SpringApplicationRunner} instance. * @param configuration the configuration * @param files the files to compile/watch * @param args input arguments */ - public SpringZeroRunner(final SpringZeroRunnerConfiguration configuration, - File[] files, String... args) { + public SpringApplicationRunner( + final SpringApplicationRunnerConfiguration configuration, File[] files, + String... args) { this.configuration = configuration; this.files = files.clone(); this.args = args.clone(); @@ -129,11 +130,11 @@ public class SpringZeroRunner { try { // User reflection to load and call Spring Class application = getContextClassLoader().loadClass( - "org.springframework.zero.SpringApplication"); + "org.springframework.bootstrap.SpringApplication"); Method method = application.getMethod("run", Object[].class, String[].class); this.applicationContext = method.invoke(null, this.sources, - SpringZeroRunner.this.args); + SpringApplicationRunner.this.args); } catch (Exception ex) { ex.printStackTrace(); @@ -171,7 +172,7 @@ public class SpringZeroRunner { public FileWatchThread() { this.previous = 0; - for (File file : SpringZeroRunner.this.files) { + for (File file : SpringApplicationRunner.this.files) { long current = file.lastModified(); if (current > this.previous) { this.previous = current; @@ -185,7 +186,7 @@ public class SpringZeroRunner { while (true) { try { Thread.sleep(TimeUnit.SECONDS.toMillis(1)); - for (File file : SpringZeroRunner.this.files) { + for (File file : SpringApplicationRunner.this.files) { long current = file.lastModified(); if (this.previous < current) { this.previous = current; diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java similarity index 79% rename from spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java index b985cc526f0..1dbdafa1e66 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.cli.runner; +package org.springframework.cli.runner; import java.util.logging.Level; -import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.cli.compiler.GroovyCompilerConfiguration; /** - * Configuration for the {@link SpringZeroRunner}. + * Configuration for the {@link SpringApplicationRunner}. * * @author Phillip Webb */ -public interface SpringZeroRunnerConfiguration extends GroovyCompilerConfiguration { +public interface SpringApplicationRunnerConfiguration extends GroovyCompilerConfiguration { /** * Returns {@code true} if the source file should be monitored for changes and diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java b/spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java rename to spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java index 610a5e867b8..2eeb6d18567 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java +++ b/spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.template; +package org.springframework.cli.template; import groovy.text.GStringTemplateEngine; import groovy.text.Template; diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory new file mode 100644 index 00000000000..4c3ba9e9ff6 --- /dev/null +++ b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory @@ -0,0 +1 @@ +org.springframework.cli.command.DefaultCommandFactory diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration new file mode 100644 index 00000000000..d38b20b129d --- /dev/null +++ b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration @@ -0,0 +1,5 @@ +org.springframework.cli.compiler.autoconfigure.SpringCompilerAutoConfiguration +org.springframework.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration +org.springframework.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration +org.springframework.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration + diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory deleted file mode 100644 index 174a6b5c0be..00000000000 --- a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory +++ /dev/null @@ -1 +0,0 @@ -org.springframework.zero.cli.command.DefaultCommandFactory diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration deleted file mode 100644 index 72c8ac4b8ad..00000000000 --- a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration +++ /dev/null @@ -1,5 +0,0 @@ -org.springframework.zero.cli.compiler.autoconfigure.SpringZeroCompilerAutoConfiguration -org.springframework.zero.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration -org.springframework.zero.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration -org.springframework.zero.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration - diff --git a/spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java b/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java similarity index 97% rename from spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java rename to spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java index 4460ac75b7a..100b91873fc 100644 --- a/spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java +++ b/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.springframework.zero.cli.command.RunCommand; +import org.springframework.cli.command.RunCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -85,7 +85,7 @@ public class SampleIntegrationTests { @BeforeClass public static void clean() { - // SpringZeroCli.main("clean"); + // SpringCli.main("clean"); // System.setProperty("ivy.message.logger.level", "3"); } diff --git a/spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java b/spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java similarity index 86% rename from spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java rename to spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java index 2b2f72728b4..ede14dd9876 100644 --- a/spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java +++ b/spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java @@ -1,4 +1,4 @@ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.Arrays; import java.util.EnumSet; @@ -10,11 +10,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.zero.cli.Command; -import org.springframework.zero.cli.NoSuchCommandException; -import org.springframework.zero.cli.SpringZeroCli; -import org.springframework.zero.cli.SpringZeroCli.NoArgumentsException; -import org.springframework.zero.cli.SpringZeroCli.NoHelpCommandArgumentsException; +import org.springframework.cli.Command; +import org.springframework.cli.NoSuchCommandException; +import org.springframework.cli.SpringCli; +import org.springframework.cli.SpringCli.NoArgumentsException; +import org.springframework.cli.SpringCli.NoHelpCommandArgumentsException; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -23,17 +23,17 @@ import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.verify; /** - * Tests for {@link SpringZeroCli}. + * Tests for {@link SpringCli}. * * @author Phillip Webb * @author Dave Syer */ -public class SpringZeroCliTests { +public class SpringCliTests { @Rule public ExpectedException thrown = ExpectedException.none(); - private SpringZeroCli cli; + private SpringCli cli; @Mock private Command regularCommand; @@ -43,23 +43,23 @@ public class SpringZeroCliTests { @Before public void setup() { MockitoAnnotations.initMocks(this); - this.cli = new SpringZeroCli() { + this.cli = new SpringCli() { @Override protected void showUsage() { - SpringZeroCliTests.this.calls.add(Call.SHOW_USAGE); + SpringCliTests.this.calls.add(Call.SHOW_USAGE); super.showUsage(); }; @Override protected void errorMessage(String message) { - SpringZeroCliTests.this.calls.add(Call.ERROR_MESSAGE); + SpringCliTests.this.calls.add(Call.ERROR_MESSAGE); super.errorMessage(message); } @Override protected void printStackTrace(Exception ex) { - SpringZeroCliTests.this.calls.add(Call.PRINT_STACK_TRACE); + SpringCliTests.this.calls.add(Call.PRINT_STACK_TRACE); super.printStackTrace(ex); } }; diff --git a/spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java b/spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java similarity index 96% rename from spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java rename to spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java index 743bebf5405..638c071cce2 100644 --- a/spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java +++ b/spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.cli.command; +package org.springframework.cli.command; import groovy.lang.GroovyObjectSupport; import groovy.lang.Script; import org.junit.Test; +import org.springframework.cli.command.OptionHandler; +import org.springframework.cli.command.ScriptCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/spring-cli/src/test/resources/commands/closure.groovy b/spring-cli/src/test/resources/commands/closure.groovy index 80836fd3a39..a88fcea6966 100644 --- a/spring-cli/src/test/resources/commands/closure.groovy +++ b/spring-cli/src/test/resources/commands/closure.groovy @@ -1,5 +1,5 @@ def run = { msg -> - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } diff --git a/spring-cli/src/test/resources/commands/command.groovy b/spring-cli/src/test/resources/commands/command.groovy index ee7d7f9767b..0563cbc34e3 100644 --- a/spring-cli/src/test/resources/commands/command.groovy +++ b/spring-cli/src/test/resources/commands/command.groovy @@ -11,7 +11,7 @@ class TestCommand implements Command { String usageHelp = "Not very useful" void run(String... args) { - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${args[0]}" } diff --git a/spring-cli/src/test/resources/commands/handler.groovy b/spring-cli/src/test/resources/commands/handler.groovy index 7d00e5aad3d..c26942aa6e1 100644 --- a/spring-cli/src/test/resources/commands/handler.groovy +++ b/spring-cli/src/test/resources/commands/handler.groovy @@ -12,7 +12,7 @@ class TestCommand extends OptionHandler { void run(OptionSet options) { // Demonstrate use of Grape.grab to load dependencies before running println "Clean : " + Git.open(".." as File).status().call().isClean() - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" } diff --git a/spring-cli/src/test/resources/commands/mixin.groovy b/spring-cli/src/test/resources/commands/mixin.groovy index ebed4704d22..1f0577030af 100644 --- a/spring-cli/src/test/resources/commands/mixin.groovy +++ b/spring-cli/src/test/resources/commands/mixin.groovy @@ -2,5 +2,5 @@ void options() { option "foo", "Foo set" } -org.springframework.zero.cli.command.ScriptCommandTests.executed = true +org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" diff --git a/spring-cli/src/test/resources/commands/runnable.groovy b/spring-cli/src/test/resources/commands/runnable.groovy index ad1f7eafe38..f181bab888c 100644 --- a/spring-cli/src/test/resources/commands/runnable.groovy +++ b/spring-cli/src/test/resources/commands/runnable.groovy @@ -4,7 +4,7 @@ class TestCommand implements Runnable { this.msg = msg } void run() { - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } } diff --git a/spring-cli/src/test/resources/commands/test.groovy b/spring-cli/src/test/resources/commands/test.groovy index 72f6176b92e..102275ccf0c 100644 --- a/spring-cli/src/test/resources/commands/test.groovy +++ b/spring-cli/src/test/resources/commands/test.groovy @@ -3,5 +3,5 @@ options { option "bar", "Bar has an argument of type int" withOptionalArg() ofType Integer } -org.springframework.zero.cli.command.ScriptCommandTests.executed = true +org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}" diff --git a/spring-cli/src/test/resources/log4j.properties b/spring-cli/src/test/resources/log4j.properties index dfd3b60fd34..0591897a1ba 100644 --- a/spring-cli/src/test/resources/log4j.properties +++ b/spring-cli/src/test/resources/log4j.properties @@ -4,6 +4,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n -log4j.category.org.springframework.zero=DEBUG +log4j.category.org.springframework.autoconfigure=DEBUG +log4j.category.org.springframework.bootstrap=DEBUG #log4j.category.org.springframework.integration.dsl=DEBUG #log4j.category.org.springframework.amqp=DEBUG diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java b/spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java similarity index 92% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java rename to spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java index dfe54239fa4..db3732a2545 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.util.List; import java.util.jar.JarEntry; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * {@link Launcher} for JAR based archives. This launcher assumes that dependency jars are diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java b/spring-launcher/src/main/java/org/springframework/launcher/Launcher.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java rename to spring-launcher/src/main/java/org/springframework/launcher/Launcher.java index 70df2f2808d..84072d7aaba 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/Launcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.io.File; import java.lang.reflect.Constructor; @@ -28,7 +28,7 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.logging.Logger; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * Base class for launchers that can start an application with a fully configured diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java b/spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java similarity index 97% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java rename to spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java index 61f1a7029c8..6fe050bcc2f 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.lang.reflect.Method; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java b/spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java similarity index 92% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java rename to spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java index 9d43172a8ed..e152424af35 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.io.IOException; import java.util.List; import java.util.jar.JarEntry; -import org.springframework.zero.launcher.jar.JarEntryFilter; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.jar.JarEntryFilter; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * {@link Launcher} for WAR based archives. This launcher for standard WAR archives. diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java rename to spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java index 4c60cc23f5e..a549b247d41 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; import java.io.InputStream; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java similarity index 99% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java rename to spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java index b9df11001e5..687e5c9230f 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; import java.io.File; import java.io.IOException; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java b/spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java similarity index 86% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java rename to spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java index b6a24e0a978..06f1bdc3508 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java @@ -17,7 +17,7 @@ /** * Classes and interfaces to allows random access to a block of data. * - * @see org.springframework.zero.launcher.data.RandomAccessData + * @see org.springframework.launcher.data.RandomAccessData */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java index cba44862867..d368d4586be 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.util.jar.JarEntry; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java similarity index 91% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java index 8d71cbf2310..98f641e3603 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.util.zip.ZipEntry; -import org.springframework.zero.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessData; /** * A {@link ZipEntry} returned from a {@link RandomAccessDataZipInputStream}. diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java index 3796bcc4671..8f0c6d1340e 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.io.FilterInputStream; import java.io.IOException; @@ -23,7 +23,7 @@ import java.io.PushbackInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.springframework.zero.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessData; /** * A {@link ZipInputStream} backed by {@link RandomAccessData}. Parsed entries provide diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java index 9d4f2f84010..ac8b46b34c9 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.io.BufferedInputStream; import java.io.EOFException; @@ -39,8 +39,8 @@ import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; import java.util.zip.ZipEntry; -import org.springframework.zero.launcher.data.RandomAccessData; -import org.springframework.zero.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessDataFile; /** * A Jar file that can loaded from a {@link RandomAccessDataFile}. This class extends and diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java similarity index 93% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java index e94526e6e80..4a44ebcdb78 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java @@ -17,5 +17,5 @@ /** * Support for loading and manipulating JAR/WAR files. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java b/spring-launcher/src/main/java/org/springframework/launcher/package-info.java similarity index 86% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java rename to spring-launcher/src/main/java/org/springframework/launcher/package-info.java index 416917b4ac4..a878456639a 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/package-info.java @@ -20,8 +20,8 @@ * not need to create shade style jars) and are executed without unpacking. The only * constraint is that nested JARs must be stored in the archive uncompressed. * - * @see org.springframework.zero.launcher.JarLauncher - * @see org.springframework.zero.launcher.WarLauncher + * @see org.springframework.launcher.JarLauncher + * @see org.springframework.launcher.WarLauncher */ -package org.springframework.zero.launcher; +package org.springframework.launcher; diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java b/spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java similarity index 96% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java rename to spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java index 73adea6973b..b586f9fb407 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java b/spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTest.java similarity index 97% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java rename to spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTest.java index c084af67fad..959508c65ca 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -39,9 +39,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.launcher.ByteArrayStartsWith; -import org.springframework.zero.launcher.data.RandomAccessData; -import org.springframework.zero.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.ByteArrayStartsWith; +import org.springframework.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessDataFile; /** * Tests for {@link RandomAccessDataFile}. diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTest.java similarity index 90% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java rename to spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTest.java index 596f8e9dbd6..b6e7a9fc584 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @@ -31,9 +31,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.launcher.data.RandomAccessDataFile; -import org.springframework.zero.launcher.jar.RandomAccessDataZipEntry; -import org.springframework.zero.launcher.jar.RandomAccessDataZipInputStream; +import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.jar.RandomAccessDataZipEntry; +import org.springframework.launcher.jar.RandomAccessDataZipInputStream; /** * Tests for {@link RandomAccessDataZipInputStream}. diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTest.java similarity index 98% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java rename to spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTest.java index 2ad071c4d98..b50ddd5a431 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -48,9 +48,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.launcher.data.RandomAccessDataFile; -import org.springframework.zero.launcher.jar.JarEntryFilter; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.jar.JarEntryFilter; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * Tests for {@link RandomAccessJarFile}. diff --git a/spring-package-maven-plugin/src/it/executable-jar/verify.groovy b/spring-package-maven-plugin/src/it/executable-jar/verify.groovy index f5e1f208b65..a52a963b719 100644 --- a/spring-package-maven-plugin/src/it/executable-jar/verify.groovy +++ b/spring-package-maven-plugin/src/it/executable-jar/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.zero.maven.*; +import org.springframework.maven.packaging.*; Verify.verifyJar( new File( basedir, "target/executable-jar-0.0.1.BUILD-SNAPSHOT.jar" ) diff --git a/spring-package-maven-plugin/src/it/executable-war/verify.groovy b/spring-package-maven-plugin/src/it/executable-war/verify.groovy index b0d90d5aaea..79ba3a8fb7e 100644 --- a/spring-package-maven-plugin/src/it/executable-war/verify.groovy +++ b/spring-package-maven-plugin/src/it/executable-war/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.zero.maven.*; +import org.springframework.maven.packaging.*; Verify.verifyWar( new File( basedir, "target/executable-war-0.0.1.BUILD-SNAPSHOT.war" ) diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java similarity index 99% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java index 3d8d4f449be..98f26f365ce 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.io.IOException; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarMojo.java similarity index 94% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarMojo.java index 6f50902d0f2..dc3766af1c6 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.util.Arrays; import java.util.HashSet; @@ -56,6 +56,6 @@ public class ExecutableJarMojo extends AbstractExecutableArchiveMojo { @Override protected String getLauncherClass() { - return "org.springframework.zero.launcher.JarLauncher"; + return "org.springframework.launcher.JarLauncher"; } } diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java similarity index 96% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java index 3b0ea5d4e0c..ae60ddb9e57 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.util.Collections; @@ -85,6 +85,6 @@ public class ExecutableWarMojo extends AbstractExecutableArchiveMojo { @Override protected String getLauncherClass() { - return "org.springframework.zero.launcher.WarLauncher"; + return "org.springframework.launcher.WarLauncher"; } } diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java index c93c6d60b85..71d518aac83 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.BufferedInputStream; import java.io.File; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java index b3013e596f5..92c2dedfcbc 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.IOException; import java.io.InputStream; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java similarity index 92% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java index 796d1f20290..63a7ad8ebb1 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.io.FileOutputStream; @@ -26,8 +26,9 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.maven.sample.ClassWithMainMethod; -import org.springframework.zero.maven.sample.ClassWithoutMainMethod; +import org.springframework.maven.packaging.MainClassFinder; +import org.springframework.maven.packaging.sample.ClassWithMainMethod; +import org.springframework.maven.packaging.sample.ClassWithoutMainMethod; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java similarity index 94% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java index 79a035f3c72..b39089248e7 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.jar.JarOutputStream; import org.junit.Test; +import org.springframework.maven.packaging.PropertiesMergingResourceTransformer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java index cdcd1716731..1caa3714ba3 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.util.Enumeration; @@ -102,14 +102,14 @@ public class Verify { assertHasEntryNameStartingWith(entries, "lib/spring-core"); assertHasEntryNameStartingWith(entries, "lib/javax.servlet-api-3.0.1.jar"); assertTrue("Unpacked launcher classes", entries.containsKey("org/" - + "springframework/zero/launcher/JarLauncher.class")); + + "springframework/launcher/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("org/" + "test/SampleApplication.class")); } @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.zero.launcher.JarLauncher", manifest + assertEquals("org.springframework.launcher.JarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals("org.test.SampleApplication", manifest.getMainAttributes() .getValue("Start-Class")); @@ -131,7 +131,7 @@ public class Verify { assertHasEntryNameStartingWith(entries, "WEB-INF/lib-provided/javax.servlet-api-3.0.1.jar"); assertTrue("Unpacked launcher classes", entries.containsKey("org/" - + "springframework/zero/launcher/JarLauncher.class")); + + "springframework/launcher/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("WEB-INF/classes/org/" + "test/SampleApplication.class")); assertTrue("Web content", entries.containsKey("index.html")); @@ -139,7 +139,7 @@ public class Verify { @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.zero.launcher.WarLauncher", manifest + assertEquals("org.springframework.launcher.WarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals("org.test.SampleApplication", manifest.getMainAttributes() .getValue("Start-Class")); diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java index b5626436e61..47957be0743 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven.sample; +package org.springframework.maven.packaging.sample; /** * Sample class with a main method. diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java index 6560f33e2e4..58d3a2d66f0 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven.sample; +package org.springframework.maven.packaging.sample; /** * Sample class without a main method. diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java index e60a2bfd413..6bbf74c6b5a 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java @@ -19,13 +19,13 @@ package org.springframework.zero.sample.actuator.ui; import java.util.Date; import java.util.Map; +import org.springframework.actuate.properties.SecurityProperties; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.actuate.properties.SecurityProperties; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @EnableAutoConfiguration @ComponentScan diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index 42f5cc4aab6..f99624eb673 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -27,13 +27,13 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java index f30e81befd7..5f83df24879 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -37,7 +38,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java index 53d75618c9a..19584b207c3 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java @@ -16,11 +16,11 @@ package org.springframework.zero.sample.actuator; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java index 7c2c18b292a..0c2ed16d200 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java @@ -16,8 +16,8 @@ package org.springframework.zero.sample.actuator; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import org.springframework.zero.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) @Component diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index 4084397b145..0b0df3421e1 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -39,7 +40,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java index 0c98e44e43e..cedcef257a3 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java @@ -29,6 +29,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -41,7 +42,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java index 6d4aa163015..9965eb5f105 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java @@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java index d6dd397904b..8bf53c6d2b1 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -41,7 +42,6 @@ import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java index 9888c6cc089..b055a7e3c84 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -40,7 +41,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java index a4e92246ee3..d16e6b92500 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -40,7 +41,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java index 1a3d5e45400..46eff5ffa61 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java index 5c6113c7c8c..a6f9e1ca284 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java @@ -16,6 +16,7 @@ package org.springframework.zero.sample.batch; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepContribution; @@ -26,11 +27,10 @@ import org.springframework.batch.core.scope.context.ChunkContext; import org.springframework.batch.core.step.tasklet.Tasklet; import org.springframework.batch.repeat.RepeatStatus; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java index 46ef39e090a..873fbfbf672 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java @@ -22,7 +22,7 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.zero.SpringApplication; +import org.springframework.bootstrap.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java index 595a5d56c6d..fc6ab264431 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.data.jpa; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @ComponentScan diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java index 187d2a3f162..eaac3109e81 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java index b1fab4e9ebb..7d26d2e54d9 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.integration; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java index 570d15d2dc0..8c9792e1cba 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java @@ -16,7 +16,7 @@ package org.springframework.zero.sample.integration; -import org.springframework.zero.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) public class ServiceProperties { diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java index 2728be0718a..02e50a5befd 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternUtils; import org.springframework.util.StreamUtils; -import org.springframework.zero.SpringApplication; import org.springframework.zero.sample.integration.SampleIntegrationApplication; import org.springframework.zero.sample.integration.producer.ProducerApplication; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java index 4eda4280f8d..915b13bfb07 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java @@ -19,9 +19,9 @@ package org.springframework.zero.sample.integration.producer; import java.io.File; import java.io.FileOutputStream; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; @Configuration public class ProducerApplication implements CommandLineRunner { diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java index 2921133652b..b0a3dabde98 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.jetty; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java index 3b8e138aa0f..0fde9232e10 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java index 9846ac5f640..3fd108e4482 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.profile; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.sample.profile.service.MessageService; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java index 0119ea60cb9..f9f60dea65a 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.simple; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.sample.simple.service.HelloWorldService; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java index 66abcd2445e..e66d71400ef 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.tomcat; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index 196c712f017..75b940f53ac 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -25,6 +25,10 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -34,10 +38,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.zero.sample.tomcat.service.HelloWorldService; import org.springframework.zero.sample.tomcat.web.SampleController; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java index 41b969527bb..3f318fe78ec 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java index a36d7c6bee7..80f18d28580 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.traditional; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java index b8a7b960bff..165ce412f17 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java index 18c9bd4f2ef..987d109cd55 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.web.ui; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java index e9fc358faf5..5bc3fbc01b7 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java @@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -18,7 +19,6 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java index 07ab3af1e6c..d503e9ad644 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java +++ b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java @@ -17,8 +17,8 @@ package org.springframework.zero.sample.xml; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.zero.sample.xml.service.HelloWorldService; public class SampleSpringXmlApplication implements CommandLineRunner {