diff --git a/eclipse/eclipse-code-formatter.xml b/eclipse/eclipse-code-formatter.xml index 8f4b3eb5f3..b390beb53b 100644 --- a/eclipse/eclipse-code-formatter.xml +++ b/eclipse/eclipse-code-formatter.xml @@ -1,6 +1,6 @@ - + diff --git a/spring-zero-actuator/README.md b/spring-zero-actuator/README.md index 109a8ae69b..aac0cb5bc6 100644 --- a/spring-zero-actuator/README.md +++ b/spring-zero-actuator/README.md @@ -1,4 +1,4 @@ -# Spring Bootstrap Actuator +# Spring Zero Actuator Minimum fuss for getting applications up and running in production, and in other environments. There is a strong emphasis on implementing @@ -23,8 +23,8 @@ RESTful web services but many features are more generic than that. For a quick introduction and to get started quickly with a new project, carry on reading. For more in depth coverage of the features -of Spring Bootstrap Actuator, go to the -[Feature Guide](https://github.com/SpringSource/spring-bootstrap/tree/master/spring-bootstrap-actuator/docs/Features.md). +of Spring Zero Actuator, go to the +[Feature Guide](https://github.com/SpringSource/spring-bootstrap/tree/master/spring-zero-actuator/docs/Features.md). # Getting Started @@ -47,18 +47,18 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies: 1.0.0-SNAPSHOT jar - org.springframework.bootstrap - spring-bootstrap-applications + org.springframework.zero + spring-zero-starter 0.0.1-SNAPSHOT - org.springframework.bootstrap - spring-bootstrap-web-application + org.springframework.zero + spring-zero-web-starter - org.springframework.bootstrap - spring-bootstrap-service + org.springframework.zero + spring-zero-service @@ -72,7 +72,7 @@ If you are using Maven create a really simple `pom.xml` with 2 dependencies: If you like Gradle, that's fine, and you will know what to do with -those dependencies. The first dependency adds Spring Bootstrap auto +those dependencies. The first dependency adds Spring Zero auto configuration and the Jetty container to your application, and the second one adds some more opinionated stuff like the default management endpoints. If you prefer Tomcat you can just add the @@ -89,7 +89,7 @@ Then in another terminal ok $ curl localhost:8080/metrics {"counter.status.200.health":1.0,"gauge.response.health":10.0,"mem":120768.0,"mem.free":105012.0,"processors":4.0} - + `/health` is the default location for the health endpoint - it tells you if the application is running and healthy. `/metrics` is the default location for the metrics endpoint - it gives you basic counts and @@ -121,14 +121,14 @@ endpoint. An endpoint can be implemented as a Spring MVC public Map helloWorld() { return Collections.singletonMap("message", "Hello World"); } - + public static void main(String[] args) throws Exception { SpringApplication.run(SampleController.class, args); } } -You can launch that straight away using the Spring Bootstrap CLI +You can launch that straight away using the Spring Zero CLI (without the `@EnableAutoConfiguration` and even without the import statements that your IDE will add if you are using one), or you can use the main method to launch it from your project jar. Just add a @@ -155,7 +155,7 @@ which are more convenient at development time. Here are a few: 1. Use the Maven exec plugin, e.g. $ mvn exec:java - + 2. Run directly in your IDE, e.g. Eclipse or IDEA let you right click on a class and run it. @@ -167,7 +167,7 @@ on a class and run it. ## Externalizing configuration -Spring Bootstrap likes you to externalize your configuration so you +Spring Zero likes you to externalize your configuration so you can work with the same application code in different environments. To get started with this you create a file in the root of your classpath (`src/main/resources` if using Maven) - if you like YAML you can call @@ -187,7 +187,7 @@ or if you like Java `Properties` files, you can call it management.port: 9001 logging.file: target/log.out -Those examples are properties that Spring Bootstrap itself binds to +Those examples are properties that Spring Zero itself binds to out of the box, so if you make that change and run the app again, you will find the home page on port 9000 instead of 8080: @@ -217,7 +217,7 @@ that is to simply refer to it in an `@Value` annotation, e.g. @Controller @EnableAutoConfiguration public class SampleController { - + @Value("${service.message:Hello World}") private String value = "Goodbye Everypone" @@ -226,7 +226,7 @@ that is to simply refer to it in an `@Value` annotation, e.g. public Map helloWorld() { return Collections.singletonMap("message", message); } - + ... } @@ -251,13 +251,13 @@ automatically in a separate value object. For instance: private int value = 0; ... getters and setters } - + // SampleController.java @Controller @EnableAutoConfiguration @EnableConfigurationProperties(ServiceProperties.class) public class SampleController { - + @Autowired private ServiceProperties properties; @@ -266,10 +266,10 @@ automatically in a separate value object. For instance: public Map helloWorld() { return Collections.singletonMap("message", properties.getMessage()); } - + ... } - + When you ask to `@EnableConfigurationProperties(ServiceProperties.class)` you are saying you want a bean of type `ServiceProperties` and that you want @@ -341,9 +341,9 @@ Then you will be able to inject a `DataSource` into your controller: @EnableAutoConfiguration @EnableConfigurationProperties(ServiceProperties.class) public class SampleController { - + private JdbcTemplate jdbcTemplate; - + @Autowired public SampleController(DataSource dataSource) { this.jdbcTemplate = new JdbcTemplate(dataSource); @@ -354,19 +354,19 @@ Then you will be able to inject a `DataSource` into your controller: public Map helloWorld() { return jdbcTemplate.queryForMap("SELECT * FROM MESSAGES WHERE ID=?", 0); } - + ... } - + The app will run (going back to the default security configuration): - + $ curl user:password@localhost:8080/ {"error":"Internal Server Error", "status":500, "exception":...} - + but there's no data in the database yet and the `MESSAGES` table doesn't even exist, so there's an error. One easy way to fix it is to provide a `schema.sql` script in the root of the classpath, e.g. - + create table MESSAGES ( ID BIGINT NOT NULL PRIMARY KEY, MESSAGE VARCHAR(255) @@ -377,6 +377,6 @@ Now when you run the app you get a sensible response: $ curl user:password@localhost:8080/ {"ID":0, "MESSAGE":"Hello Phil"} - + Obviously, this is only the start, but hopefully you have a good grasp of the basics and are ready to try it out yourself. diff --git a/spring-zero-actuator/docs/Features.md b/spring-zero-actuator/docs/Features.md index 29528d6309..f889d0253c 100644 --- a/spring-zero-actuator/docs/Features.md +++ b/spring-zero-actuator/docs/Features.md @@ -1,12 +1,12 @@ -# Spring Bootstrap Actuator Feature Guide +# Spring Zero Actuator Feature Guide -Here are some (most, hopefully all) the features of Spring Bootstrap +Here are some (most, hopefully all) the features of Spring Zero 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 Bootstrap (or +TODO: some of these are features of Spring Zero (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 Bootstrap will +In addition to command line option arguments, Spring Zero 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 Bootstrap also binds the properties to any bean in your +Spring Zero 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 Bootstrap takes it a stage further. If you include in your +Spring Zero 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 Bootstrap loads additional properties files if there are active +Spring Zero 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 Bootstrap uses some relaxed rules for binding `Environment` +Spring Zero 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 Bootstrap Actuator. If you prefer to use +by Spring Zero 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 @@ -217,7 +217,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 Bootstrap create the container for +need it. Instead of letting Spring Zero create the container for you, just create a bean of type `TomcatEmbeddedServletContainerFactory` and override one of its methods, or inject some customizations, e.g. @@ -261,7 +261,7 @@ this. ## Customizing Logging -Spring Bootstrap uses SLF4J for logging, but leaves the implementation +Spring Zero 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 @@ -290,12 +290,12 @@ from the Spring `Environment` to System properties: |PID |PID | The current process ID is discovered if possible and not already provided | All the logging systems supported can consult System properties when -parsing their configuration files. See the defailt configurations in -`spring-bootstrap.jar` for examples. +parsing their configuration files. See the default configurations in +`spring-zero-core.jar` for examples. ## Application Context Initializers -To add additional application context initializers to the Bootstrap +To add additional application context initializers to the Zero 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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java similarity index 98% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java index 0d6cec4724..69fea7e24f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit; +package org.springframework.zero.actuate.audit; import java.io.Serializable; import java.util.Collections; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java index 839f03494d..6349f6ae7b 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit; +package org.springframework.zero.actuate.audit; import java.util.Date; import java.util.List; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java similarity index 97% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java index f7d8ff97b6..5a564094d6 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit; +package org.springframework.zero.actuate.audit; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java index 08141f95b8..a2034b8f60 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit.listener; +package org.springframework.zero.actuate.audit.listener; import java.util.Date; import java.util.Map; -import org.springframework.bootstrap.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java similarity index 87% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java index 169eccf381..8f1707c86f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit.listener; +package org.springframework.zero.actuate.audit.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.actuate.audit.AuditEvent; -import org.springframework.bootstrap.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java similarity index 71% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java index 1775234d2a..684c59fa10 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.actuate.audit.AuditEvent; -import org.springframework.bootstrap.actuate.audit.AuditEventRepository; -import org.springframework.bootstrap.actuate.audit.InMemoryAuditEventRepository; -import org.springframework.bootstrap.actuate.audit.listener.AuditListener; -import org.springframework.bootstrap.actuate.security.AuthenticationAuditListener; -import org.springframework.bootstrap.actuate.security.AuthorizationAuditListener; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java similarity index 76% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java index f4f00830bd..83c6f531f7 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import java.util.LinkedHashMap; import java.util.Map; @@ -21,32 +21,32 @@ import java.util.Properties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.actuate.endpoint.BeansEndpoint; -import org.springframework.bootstrap.actuate.endpoint.DumpEndpoint; -import org.springframework.bootstrap.actuate.endpoint.Endpoint; -import org.springframework.bootstrap.actuate.endpoint.EnvironmentEndpoint; -import org.springframework.bootstrap.actuate.endpoint.HealthEndpoint; -import org.springframework.bootstrap.actuate.endpoint.InfoEndpoint; -import org.springframework.bootstrap.actuate.endpoint.MetricsEndpoint; -import org.springframework.bootstrap.actuate.endpoint.PublicMetrics; -import org.springframework.bootstrap.actuate.endpoint.ShutdownEndpoint; -import org.springframework.bootstrap.actuate.endpoint.TraceEndpoint; -import org.springframework.bootstrap.actuate.endpoint.VanillaPublicMetrics; -import org.springframework.bootstrap.actuate.health.HealthIndicator; -import org.springframework.bootstrap.actuate.health.VanillaHealthIndicator; -import org.springframework.bootstrap.actuate.metrics.InMemoryMetricRepository; -import org.springframework.bootstrap.actuate.metrics.MetricRepository; -import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; -import org.springframework.bootstrap.actuate.trace.TraceRepository; -import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.bind.PropertiesConfigurationFactory; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for common management diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 83% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index aa3731398b..f6535f3c4f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Servlet; @@ -22,19 +22,6 @@ 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.actuate.endpoint.Endpoint; -import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerAdapter; -import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.bootstrap.context.annotation.AutoConfigureAfter; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.bootstrap.properties.ServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; @@ -44,6 +31,19 @@ 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.PropertyPlaceholderAutoConfiguration; +import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; +import org.springframework.zero.context.annotation.AutoConfigureAfter; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.zero.properties.ServerProperties; /** * {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 81% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index f710090429..4f65cc2d65 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Filter; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerAdapter; -import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.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.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 68% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index b95a8f0730..ff9a434384 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.actuate.web.BasicErrorController; -import org.springframework.bootstrap.actuate.web.ErrorController; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -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.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 64% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index b0eb62af8c..903abcc8bc 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; -import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration; -import org.springframework.bootstrap.context.annotation.AutoConfigureAfter; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.context.annotation.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.web.ServerPropertiesAutoConfiguration; +import org.springframework.zero.context.annotation.AutoConfigureAfter; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.annotation.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} for the * {@link ManagementServerPropertiesAutoConfiguration} bean. - * + * * @author Dave Syer */ @Configuration @@ -35,7 +35,7 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties public class ManagementServerPropertiesAutoConfiguration { - @Bean(name = "org.springframework.bootstrap.actuate.properties.ManagementServerProperties") + @Bean(name = "org.springframework.zero.actuate.properties.ManagementServerProperties") @ConditionalOnMissingBean public ManagementServerProperties serverProperties() { return new ManagementServerProperties(); diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java similarity index 88% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java index a7d6ef8715..0cb300d548 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import java.io.IOException; @@ -28,12 +28,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.actuate.metrics.CounterService; -import org.springframework.bootstrap.actuate.metrics.GaugeService; -import org.springframework.bootstrap.context.annotation.AutoConfigureAfter; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -41,6 +35,12 @@ 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.context.annotation.AutoConfigureAfter; +import org.springframework.zero.context.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 66% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 5a369b1063..be5764a8de 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; -import org.springframework.bootstrap.actuate.metrics.CounterService; -import org.springframework.bootstrap.actuate.metrics.DefaultCounterService; -import org.springframework.bootstrap.actuate.metrics.DefaultGaugeService; -import org.springframework.bootstrap.actuate.metrics.GaugeService; -import org.springframework.bootstrap.actuate.metrics.InMemoryMetricRepository; -import org.springframework.bootstrap.actuate.metrics.MetricRepository; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for metrics services. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java similarity index 91% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java index e232eccc3e..8ffe02d6cb 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -14,21 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import java.util.ArrayList; import java.util.Arrays; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.actuate.endpoint.Endpoint; -import org.springframework.bootstrap.actuate.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.bootstrap.actuate.properties.SecurityProperties; -import org.springframework.bootstrap.actuate.web.ErrorController; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -45,6 +37,14 @@ 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.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.annotation.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or @@ -58,12 +58,12 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn * password=password) but can easily be customized by providing a bean definition * of type {@link AuthenticationManager}. Also provides audit logging of authentication * events. - * + * *

* The framework {@link Endpoint}s (used to expose application information to operations) * include a {@link Endpoint#isSensitive() sensitive} configuration option which will be * used as a security hint by the filter created here. - * + * *

* Some common simple customizations: *

    @@ -75,7 +75,7 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn *
  • Add form login for user facing resources: add a * {@link WebSecurityConfigurerAdapter} and use {@link HttpSecurity#formLogin()}
    • *
- * + * * @author Dave Syer */ @Configuration @@ -84,7 +84,7 @@ import org.springframework.security.web.authentication.www.BasicAuthenticationEn @EnableConfigurationProperties public class SecurityAutoConfiguration { - @Bean(name = "org.springframework.bootstrap.actuate.properties.SecurityProperties") + @Bean(name = "org.springframework.zero.actuate.properties.SecurityProperties") @ConditionalOnMissingBean public SecurityProperties securityProperties() { return new SecurityProperties(); diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 74% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index 7375df5792..d391aef36b 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; -import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; -import org.springframework.bootstrap.actuate.trace.TraceRepository; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 78% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index 1c79e2b234..d826886aae 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Servlet; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.actuate.trace.TraceRepository; -import org.springframework.bootstrap.actuate.trace.WebRequestTraceFilter; -import org.springframework.bootstrap.context.annotation.AutoConfigureAfter; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.AutoConfigureAfter; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java similarity index 96% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java index 4d4030d12e..7294fbfade 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java similarity index 93% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java index f82aa338ec..373e99fa40 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; /** * Tagging interface used to indicate that {@link Endpoint} that performs some action. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java similarity index 93% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java index 922c7a0ce3..8669b4074c 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import org.springframework.beans.BeansException; -import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties; /** * Exposes JSON view of Spring beans. If the {@link Environment} contains a key setting diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java similarity index 90% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java index 887bc10fbc..72c0265f98 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.util.Arrays; import java.util.List; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.annotation.ConfigurationProperties; /** * {@link Endpoint} to expose thread info. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java similarity index 96% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java index ada04a4f66..fde590ffd4 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import org.springframework.http.MediaType; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java index ab948c7caf..4c9eb08f0d 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties; /** * {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java similarity index 86% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java index 122cc9f658..62d25899ea 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; -import org.springframework.bootstrap.actuate.health.HealthIndicator; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; import org.springframework.util.Assert; +import org.springframework.zero.actuate.health.HealthIndicator; +import org.springframework.zero.context.annotation.ConfigurationProperties; /** * {@link Endpoint} to expose application health. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java similarity index 91% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java index c2a3e81f35..958c64a2dd 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; import org.springframework.util.Assert; +import org.springframework.zero.context.annotation.ConfigurationProperties; /** * {@link Endpoint} to expose arbitrary application information. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java similarity index 88% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java index 3af5cfa796..91431e8185 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.bootstrap.actuate.metrics.Metric; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; import org.springframework.util.Assert; +import org.springframework.zero.actuate.metrics.Metric; +import org.springframework.zero.context.annotation.ConfigurationProperties; /** * {@link Endpoint} to expose {@link PublicMetrics}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java similarity index 88% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java index c99b624ee2..fa6101321a 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collection; -import org.springframework.bootstrap.actuate.metrics.Metric; +import org.springframework.zero.actuate.metrics.Metric; /** * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java similarity index 91% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java index e57f4208c3..05428e2159 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collections; import java.util.Map; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties; /** * {@link ActionEndpoint} to shutdown the {@link ApplicationContext}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java similarity index 83% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java index 632cd6e3b7..8321d4ea0d 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.List; -import org.springframework.bootstrap.actuate.trace.Trace; -import org.springframework.bootstrap.actuate.trace.TraceRepository; -import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties; /** * {@link Endpoint} to expose {@link Trace} information. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java similarity index 89% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java index a7c8147150..b2f3dab66e 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collection; import java.util.LinkedHashSet; -import org.springframework.bootstrap.actuate.metrics.Metric; -import org.springframework.bootstrap.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java similarity index 98% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java index e75e16e3de..19b7468b4a 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint.mvc; +package org.springframework.zero.actuate.endpoint.mvc; import java.util.ArrayList; import java.util.Arrays; @@ -28,7 +28,6 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.actuate.endpoint.Endpoint; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @@ -40,6 +39,7 @@ 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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java index 4af570b19c..14a680b926 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint.mvc; +package org.springframework.zero.actuate.endpoint.mvc; import java.util.ArrayList; import java.util.Collection; @@ -24,8 +24,6 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.InitializingBean; -import org.springframework.bootstrap.actuate.endpoint.ActionEndpoint; -import org.springframework.bootstrap.actuate.endpoint.Endpoint; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; @@ -33,6 +31,8 @@ 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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java similarity index 82% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java index 55d86a25f6..3827688050 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.fixme; +package org.springframework.zero.actuate.fixme; import java.io.IOException; @@ -28,16 +28,6 @@ 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.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.actuate.web.BasicErrorController; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.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; @@ -46,6 +36,16 @@ 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.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java index cfddd81751..ddfc96aea2 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.health; +package org.springframework.zero.actuate.health; /** * Strategy interface used to provide an indication of application health. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java index afb22b9e91..32369f8be0 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.health; +package org.springframework.zero.actuate.health; /** * Default implementation of {@link HealthIndicator} that simply returns "ok". diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java index 767161dd04..59fc685be9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; /** * A service that can be used to increment, decrement and reset a {@link Metric}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java similarity index 96% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java index 905c313d84..763801457f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import java.util.Date; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java index 139afb28f9..b262f0cec3 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import java.util.Date; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java index 801ef8ef95..ec22869dc3 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; /** * A service that can be used to manage a {@link Metric} as a gauge. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java similarity index 97% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java index 3fe196cbf7..d16614aa51 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java similarity index 97% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java index 5401927f77..32e0327fa1 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import java.util.Date; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java similarity index 98% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java index f92cbb3d9e..9726fb07aa 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java index 6a54b893a7..afc746cb43 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import java.util.Collection; import java.util.Date; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java similarity index 90% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java index 6d6ac346df..896d79f9d3 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.properties; +package org.springframework.zero.actuate.properties; import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; -import org.springframework.bootstrap.properties.ServerProperties; +import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.properties.ServerProperties; /** * Properties for the management server (e.g. port and path settings). diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java index 1ea56222c4..ad397021d0 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.properties; +package org.springframework.zero.actuate.properties; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy; +import org.springframework.zero.context.annotation.ConfigurationProperties; /** * Properties for the security aspects of an application. diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java index 26e4431cc8..a33dd40f17 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.security; +package org.springframework.zero.actuate.security; import java.util.HashMap; import java.util.Map; -import org.springframework.bootstrap.actuate.audit.AuditEvent; -import org.springframework.bootstrap.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java similarity index 93% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java index 816d384bcb..d11d03a329 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.security; +package org.springframework.zero.actuate.security; import java.util.HashMap; import java.util.Map; -import org.springframework.bootstrap.actuate.audit.AuditEvent; -import org.springframework.bootstrap.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java similarity index 96% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java index 7e4e71fe67..01067ea38d 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.trace; +package org.springframework.zero.actuate.trace; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java similarity index 96% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java index 4f21142004..090aa72983 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.trace; +package org.springframework.zero.actuate.trace; import java.util.Date; import java.util.Map; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java similarity index 95% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java index 78d8f189eb..3eac458ce9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.trace; +package org.springframework.zero.actuate.trace; import java.util.List; import java.util.Map; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java similarity index 98% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java index 2f0ba219f2..9ce56289ea 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.trace; +package org.springframework.zero.actuate.trace; import java.io.IOException; import java.util.Collections; diff --git a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java similarity index 96% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java index 2497ec58bd..206407180b 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.web; +package org.springframework.zero.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-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java similarity index 94% rename from spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java rename to spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java index d7f3973c5c..372fc25ee9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.web; +package org.springframework.zero.actuate.web; import org.springframework.stereotype.Controller; diff --git a/spring-zero-actuator/src/main/resources/META-INF/spring.factories b/spring-zero-actuator/src/main/resources/META-INF/spring.factories index 83f5b6d483..61e36f9039 100644 --- a/spring-zero-actuator/src/main/resources/META-INF/spring.factories +++ b/spring-zero-actuator/src/main/resources/META-INF/spring.factories @@ -1,11 +1,11 @@ -org.springframework.bootstrap.context.annotation.EnableAutoConfiguration=\ -org.springframework.bootstrap.actuate.autoconfigure.AuditAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.EndpointAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.MetricFilterAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.SecurityAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ -org.springframework.bootstrap.actuate.autoconfigure.TraceWebFilterAutoConfiguration +org.springframework.zero.context.annotation.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 diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java similarity index 96% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java index ade84630fc..e0e4ea2fec 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate; +package org.springframework.zero.actuate; import java.util.HashMap; import java.util.Map; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java similarity index 93% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java index 362ef5773b..3016173ed9 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit; +package org.springframework.zero.actuate.audit; import java.util.Collections; import org.junit.Test; +import org.springframework.zero.actuate.audit.AuditEvent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java index efc7b0f9a0..9cbe0b8963 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit; +package org.springframework.zero.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 static org.junit.Assert.assertEquals; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java similarity index 78% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java index 5c63c2ab94..9031611cb8 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java @@ -13,13 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.audit.listener; +package org.springframework.zero.actuate.audit.listener; import java.util.Collections; import org.junit.Test; -import org.springframework.bootstrap.actuate.audit.AuditEvent; -import org.springframework.bootstrap.actuate.audit.AuditEventRepository; +import org.springframework.zero.actuate.audit.AuditEvent; +import org.springframework.zero.actuate.audit.AuditEventRepository; +import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent; +import org.springframework.zero.actuate.audit.listener.AuditListener; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java similarity index 83% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java index ffaeaf12a1..e5b3df9e67 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Test; -import org.springframework.bootstrap.actuate.audit.AuditEventRepository; -import org.springframework.bootstrap.actuate.audit.InMemoryAuditEventRepository; -import org.springframework.bootstrap.actuate.security.AuthenticationAuditListener; -import org.springframework.bootstrap.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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java similarity index 79% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java index 0d1885f605..7955089ff5 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -13,20 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.actuate.TestUtils; -import org.springframework.bootstrap.actuate.endpoint.BeansEndpoint; -import org.springframework.bootstrap.actuate.endpoint.DumpEndpoint; -import org.springframework.bootstrap.actuate.endpoint.EnvironmentEndpoint; -import org.springframework.bootstrap.actuate.endpoint.HealthEndpoint; -import org.springframework.bootstrap.actuate.endpoint.InfoEndpoint; -import org.springframework.bootstrap.actuate.endpoint.MetricsEndpoint; -import org.springframework.bootstrap.actuate.endpoint.ShutdownEndpoint; -import org.springframework.bootstrap.actuate.endpoint.TraceEndpoint; import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.zero.actuate.TestUtils; +import org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration; +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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 093ef5681a..c47a1e603e 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import java.io.FileNotFoundException; import java.net.SocketException; @@ -22,15 +22,6 @@ import java.nio.charset.Charset; import org.junit.After; import org.junit.Test; -import org.springframework.bootstrap.actuate.TestUtils; -import org.springframework.bootstrap.actuate.endpoint.AbstractEndpoint; -import org.springframework.bootstrap.actuate.endpoint.Endpoint; -import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; @@ -41,6 +32,17 @@ 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.actuate.TestUtils; +import org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; +import org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; +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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 89% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index 55182f6a5a..e3ab86f5eb 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Test; -import org.springframework.bootstrap.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.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.zero.actuate.properties.ManagementServerProperties; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 91% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index ea88054772..e29e8cd340 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -22,13 +22,14 @@ import javax.servlet.FilterChain; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.bootstrap.actuate.metrics.CounterService; -import org.springframework.bootstrap.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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 83% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java index 733f98a269..b5c2cdb618 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java @@ -14,16 +14,17 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Test; -import org.springframework.bootstrap.actuate.metrics.CounterService; -import org.springframework.bootstrap.actuate.metrics.DefaultCounterService; -import org.springframework.bootstrap.actuate.metrics.DefaultGaugeService; -import org.springframework.bootstrap.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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java similarity index 90% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java index 11633cf97f..12ee2232a0 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java @@ -14,10 +14,9 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Test; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; @@ -26,6 +25,9 @@ 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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 87% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java index 81439201cb..a35ae93c4c 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Test; -import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; -import org.springframework.bootstrap.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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 76% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java index ec2cb178d0..1272bf2302 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.autoconfigure; +package org.springframework.zero.actuate.autoconfigure; import org.junit.Test; -import org.springframework.bootstrap.actuate.trace.WebRequestTraceFilter; -import org.springframework.bootstrap.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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java similarity index 95% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java index c3389cfb5d..8b3e957e10 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java @@ -14,17 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collections; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.actuate.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.actuate.TestUtils; +import org.springframework.zero.actuate.endpoint.Endpoint; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java index 8f0844c5b6..39b85d54cb 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import org.junit.Test; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java index 70696b8dab..64a5c8811a 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.lang.management.ThreadInfo; import java.util.List; import org.junit.Test; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java similarity index 87% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java index 59b9d7b8a1..577e34920c 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import org.junit.Test; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java similarity index 85% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java index ed580a2e84..bff7beb136 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import org.junit.Test; -import org.springframework.bootstrap.actuate.health.HealthIndicator; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java index 2f1c153a9d..9268691078 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collections; import org.junit.Test; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java similarity index 84% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java index a85d4bde29..e23cc76d69 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java @@ -14,16 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collection; import java.util.Collections; import org.junit.Test; -import org.springframework.bootstrap.actuate.metrics.Metric; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java similarity index 87% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java index ce01c52d3c..af005cf1e4 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import org.junit.Test; -import org.springframework.bootstrap.actuate.properties.ManagementServerProperties; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java similarity index 80% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java index e470fa3d89..69e88c0315 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java @@ -14,17 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Collections; import org.junit.Test; -import org.springframework.bootstrap.actuate.trace.InMemoryTraceRepository; -import org.springframework.bootstrap.actuate.trace.Trace; -import org.springframework.bootstrap.actuate.trace.TraceRepository; -import org.springframework.bootstrap.context.annotation.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.annotation.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java similarity index 85% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java index faef1645db..982b41d4a8 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint; +package org.springframework.zero.actuate.endpoint; import java.util.Date; import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.bootstrap.actuate.metrics.InMemoryMetricRepository; -import org.springframework.bootstrap.actuate.metrics.Metric; +import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics; +import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; +import org.springframework.zero.actuate.metrics.Metric; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 86% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java index de9408d4ac..3b044d8c41 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint.mvc; +package org.springframework.zero.actuate.endpoint.mvc; import org.junit.Test; -import org.springframework.bootstrap.actuate.endpoint.Endpoint; +import org.springframework.zero.actuate.endpoint.Endpoint; +import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 93% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java index 0ed37e4739..d587765a95 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.endpoint.mvc; +package org.springframework.zero.actuate.endpoint.mvc; import java.util.Arrays; import org.junit.Test; -import org.springframework.bootstrap.actuate.endpoint.AbstractEndpoint; -import org.springframework.bootstrap.actuate.endpoint.ActionEndpoint; 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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java similarity index 96% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java index e70fbabc3b..d0a182aaa0 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.fixme; +package org.springframework.zero.actuate.fixme; /** * @author Dave Syer diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java similarity index 89% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java index 780d3032e9..b1afb33079 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.health; +package org.springframework.zero.actuate.health; import org.junit.Test; +import org.springframework.zero.actuate.health.VanillaHealthIndicator; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java index b50b297650..19bfaffca0 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import org.junit.Ignore; import org.junit.Test; +import org.springframework.zero.actuate.metrics.DefaultCounterService; import static org.junit.Assert.fail; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java index 460a894edc..35d09982e6 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import org.junit.Ignore; import org.junit.Test; +import org.springframework.zero.actuate.metrics.DefaultGaugeService; import static org.junit.Assert.fail; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java index abc06723a8..d19aca734d 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.actuate.metrics; +package org.springframework.zero.actuate.metrics; import org.junit.Ignore; import org.junit.Test; +import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; import static org.junit.Assert.fail; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java similarity index 90% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java index dc9de4458b..083b4464fd 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.properties; +package org.springframework.zero.actuate.properties; import java.util.Collections; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; -import org.springframework.bootstrap.actuate.properties.SecurityProperties; -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-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java similarity index 87% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java index 84e67787ac..01828be482 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.security; +package org.springframework.zero.actuate.security; import org.junit.Ignore; import org.junit.Test; +import org.springframework.zero.actuate.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java similarity index 87% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java index a06b00998d..227d183221 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.security; +package org.springframework.zero.actuate.security; import org.junit.Ignore; import org.junit.Test; +import org.springframework.zero.actuate.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 89% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java index 6342c018d4..67cf674a34 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.trace; +package org.springframework.zero.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 static org.junit.Assert.assertEquals; diff --git a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java similarity index 88% rename from spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java rename to spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java index cc291b2896..644c354c2c 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.actuate.trace; +package org.springframework.zero.actuate.trace; import java.util.Map; import org.junit.Test; 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-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java index 567fec748e..1eb5e34f82 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure; +package org.springframework.zero.autoconfigure; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java similarity index 87% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java index 30b3ad72c0..a065538661 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure; +package org.springframework.zero.autoconfigure; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java similarity index 87% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java index ea5a556ac9..b766ab7273 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure; +package org.springframework.zero.autoconfigure; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java similarity index 76% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java index f7e5860c44..e103fe828b 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.autoconfigure.batch; import org.springframework.batch.core.launch.JobLauncher; -import org.springframework.bootstrap.CommandLineRunner; -import org.springframework.bootstrap.ExitCodeGenerator; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Batch. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java index f79a278016..0f0fb24a48 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.autoconfigure.batch; import javax.annotation.PostConstruct; import javax.sql.DataSource; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java similarity index 95% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java index 332746e8d1..c7bb4468c2 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.autoconfigure.batch; import org.springframework.batch.core.JobExecution; import org.springframework.context.ApplicationEvent; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java similarity index 92% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java index 4ae7b1b338..cdab3f50ef 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.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-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java similarity index 96% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java index 50e31b5e16..d022441bcf 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.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-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java similarity index 81% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index 46aa141359..cc676d0b3c 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.data; +package org.springframework.zero.autoconfigure.data; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JPA Repositories. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java index 14052ff78b..ab10117d9f 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.data; +package org.springframework.zero.autoconfigure.data; import java.util.Collection; import java.util.List; @@ -25,7 +25,6 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.bootstrap.autoconfigure.AutoConfigurationUtils; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; @@ -39,6 +38,7 @@ 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-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java index 734fb36993..2753027317 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java index 3363fcb4c2..fb7f497d7d 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import java.sql.SQLException; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java similarity index 96% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java index b7cb1090a0..fde6f45943 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import java.util.ArrayList; import java.util.Arrays; @@ -28,10 +28,6 @@ import org.apache.commons.logging.LogFactory; 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.annotation.ConditionLogUtils; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -50,6 +46,10 @@ 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.context.annotation.ConditionLogUtils; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link DataSource}. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java similarity index 82% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index 5df7d0bba3..3d45e73d02 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java similarity index 95% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java index fce5f3a590..a1208565f4 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.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.bootstrap.context.annotation.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.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for embedded databases. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java similarity index 96% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java index 79d9139f50..dc58696595 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import javax.annotation.PreDestroy; import javax.sql.DataSource; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java similarity index 93% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index 6db6ba0633..db15240e52 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -14,15 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.orm.jpa; +package org.springframework.zero.autoconfigure.orm.jpa; import java.util.LinkedHashMap; import java.util.Map; import org.hibernate.ejb.HibernateEntityManager; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; @@ -32,6 +30,8 @@ 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.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for Hibernate JPA. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java similarity index 89% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java index 3684af0bce..f94aac2fc0 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.orm.jpa; +package org.springframework.zero.autoconfigure.orm.jpa; import java.util.List; @@ -27,11 +27,6 @@ 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.autoconfigure.AutoConfigurationUtils; -import org.springframework.bootstrap.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaVendorAdapter; @@ -39,6 +34,11 @@ 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.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.zero.context.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * Base {@link EnableAutoConfiguration Auto-configuration} for JPA. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java similarity index 89% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 8aed8834a8..7ced0ad9a0 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.thymeleaf; +package org.springframework.zero.autoconfigure.thymeleaf; import java.io.IOException; import java.io.InputStream; @@ -27,16 +27,16 @@ import nz.net.ultraq.web.thymeleaf.LayoutDialect; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.bootstrap.context.annotation.AutoConfigureAfter; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingClass; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.web.WebMvcAutoConfiguration; +import org.springframework.zero.context.annotation.AutoConfigureAfter; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.ConditionalOnMissingClass; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.thymeleaf.TemplateProcessingParameters; import org.thymeleaf.resourceresolver.IResourceResolver; import org.thymeleaf.spring3.SpringTemplateEngine; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java similarity index 78% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java index 7d4e6cdd6e..06de4d1a13 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.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.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -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.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +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-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java similarity index 80% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java index 4bdab4dc57..416ded3432 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import javax.servlet.MultipartConfigElement; import javax.servlet.Servlet; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -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.context.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.embedded.EmbeddedWebApplicationContext; /** * {@link EnableAutoConfiguration Auto-configuration} for multi-part uploads. Adds a diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java similarity index 79% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java index 7d9c69b9f8..d3a2a344ac 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.valves.RemoteIpValve; import org.springframework.beans.BeansException; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties; -import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.bootstrap.properties.ServerProperties; -import org.springframework.bootstrap.properties.ServerProperties.Tomcat; 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.StringUtils; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.annotation.EnableConfigurationProperties; +import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.zero.properties.ServerProperties; +import org.springframework.zero.properties.ServerProperties.Tomcat; /** * {@link EnableAutoConfiguration Auto-configuration} that configures the @@ -47,7 +47,7 @@ public class ServerPropertiesAutoConfiguration implements private ApplicationContext applicationContext; - @Bean(name = "org.springframework.bootstrap.properties.ServerProperties") + @Bean(name = "org.springframework.zero.properties.ServerProperties") @ConditionalOnMissingBean public ServerProperties serverProperties() { return new ServerProperties(); diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java similarity index 91% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java index 232815d185..0b9cdec01a 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import java.util.Arrays; import java.util.Collection; @@ -25,11 +25,6 @@ import javax.servlet.Servlet; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.context.annotation.AutoConfigureAfter; -import org.springframework.bootstrap.context.annotation.ConditionalOnBean; -import org.springframework.bootstrap.context.annotation.ConditionalOnClass; -import org.springframework.bootstrap.context.annotation.ConditionalOnMissingBean; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -53,10 +48,15 @@ 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.context.annotation.AutoConfigureAfter; +import org.springframework.zero.context.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link EnableWebMvc Web MVC}. - * + * * @author Phillip Webb * @author Dave Syer */ @@ -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/bootstrap/Banner.class + // eg http://localhost:8080/org/springframework/zero/Banner.class registry.addResourceHandler("/resources/**").addResourceLocations("/") .addResourceLocations("classpath:/META-INF/resources/") .addResourceLocations("classpath:/resources/") diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java similarity index 98% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java index f3f2a71b0d..d119823f60 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java similarity index 94% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java index c5a0d8fee3..74d636f8d9 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java index 35eab37d5a..f8f4509953 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.io.IOException; import java.util.ArrayList; @@ -31,7 +31,6 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionRegistry; -import org.springframework.bootstrap.autoconfigure.AutoConfigurationUtils; import org.springframework.cglib.proxy.Enhancer; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; @@ -43,6 +42,7 @@ import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.classreading.SimpleMetadataReaderFactory; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import org.springframework.zero.autoconfigure.AutoConfigurationUtils; /** * Helper to detect a component scan declared in the enclosing context (normally on a diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java similarity index 85% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java index 47bce12371..d747f1f85e 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,12 +22,15 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -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.annotation.ConditionalOnBean; +import org.springframework.zero.context.annotation.ConditionalOnClass; +import org.springframework.zero.context.annotation.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-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java index 63a975cac5..45ad64e0db 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java similarity index 93% rename from spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java index 9122239abc..37b7374463 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.main; +package org.springframework.zero.main; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.EnableAutoConfiguration; /** * Very simple main class that can be used to launch an application from sources (class, diff --git a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories index 117934f292..aed5273ce0 100644 --- a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,14 +1,14 @@ # Auto Configure -org.springframework.bootstrap.context.annotation.EnableAutoConfiguration=\ -org.springframework.bootstrap.autoconfigure.MessageSourceAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.batch.BatchAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.data.JpaRepositoriesAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.jdbc.DataSourceAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.web.MultipartAutoConfiguration,\ -org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration +org.springframework.zero.context.annotation.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 diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java similarity index 82% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java index fbba0d8234..a0bf3f333f 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure; +package org.springframework.zero.autoconfigure; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; -import org.springframework.bootstrap.main.SimpleMainTests; +import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; +import org.springframework.zero.main.SimpleMainTests; /** * A test suite for probing weird ordering problems in the tests. diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java similarity index 90% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java index 85a9dab8f0..504421bfa6 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure; +package org.springframework.zero.autoconfigure; import java.util.HashMap; import java.util.Locale; @@ -23,6 +23,8 @@ import java.util.Map; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; +import org.springframework.zero.autoconfigure.MessageSourceAutoConfiguration; +import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java similarity index 84% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java index 7b2b79b4fe..585ea7791f 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure; +package org.springframework.zero.autoconfigure; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.SpringJUnitTests.TestConfiguration; -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.PropertyPlaceholderAutoConfiguration; +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-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java similarity index 89% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java index a7e8b460c8..efc393b29b 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.autoconfigure.batch; import java.util.Collection; import java.util.Collections; @@ -31,10 +31,12 @@ import org.springframework.batch.core.job.AbstractJob; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.batch.core.repository.JobRepository; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; +import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.zero.autoconfigure.batch.BatchAutoConfiguration; +import org.springframework.zero.autoconfigure.batch.JobLauncherCommandLineRunner; +import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java similarity index 88% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java index c256deaba4..4f582039e2 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.batch; +package org.springframework.zero.autoconfigure.batch; import org.junit.Test; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; +import org.springframework.zero.autoconfigure.batch.JobExecutionEvent; +import org.springframework.zero.autoconfigure.batch.JobExecutionExitCodeGenerator; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java similarity index 75% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index ba13c10948..75ec5efb88 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java @@ -14,21 +14,22 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.data; +package org.springframework.zero.autoconfigure.data; import javax.persistence.EntityManagerFactory; import org.junit.Test; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.data.test.City; -import org.springframework.bootstrap.autoconfigure.data.test.CityRepository; -import org.springframework.bootstrap.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.bootstrap.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; -import org.springframework.bootstrap.context.annotation.ComponentScanDetectorConfiguration; 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.PropertyPlaceholderAutoConfiguration; +import org.springframework.zero.autoconfigure.data.JpaRepositoriesAutoConfiguration; +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 org.springframework.zero.context.annotation.ComponentScanDetectorConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java similarity index 79% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java index 7dbd8ac243..35c3084e2c 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java @@ -14,20 +14,21 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.data; +package org.springframework.zero.autoconfigure.data; import org.junit.Ignore; import org.junit.Test; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.data.test.City; -import org.springframework.bootstrap.autoconfigure.data.test.CityRepository; -import org.springframework.bootstrap.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.bootstrap.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.JpaRepositoriesAutoConfiguration; +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-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java index ab7fade141..9ce6daa1e0 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.autoconfigure.data.test; import java.io.Serializable; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java similarity index 94% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java index 1e9e614502..7b7ff2d61a 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.data.test; +package org.springframework.zero.autoconfigure.data.test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java similarity index 90% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java index 3c89dcd474..6eb40b3759 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.zero.autoconfigure.jdbc.BasicDataSourceConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java similarity index 94% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index aa8cde1b99..8bfa4203e9 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import java.util.HashMap; import java.util.Map; @@ -23,7 +23,6 @@ import javax.sql.DataSource; import org.apache.commons.dbcp.BasicDataSource; import org.junit.Test; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -32,6 +31,8 @@ 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 org.springframework.zero.autoconfigure.jdbc.DataSourceAutoConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java similarity index 88% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 3ab6041ab7..5920d0e11d 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.jdbc.datasource.DataSourceTransactionManager; +import org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java similarity index 90% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java index 3b48d612d3..3df8fa63f2 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java similarity index 90% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 8efdfebb99..49a10d279f 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.jdbc; +package org.springframework.zero.autoconfigure.jdbc; import java.lang.reflect.Field; import java.util.HashMap; @@ -25,9 +25,11 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.util.ReflectionUtils; +import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.zero.autoconfigure.jdbc.TomcatDataSourceConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java similarity index 79% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 18577f7aa9..8d2460f637 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.orm.jpa; +package org.springframework.zero.autoconfigure.orm.jpa; import javax.sql.DataSource; import org.junit.Test; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.bootstrap.autoconfigure.orm.jpa.test.City; -import org.springframework.bootstrap.context.annotation.ComponentScanDetectorConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.orm.jpa.JpaTransactionManager; +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.HibernateJpaAutoConfiguration; +import org.springframework.zero.autoconfigure.orm.jpa.test.City; +import org.springframework.zero.context.annotation.ComponentScanDetectorConfiguration; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java similarity index 96% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java index c686cf6d19..c630aff548 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.data.test; +package org.springframework.zero.autoconfigure.orm.jpa.test; import java.io.Serializable; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java similarity index 93% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java index 65e71a5f4c..3e205f1d50 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.thymeleaf; +package org.springframework.zero.autoconfigure.thymeleaf; import java.util.Collections; import java.util.HashMap; @@ -22,7 +22,6 @@ import java.util.Locale; import java.util.Map; import org.junit.Test; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.mock.web.MockHttpServletRequest; @@ -30,6 +29,8 @@ 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.springframework.zero.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; import org.thymeleaf.spring3.view.ThymeleafView; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java similarity index 84% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java index 362a8fd81a..472ebdf9bf 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -14,22 +14,23 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import javax.servlet.Servlet; import org.junit.Test; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.bootstrap.context.annotation.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.annotation.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-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java similarity index 92% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java index a9e29fc7c6..624f1f78a2 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import javax.servlet.MultipartConfigElement; @@ -22,9 +22,6 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; -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; @@ -35,6 +32,11 @@ 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-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesConfigurationTests.java similarity index 79% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesConfigurationTests.java index ec089dc2c7..713fc168c6 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import java.io.File; @@ -22,16 +22,17 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; -import org.springframework.bootstrap.TestUtils; -import org.springframework.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -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.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.bootstrap.properties.ServerProperties; 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.autoconfigure.web.ServerPropertiesAutoConfiguration; +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.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.zero.properties.ServerProperties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java similarity index 86% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java index 5829e32c1e..84813d0ba0 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -13,9 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.web; +package org.springframework.zero.autoconfigure.web; import org.junit.Ignore; +import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; /** * Tests for {@link WebMvcAutoConfiguration}. diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java similarity index 93% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java index d3d2110ec4..855927731a 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.Arrays; import java.util.List; @@ -25,6 +25,8 @@ import org.junit.rules.ExpectedException; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.core.io.DefaultResourceLoader; +import org.springframework.zero.context.annotation.AutoConfigurationSorter; +import org.springframework.zero.context.annotation.AutoConfigureAfter; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java similarity index 87% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java index b01272650b..e35802a9bc 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.springframework.context.annotation.Import; +import org.springframework.zero.context.annotation.ComponentScanDetector; /** * Simple configuration to import {@link ComponentScanDetector} for tests. diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java similarity index 92% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java index 40a7606345..7bdd74f4c0 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.main; +package org.springframework.zero.main; import org.junit.After; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.ClassUtils; +import org.springframework.zero.main.Spring; import static org.junit.Assert.assertNotNull; @@ -55,7 +56,7 @@ public class SimpleMainTests { @Test public void xmlContext() throws Exception { Spring.main(new String[] { Spring.class.getName(), - "org/springframework/bootstrap/sample-beans.xml" }); + "org/springframework/zero/sample-beans.xml" }); this.context = Spring.getApplicationContext(); assertNotNull(this.context); } diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml deleted file mode 100644 index c4a4d1737a..0000000000 --- a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml deleted file mode 100644 index 3658eb1274..0000000000 --- a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css b/spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css deleted file mode 100644 index 301dc39263..0000000000 --- a/spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css +++ /dev/null @@ -1 +0,0 @@ -body: {background: red} \ No newline at end of file diff --git a/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql b/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql deleted file mode 100644 index 38de881057..0000000000 --- a/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql +++ /dev/null @@ -1,4 +0,0 @@ -CREATE TABLE FOO ( - id INTEGER IDENTITY PRIMARY KEY, - name VARCHAR(30), -); \ No newline at end of file diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql b/spring-zero-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql rename to spring-zero-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql diff --git a/spring-zero-cli/pom.xml b/spring-zero-cli/pom.xml index 8dfb51468d..6b25178ff0 100644 --- a/spring-zero-cli/pom.xml +++ b/spring-zero-cli/pom.xml @@ -11,7 +11,7 @@ jar ${basedir}/.. - org.springframework.bootstrap.cli.SpringBootstrapCli + org.springframework.zero.cli.SpringZeroCli diff --git a/spring-zero-cli/samples/actuator.groovy b/spring-zero-cli/samples/actuator.groovy index fad95cded8..56d341d611 100644 --- a/spring-zero-cli/samples/actuator.groovy +++ b/spring-zero-cli/samples/actuator.groovy @@ -1,6 +1,6 @@ package org.test -@Grab("org.springframework.bootstrap:spring-bootstrap-actuator:0.5.0.BUILD-SNAPSHOT") +@Grab("org.springframework.zero:spring-zero-actuator:0.5.0.BUILD-SNAPSHOT") @Controller class SampleController { diff --git a/spring-zero-cli/samples/template.groovy b/spring-zero-cli/samples/template.groovy index eab9233112..719311dd26 100644 --- a/spring-zero-cli/samples/template.groovy +++ b/spring-zero-cli/samples/template.groovy @@ -1,6 +1,6 @@ package org.test -import static org.springframework.bootstrap.cli.template.GroovyTemplate.template; +import static org.springframework.zero.cli.template.GroovyTemplate.template; @Component class Example implements CommandLineRunner { diff --git a/spring-zero-cli/src/main/assembly/descriptor.xml b/spring-zero-cli/src/main/assembly/descriptor.xml index 7d2b776f58..2f25a1f0ed 100644 --- a/spring-zero-cli/src/main/assembly/descriptor.xml +++ b/spring-zero-cli/src/main/assembly/descriptor.xml @@ -23,7 +23,7 @@ - org.springframework.bootstrap:spring-bootstrap-cli:jar:* + org.springframework.zero:spring-zero-cli:jar:* lib diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java similarity index 97% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java index d0adb21033..7e668f3254 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli; +package org.springframework.zero.cli; /** * A single command that can be run from the CLI. diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java similarity index 95% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java index d7019d4230..4274b24b47 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli; +package org.springframework.zero.cli; import java.util.Collection; import java.util.ServiceLoader; diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java similarity index 86% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java index 206397db2f..ea8b0e2ac4 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli; +package org.springframework.zero.cli; /** * Exception thrown when an unknown command is specified. * * @author Phillip Webb */ -class NoSuchCommandException extends BootstrapCliException { +class NoSuchCommandException extends SpringZeroCliException { 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'.", - SpringBootstrapCli.CLI_APP, name)); + SpringZeroCli.CLI_APP, name)); } } diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java similarity index 84% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java index 3adcd49940..a2002c313d 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli; +package org.springframework.zero.cli; import java.util.ArrayList; import java.util.Arrays; @@ -24,33 +24,33 @@ import java.util.ServiceLoader; import java.util.Set; /** - * Spring Bootstrap Command Line Interface. This is the main entry-point for the spring - * bootstrap command line application. This class will parse input arguments and delegate + * 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. - * + * *

* The '-d' and '--debug' switches are handled by this class, however, most argument * parsing is left to the {@link Command} implementation. - * + * * @author Phillip Webb * @see #main(String...) - * @see BootstrapCliException + * @see SpringZeroCliException * @see Command */ -public class SpringBootstrapCli { +public class SpringZeroCli { public static final String CLI_APP = "spring"; - private static final Set NO_EXCEPTION_OPTIONS = EnumSet - .noneOf(BootstrapCliException.Option.class); + private static final Set NO_EXCEPTION_OPTIONS = EnumSet + .noneOf(SpringZeroCliException.Option.class); private List commands; /** - * Create a new {@link SpringBootstrapCli} implementation with the default set of + * Create a new {@link SpringZeroCli} implementation with the default set of * commands. */ - public SpringBootstrapCli() { + public SpringZeroCli() { setCommands(ServiceLoader.load(CommandFactory.class, getClass().getClassLoader())); } @@ -91,17 +91,17 @@ public class SpringBootstrapCli { showUsage(); return 1; } catch (Exception ex) { - Set options = NO_EXCEPTION_OPTIONS; - if (ex instanceof BootstrapCliException) { - options = ((BootstrapCliException) ex).getOptions(); + Set options = NO_EXCEPTION_OPTIONS; + if (ex instanceof SpringZeroCliException) { + options = ((SpringZeroCliException) ex).getOptions(); } if (!(ex instanceof NoHelpCommandArgumentsException)) { errorMessage(ex.getMessage()); } - if (options.contains(BootstrapCliException.Option.SHOW_USAGE)) { + if (options.contains(SpringZeroCliException.Option.SHOW_USAGE)) { showUsage(); } - if (debug || options.contains(BootstrapCliException.Option.STACK_TRACE)) { + if (debug || options.contains(SpringZeroCliException.Option.STACK_TRACE)) { printStackTrace(ex); } return 1; @@ -184,7 +184,7 @@ public class SpringBootstrapCli { throw new NoHelpCommandArgumentsException(); } String commandName = args[0]; - for (Command command : SpringBootstrapCli.this.commands) { + for (Command command : SpringZeroCli.this.commands) { if (command.getName().equals(commandName)) { System.out.println(CLI_APP + " " + command.getName() + " - " + command.getDescription()); @@ -225,7 +225,7 @@ public class SpringBootstrapCli { } - static class NoHelpCommandArgumentsException extends BootstrapCliException { + static class NoHelpCommandArgumentsException extends SpringZeroCliException { private static final long serialVersionUID = 1L; @@ -235,7 +235,7 @@ public class SpringBootstrapCli { } - static class NoArgumentsException extends BootstrapCliException { + static class NoArgumentsException extends SpringZeroCliException { private static final long serialVersionUID = 1L; @@ -246,7 +246,7 @@ public class SpringBootstrapCli { * @param args CLI arguments */ public static void main(String... args) { - int exitCode = new SpringBootstrapCli().runAndHandleErrors(args); + int exitCode = new SpringZeroCli().runAndHandleErrors(args); if (exitCode != 0) { System.exit(exitCode); } diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java similarity index 74% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java index f8e59e3194..3a53ef7a97 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli; +package org.springframework.zero.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 SpringBootstrapCli}. + * by the {@link SpringZeroCli}. * * @author Phillip Webb */ -public class BootstrapCliException extends RuntimeException { +public class SpringZeroCliException extends RuntimeException { private static final long serialVersionUID = 0L; private final EnumSet

    *
  • {@link CompilerAutoConfiguration} strategies will be read from - * META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration + * META-INF/services/org.springframework.zero.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
    • - * + * *
  • Generated class files can also be loaded using * {@link ClassLoader#getResource(String)}
    • *
      - * + * * @author Phillip Webb * @author Dave Syer */ diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java similarity index 94% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java index 3916db55e3..213e566b21 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.compiler; +package org.springframework.zero.cli.compiler; /** * Configuration for the {@link GroovyCompiler}. diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java similarity index 90% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java index 4e0fc10650..c318b606c1 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.compiler.autoconfigure; +package org.springframework.zero.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.bootstrap.cli.compiler.AstUtils; -import org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration; -import org.springframework.bootstrap.cli.compiler.DependencyCustomizer; +import org.springframework.zero.cli.compiler.AstUtils; +import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; +import org.springframework.zero.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Batch. diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java similarity index 91% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index 6092c21c34..398bc2ad6f 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.compiler.autoconfigure; +package org.springframework.zero.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.bootstrap.cli.compiler.AstUtils; -import org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration; -import org.springframework.bootstrap.cli.compiler.DependencyCustomizer; +import org.springframework.zero.cli.compiler.AstUtils; +import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; +import org.springframework.zero.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Integration. diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java similarity index 85% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index 0aa0960c01..b7e0b8ff74 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.compiler.autoconfigure; +package org.springframework.zero.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.bootstrap.cli.compiler.AstUtils; -import org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration; -import org.springframework.bootstrap.cli.compiler.DependencyCustomizer; +import org.springframework.zero.cli.compiler.AstUtils; +import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; +import org.springframework.zero.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring MVC. - * + * * @author Dave Syer * @author Phillip Webb */ @@ -59,7 +59,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio "org.springframework.web.servlet.config.annotation", "org.springframework.http"); imports.addStaticImport( - "org.springframework.bootstrap.cli.template.GroovyTemplate", "template"); + "org.springframework.zero.cli.template.GroovyTemplate", "template"); } } diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java similarity index 82% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java index d52990b7f7..875078768d 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.compiler.autoconfigure; +package org.springframework.zero.cli.compiler.autoconfigure; import groovy.lang.GroovyClassLoader; @@ -24,24 +24,23 @@ 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.bootstrap.cli.compiler.CompilerAutoConfiguration; -import org.springframework.bootstrap.cli.compiler.DependencyCustomizer; -import org.springframework.bootstrap.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; +import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; /** - * {@link CompilerAutoConfiguration} for Spring Bootstrap. + * {@link CompilerAutoConfiguration} for Spring Zero. * * @author Dave Syer * @author Phillip Webb */ -public class SpringBootstrapCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfiguration { @Override public void applyDependencies(DependencyCustomizer dependencies) { - dependencies.ifAnyMissingClasses( - "org.springframework.bootstrap.SpringApplication").add( - "org.springframework.zero", "spring-zero-autoconfigure", - "0.0.1.BUILD-SNAPSHOT"); + dependencies.ifAnyMissingClasses("org.springframework.zero.SpringApplication") + .add("org.springframework.zero", "spring-zero-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") @@ -76,8 +75,8 @@ public class SpringBootstrapCompilerAutoConfiguration extends CompilerAutoConfig "org.springframework.context.MessageSource", "org.springframework.core.annotation.Order", "org.springframework.core.io.ResourceLoader", - "org.springframework.bootstrap.CommandLineRunner", - "org.springframework.bootstrap.context.annotation.EnableAutoConfiguration"); + "org.springframework.zero.CommandLineRunner", + "org.springframework.zero.context.annotation.EnableAutoConfiguration"); imports.addStarImports("org.springframework.stereotype"); } @@ -97,7 +96,7 @@ public class SpringBootstrapCompilerAutoConfiguration extends CompilerAutoConfig Class annotationClass = source .getClassLoader() .loadClass( - "org.springframework.bootstrap.context.annotation.EnableAutoConfiguration"); + "org.springframework.zero.context.annotation.EnableAutoConfiguration"); AnnotationNode annotationNode = new AnnotationNode(new ClassNode( annotationClass)); classNode.addAnnotation(annotationNode); diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java similarity index 90% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java index 45a4832422..5f6b3be7a0 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.runner; +package org.springframework.zero.cli.runner; import java.io.File; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.springframework.bootstrap.cli.compiler.GroovyCompiler; +import org.springframework.zero.cli.compiler.GroovyCompiler; /** * Compiles Groovy code running the resulting classes using a {@code SpringApplication}. @@ -31,11 +31,11 @@ import org.springframework.bootstrap.cli.compiler.GroovyCompiler; * @author Phillip Webb * @author Dave Syer */ -public class BootstrapRunner { +public class SpringZeroRunner { // FIXME logging - private BootstrapRunnerConfiguration configuration; + private SpringZeroRunnerConfiguration configuration; private final File[] files; @@ -48,12 +48,12 @@ public class BootstrapRunner { private FileWatchThread fileWatchThread; /** - * Create a new {@link BootstrapRunner} instance. + * Create a new {@link SpringZeroRunner} instance. * @param configuration the configuration * @param files the files to compile/watch * @param args input arguments */ - public BootstrapRunner(final BootstrapRunnerConfiguration configuration, + public SpringZeroRunner(final SpringZeroRunnerConfiguration configuration, File[] files, String... args) { this.configuration = configuration; this.files = files; @@ -127,11 +127,11 @@ public class BootstrapRunner { try { // User reflection to load and call Spring Class application = getContextClassLoader().loadClass( - "org.springframework.bootstrap.SpringApplication"); + "org.springframework.zero.SpringApplication"); Method method = application.getMethod("run", Object[].class, String[].class); this.applicationContext = method.invoke(null, this.sources, - BootstrapRunner.this.args); + SpringZeroRunner.this.args); } catch (Exception ex) { ex.printStackTrace(); } @@ -165,7 +165,7 @@ public class BootstrapRunner { public FileWatchThread() { this.previous = 0; - for (File file : BootstrapRunner.this.files) { + for (File file : SpringZeroRunner.this.files) { long current = file.lastModified(); if (current > this.previous) { this.previous = current; @@ -179,7 +179,7 @@ public class BootstrapRunner { while (true) { try { Thread.sleep(TimeUnit.SECONDS.toMillis(1)); - for (File file : BootstrapRunner.this.files) { + for (File file : SpringZeroRunner.this.files) { long current = file.lastModified(); if (this.previous < current) { this.previous = current; diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java similarity index 79% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java index 501c976af0..b985cc526f 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.runner; +package org.springframework.zero.cli.runner; import java.util.logging.Level; -import org.springframework.bootstrap.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; /** - * Configuration for the {@link BootstrapRunner}. + * Configuration for the {@link SpringZeroRunner}. * * @author Phillip Webb */ -public interface BootstrapRunnerConfiguration extends GroovyCompilerConfiguration { +public interface SpringZeroRunnerConfiguration extends GroovyCompilerConfiguration { /** * Returns {@code true} if the source file should be monitored for changes and diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java similarity index 97% rename from spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java rename to spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java index 448413d0bd..936e6a7b66 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli.template; +package org.springframework.zero.cli.template; import groovy.text.GStringTemplateEngine; import groovy.text.Template; diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory deleted file mode 100644 index 08f8bcb548..0000000000 --- a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory +++ /dev/null @@ -1 +0,0 @@ -org.springframework.bootstrap.cli.command.DefaultCommandFactory \ No newline at end of file diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration deleted file mode 100644 index e6cae9858a..0000000000 --- a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration +++ /dev/null @@ -1,5 +0,0 @@ -org.springframework.bootstrap.cli.compiler.autoconfigure.SpringBootstrapCompilerAutoConfiguration -org.springframework.bootstrap.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration -org.springframework.bootstrap.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration -org.springframework.bootstrap.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration - diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory new file mode 100644 index 0000000000..174a6b5c0b --- /dev/null +++ b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory @@ -0,0 +1 @@ +org.springframework.zero.cli.command.DefaultCommandFactory diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration new file mode 100644 index 0000000000..72c8ac4b8a --- /dev/null +++ b/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration @@ -0,0 +1,5 @@ +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-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java b/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java similarity index 97% rename from spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java rename to spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java index 3d1d1a716e..5a9dd95b58 100644 --- a/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java +++ b/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.cli; +package org.springframework.zero.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.bootstrap.cli.command.RunCommand; +import org.springframework.zero.cli.command.RunCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -83,7 +83,7 @@ public class SampleIntegrationTests { @BeforeClass public static void clean() { - // SpringBootstrapCli.main("clean"); + // SpringZeroCli.main("clean"); // System.setProperty("ivy.message.logger.level", "3"); } diff --git a/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java b/spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java similarity index 86% rename from spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java rename to spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java index fe82f69ffc..2b2f72728b 100644 --- a/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java +++ b/spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.cli; +package org.springframework.zero.cli; import java.util.Arrays; import java.util.EnumSet; @@ -10,8 +10,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.bootstrap.cli.SpringBootstrapCli.NoArgumentsException; -import org.springframework.bootstrap.cli.SpringBootstrapCli.NoHelpCommandArgumentsException; +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 static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -20,17 +23,17 @@ import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.verify; /** - * Tests for {@link SpringBootstrapCli}. + * Tests for {@link SpringZeroCli}. * * @author Phillip Webb * @author Dave Syer */ -public class SpringBootstrapCliTests { +public class SpringZeroCliTests { @Rule public ExpectedException thrown = ExpectedException.none(); - private SpringBootstrapCli cli; + private SpringZeroCli cli; @Mock private Command regularCommand; @@ -40,23 +43,23 @@ public class SpringBootstrapCliTests { @Before public void setup() { MockitoAnnotations.initMocks(this); - this.cli = new SpringBootstrapCli() { + this.cli = new SpringZeroCli() { @Override protected void showUsage() { - SpringBootstrapCliTests.this.calls.add(Call.SHOW_USAGE); + SpringZeroCliTests.this.calls.add(Call.SHOW_USAGE); super.showUsage(); }; @Override protected void errorMessage(String message) { - SpringBootstrapCliTests.this.calls.add(Call.ERROR_MESSAGE); + SpringZeroCliTests.this.calls.add(Call.ERROR_MESSAGE); super.errorMessage(message); } @Override protected void printStackTrace(Exception ex) { - SpringBootstrapCliTests.this.calls.add(Call.PRINT_STACK_TRACE); + SpringZeroCliTests.this.calls.add(Call.PRINT_STACK_TRACE); super.printStackTrace(ex); } }; diff --git a/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java b/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java similarity index 95% rename from spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java rename to spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java index 21c1c99790..ae60d8df67 100644 --- a/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java +++ b/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.cli.command; +package org.springframework.zero.cli.command; import groovy.lang.GroovyObjectSupport; import groovy.lang.Script; import org.junit.Test; +import org.springframework.zero.cli.command.OptionHandler; +import org.springframework.zero.cli.command.ScriptCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/spring-zero-cli/src/test/resources/commands/closure.groovy b/spring-zero-cli/src/test/resources/commands/closure.groovy index fab55c40ee..80836fd3a3 100644 --- a/spring-zero-cli/src/test/resources/commands/closure.groovy +++ b/spring-zero-cli/src/test/resources/commands/closure.groovy @@ -1,6 +1,6 @@ def run = { msg -> - org.springframework.bootstrap.cli.command.ScriptCommandTests.executed = true + org.springframework.zero.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } -run \ No newline at end of file +run diff --git a/spring-zero-cli/src/test/resources/commands/command.groovy b/spring-zero-cli/src/test/resources/commands/command.groovy index 0a5cac19c7..ee7d7f9767 100644 --- a/spring-zero-cli/src/test/resources/commands/command.groovy +++ b/spring-zero-cli/src/test/resources/commands/command.groovy @@ -3,15 +3,15 @@ package org.test.command class TestCommand implements Command { String name = "foo" - + String description = "My script command" - + String help = "No options" String usageHelp = "Not very useful" void run(String... args) { - org.springframework.bootstrap.cli.command.ScriptCommandTests.executed = true + org.springframework.zero.cli.command.ScriptCommandTests.executed = true println "Hello ${args[0]}" } diff --git a/spring-zero-cli/src/test/resources/commands/handler.groovy b/spring-zero-cli/src/test/resources/commands/handler.groovy index 4f9131ff5d..7d00e5aad3 100644 --- a/spring-zero-cli/src/test/resources/commands/handler.groovy +++ b/spring-zero-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.bootstrap.cli.command.ScriptCommandTests.executed = true + org.springframework.zero.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" } diff --git a/spring-zero-cli/src/test/resources/commands/mixin.groovy b/spring-zero-cli/src/test/resources/commands/mixin.groovy index e5c80a41d5..ebed4704d2 100644 --- a/spring-zero-cli/src/test/resources/commands/mixin.groovy +++ b/spring-zero-cli/src/test/resources/commands/mixin.groovy @@ -2,5 +2,5 @@ void options() { option "foo", "Foo set" } -org.springframework.bootstrap.cli.command.ScriptCommandTests.executed = true +org.springframework.zero.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" diff --git a/spring-zero-cli/src/test/resources/commands/runnable.groovy b/spring-zero-cli/src/test/resources/commands/runnable.groovy index 02131f6852..ad1f7eafe3 100644 --- a/spring-zero-cli/src/test/resources/commands/runnable.groovy +++ b/spring-zero-cli/src/test/resources/commands/runnable.groovy @@ -4,8 +4,8 @@ class TestCommand implements Runnable { this.msg = msg } void run() { - org.springframework.bootstrap.cli.command.ScriptCommandTests.executed = true + org.springframework.zero.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } } -new TestCommand(args[0]) \ No newline at end of file +new TestCommand(args[0]) diff --git a/spring-zero-cli/src/test/resources/commands/test.groovy b/spring-zero-cli/src/test/resources/commands/test.groovy index e74e6c7a48..72f6176b92 100644 --- a/spring-zero-cli/src/test/resources/commands/test.groovy +++ b/spring-zero-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.bootstrap.cli.command.ScriptCommandTests.executed = true +org.springframework.zero.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}" diff --git a/spring-zero-cli/src/test/resources/log4j.properties b/spring-zero-cli/src/test/resources/log4j.properties index 8e17be9f96..dfd3b60fd3 100644 --- a/spring-zero-cli/src/test/resources/log4j.properties +++ b/spring-zero-cli/src/test/resources/log4j.properties @@ -4,6 +4,6 @@ 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.bootstrap=DEBUG +log4j.category.org.springframework.zero=DEBUG #log4j.category.org.springframework.integration.dsl=DEBUG #log4j.category.org.springframework.amqp=DEBUG diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java b/spring-zero-core/src/main/java/org/springframework/zero/Banner.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java rename to spring-zero-core/src/main/java/org/springframework/zero/Banner.java index bec8708999..6da3a48309 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/Banner.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import java.io.PrintStream; /** - * Writes the 'Spring Bootstrap' banner. + * Writes the 'Spring Zero' banner. * * @author Phillip Webb */ diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java b/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java rename to spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java index e90e5e00d7..8c0944abb1 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import java.util.HashSet; import java.util.Set; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java b/spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java rename to spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java index 0911a00991..457fd28ba6 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java b/spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java rename to spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java index 565cab2774..8b3d5933ea 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; /** * Interface used to generate an 'exit code' from a running command line diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java rename to spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java index ccb6db30f1..b653a3133f 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import java.util.ArrayList; import java.util.Arrays; @@ -123,7 +123,7 @@ public class SpringApplication { private static final String DEFAULT_CONTEXT_CLASS = "org.springframework.context." + "annotation.AnnotationConfigApplicationContext"; - public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework.bootstrap." + public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework.zero." + "context.embedded.AnnotationConfigEmbeddedWebApplicationContext"; private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet", diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java rename to spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java index 27e7e1bdb5..afa626ccde 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.beans.IntrospectionException; import java.util.HashMap; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java rename to spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java index 1415574597..12dce4d552 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.beans.PropertyEditor; import java.beans.PropertyEditorSupport; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java index 3145e8a921..6020613eda 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.util.Locale; import java.util.Properties; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java rename to spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java index e428e8f2aa..89868b610f 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.util.Collection; import java.util.Map; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java rename to spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java index 25d6ef039d..b1e980a6d4 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.net.InetAddress; import java.util.LinkedHashMap; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java index 6f245dcdf5..dbe8a41f14 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.nio.charset.Charset; import java.util.Collections; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java index 2c9e0e6129..71a5dc6666 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.List; import java.util.Map; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java index ca0eace394..a2f0fb119a 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.List; import java.util.Map; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java index d9c7e8ad8c..006ee4352d 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import org.springframework.util.ClassUtils; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java index fcf24ab21e..dd37558a41 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java index e8855e2723..0a46f37983 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.List; import java.util.Map; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java index 4d7fee6a09..c2fc5131ee 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java index c33d9cb95e..d9a93c1d61 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.io.IOException; import java.util.Collection; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java index a0abb26e47..42fc4d9eaa 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.Map; import java.util.Properties; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java index 7c82737274..474dfaab03 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java index 742d051fe8..c101c3d900 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java index 62b8972f27..69e4e7b96b 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java index 0610901c13..7d2ce8d32d 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.apache.commons.logging.Log; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java index 1a1f1ee281..d490628521 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java index c8ab5dd60d..7660f7fb0a 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java index a18b087094..67858c0300 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java index 295a46efa7..a266dcb46f 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java index 6782175968..ed1c0c9e2e 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java index 6eadf97dda..9207692647 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java index 718a0007d8..4c804fb1bf 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java index 24ffa8f622..35d7d933a2 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java index cb407ee839..2176767ba7 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java index 39ac0d3ec1..a45657131e 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java index e79b0000da..47824a6abb 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java index 3742ea76e7..9564c62e5a 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java index 990424107e..d56a404317 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.springframework.context.annotation.Condition; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java index dc7f15acea..38b3afb26f 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java index d883e48189..4426eec742 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java index 17bacf9054..71a49f540b 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java index 4ea8fa40d8..224fe06abd 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java index e11190121d..0f814f576e 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java index 6e38329a46..d80d442f3f 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java index 420e565077..1d4b642c42 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java index c5046d3a0c..8dc449aabc 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanCreationException; @@ -22,14 +22,14 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; -import org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesImportSelector.ConfigurationPropertiesHolder; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.env.PropertySources; import org.springframework.validation.Validator; +import org.springframework.zero.bind.PropertiesConfigurationFactory; +import org.springframework.zero.context.annotation.EnableConfigurationPropertiesImportSelector.ConfigurationPropertiesHolder; /** * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java index a67ad206b8..bfd8ffc37b 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.File; import java.io.IOException; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java index 0e138efcda..60477fd613 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanNameGenerator; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java index 6be6ba538a..293e332849 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.File; import java.net.InetAddress; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java index 8688703bb3..bb733ab364 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; /** * Simple interface that represents a fully configured embedded servlet container (for diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java index c8f554d03d..bcc8658cf1 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; /** * Strategy interface for customizing auto-configured embedded servlet containers. Any diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java index 7014ff74c4..cf0ecee206 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java index 23bc99c8cb..ef18666be4 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; /** * Exceptions thrown by an embedded servlet container. diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java similarity index 85% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java index cf78c4a1e5..e9f59aa9bd 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * Factory interface that can be used to create {@link EmbeddedServletContainer}s. diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java index 6398459c33..d6c2a701b6 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java index b2fce25bb2..d639ee94e1 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import org.springframework.http.HttpStatus; import org.springframework.util.ObjectUtils; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java index 52fdd38024..88acba859a 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java index c3c732a8f4..bbda2bf022 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java index d771e042e3..eb30ca2c2a 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java index a5022ec1ce..53bc37433d 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java index 9eaa7b726a..b634a56129 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java index e3550694e2..895222ec44 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java similarity index 89% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java index b170d48805..080a0af573 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.zero.context.embedded.jetty; import org.eclipse.jetty.server.Server; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; +import org.springframework.zero.context.embedded.EmbeddedServletContainer; +import org.springframework.zero.context.embedded.EmbeddedServletContainerException; /** * {@link EmbeddedServletContainer} that can be used to control an embedded Jetty server. diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 118754fd1e..9e6e016a0d 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.zero.context.embedded.jetty; import java.io.File; import java.net.InetSocketAddress; @@ -32,16 +32,16 @@ import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; -import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.ErrorPage; -import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; +import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.EmbeddedServletContainer; +import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.ErrorPage; +import org.springframework.zero.context.embedded.ServletContextInitializer; /** * {@link EmbeddedServletContainerFactory} that can be used to create diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java index 2f5c1218e7..1a9d8f43de 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.zero.context.embedded.jetty; import javax.servlet.ServletContext; @@ -23,8 +23,8 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; -import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; +import org.springframework.zero.context.embedded.ServletContextInitializer; /** * Jetty {@link Configuration} that calls {@link ServletContextInitializer}s. diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java similarity index 76% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java index 532ff9779f..62d603c541 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Jetty {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Jetty {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.zero.context.embedded.jetty; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java similarity index 74% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java index de3401d227..5cbac790bb 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java @@ -16,8 +16,8 @@ /** * Support for embedded servlet containers. - * @see org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory - * @see org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext + * @see org.springframework.zero.context.embedded.EmbeddedServletContainerFactory + * @see org.springframework.zero.context.embedded.EmbeddedWebApplicationContext */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java similarity index 93% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java index dc0d42a56a..a52d40fbe8 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.zero.context.embedded.tomcat; import javax.servlet.ServletException; @@ -22,8 +22,8 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.apache.catalina.core.StandardContext; -import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; +import org.springframework.zero.context.embedded.ServletContextInitializer; /** * Tomcat {@link LifecycleListener} that calls {@link ServletContextInitializer}s. diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java similarity index 91% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index 6d59057fce..908c2129a3 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.zero.context.embedded.tomcat; import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; +import org.springframework.zero.context.embedded.EmbeddedServletContainer; +import org.springframework.zero.context.embedded.EmbeddedServletContainerException; /** * {@link EmbeddedServletContainer} that can be used to control an embedded Tomcat server. diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 42bd98c1f9..f40ce43d41 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.zero.context.embedded.tomcat; import java.io.File; import java.io.IOException; @@ -38,16 +38,16 @@ import org.apache.catalina.loader.WebappLoader; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat.FixContextListener; import org.apache.coyote.AbstractProtocol; -import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; -import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.bootstrap.context.embedded.ErrorPage; -import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; +import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.EmbeddedServletContainer; +import org.springframework.zero.context.embedded.EmbeddedServletContainerException; +import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.ErrorPage; +import org.springframework.zero.context.embedded.ServletContextInitializer; /** * {@link EmbeddedServletContainerFactory} that can be used to create diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java index 6b81c3fd13..56a4eb2259 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.zero.context.embedded.tomcat; import java.net.URL; import java.net.URLClassLoader; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java similarity index 76% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java index 802345a1f9..6899819b5c 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Tomcat {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Tomcat {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.zero.context.embedded.tomcat; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java index 7c478bcc7c..32a71287ec 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import java.io.IOException; import java.util.ArrayList; @@ -23,10 +23,6 @@ import java.util.List; import java.util.Properties; import java.util.Set; -import org.springframework.bootstrap.config.YamlProcessor.ArrayDocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; -import org.springframework.bootstrap.config.YamlPropertiesFactoryBean; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.PropertySource; @@ -37,6 +33,10 @@ import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.util.StringUtils; +import org.springframework.zero.config.YamlPropertiesFactoryBean; +import org.springframework.zero.config.YamlProcessor.ArrayDocumentMatcher; +import org.springframework.zero.config.YamlProcessor.DocumentMatcher; +import org.springframework.zero.config.YamlProcessor.MatchStatus; /** * {@link ApplicationContextInitializer} that configures the context environment by diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java index 450e56e1c6..28309fa639 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java index 572dec3a37..29f7253ba0 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java index 06311634e3..1533f726b1 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import java.lang.management.ManagementFactory; import java.util.HashMap; import java.util.Map; -import org.springframework.bootstrap.logging.JavaLoggerConfigurer; -import org.springframework.bootstrap.logging.LogbackConfigurer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -31,6 +29,8 @@ import org.springframework.core.env.Environment; import org.springframework.core.io.ClassPathResource; import org.springframework.util.ClassUtils; import org.springframework.util.Log4jConfigurer; +import org.springframework.zero.logging.JavaLoggerConfigurer; +import org.springframework.zero.logging.LogbackConfigurer; /** * An {@link ApplicationContextInitializer} that configures a logging framework depending diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java index 33f6d7ac3e..0b04861471 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import java.util.Collection; import java.util.Collections; @@ -23,8 +23,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; -import org.springframework.bootstrap.config.JsonParser; -import org.springframework.bootstrap.config.JsonParserFactory; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; @@ -34,6 +32,8 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.util.StringUtils; +import org.springframework.zero.config.JsonParser; +import org.springframework.zero.config.JsonParserFactory; /** * An {@link ApplicationContextInitializer} that knows where to find VCAP (a.k.a. Cloud diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java b/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java rename to spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java index 243811f11f..56f723a392 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.zero.logging; import java.io.FileNotFoundException; import java.util.logging.LogManager; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java b/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java rename to spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java index ce034d68b0..94bb113e4d 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.zero.logging; import java.io.FileNotFoundException; import java.net.URL; diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java index 5a26e7c2f4..93d9406401 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.properties; +package org.springframework.zero.properties; import java.io.File; import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.annotation.ConfigurationProperties; /** * Properties for the web server (e.g. port and path settings). diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java similarity index 93% rename from spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java rename to spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java index 27f7d0fceb..19c8e3e7aa 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.web; +package org.springframework.zero.web; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -6,12 +6,12 @@ import javax.servlet.ServletException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.ApplicationContext; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.WebApplicationContext; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; /** *

      diff --git a/spring-zero-core/src/main/resources/META-INF/spring.factories b/spring-zero-core/src/main/resources/META-INF/spring.factories index 03db1ac821..33e29d5260 100644 --- a/spring-zero-core/src/main/resources/META-INF/spring.factories +++ b/spring-zero-core/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ # Application Context Initializers org.springframework.context.ApplicationContextInitializer=\ -org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\ -org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer,\ -org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ -org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer,\ -org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer +org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer,\ +org.springframework.zero.context.initializer.ContextIdApplicationContextInitializer,\ +org.springframework.zero.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ +org.springframework.zero.context.initializer.LoggingApplicationContextInitializer,\ +org.springframework.zero.context.initializer.VcapApplicationContextInitializer diff --git a/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties b/spring-zero-core/src/main/resources/org/springframework/zero/logging/log4j.properties similarity index 100% rename from spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties rename to spring-zero-core/src/main/resources/org/springframework/zero/logging/log4j.properties diff --git a/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logback.xml b/spring-zero-core/src/main/resources/org/springframework/zero/logging/logback.xml similarity index 100% rename from spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logback.xml rename to spring-zero-core/src/main/resources/org/springframework/zero/logging/logback.xml diff --git a/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties b/spring-zero-core/src/main/resources/org/springframework/zero/logging/logging.properties similarity index 100% rename from spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties rename to spring-zero-core/src/main/resources/org/springframework/zero/logging/logging.properties diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java b/spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java index 9e56f5a71c..f6dc540871 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.sampleconfig.MyComponent; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.io.ClassPathResource; +import org.springframework.zero.sampleconfig.MyComponent; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -82,7 +82,7 @@ public class BeanDefinitionLoaderTests { @Test public void loadResourceName() throws Exception { BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry, - "classpath:org/springframework/bootstrap/sample-beans.xml"); + "classpath:org/springframework/zero/sample-beans.xml"); int loaded = loader.load(); assertThat(loaded, equalTo(1)); assertTrue(this.registry.containsBean("myXmlComponent")); diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java b/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java index 7b2ab60c00..f6655ee8f7 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import java.util.concurrent.atomic.AtomicReference; @@ -26,8 +26,6 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.DefaultBeanNameGenerator; -import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextInitializer; @@ -47,6 +45,12 @@ import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.StaticWebApplicationContext; +import org.springframework.zero.BeanDefinitionLoader; +import org.springframework.zero.CommandLineRunner; +import org.springframework.zero.ExitCodeGenerator; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java b/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java rename to spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java index c217ca4921..1bfb39243f 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.zero; import java.util.HashMap; import java.util.Map; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java index d90df0d06b..ac5b966220 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import javax.validation.Validation; import javax.validation.constraints.NotNull; @@ -27,6 +27,7 @@ import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.validation.BindException; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.SpringValidatorAdapter; +import org.springframework.zero.bind.PropertiesConfigurationFactory; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java index 63032c61e0..d3a29c8fbc 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.util.Collections; @@ -24,6 +24,7 @@ import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; import org.springframework.validation.DataBinder; +import org.springframework.zero.bind.PropertySourcesPropertyValues; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java b/spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java similarity index 99% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java index 9d579d78f7..8f5881f3a4 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -45,6 +45,7 @@ import org.springframework.validation.BindingResult; import org.springframework.validation.DataBinder; import org.springframework.validation.FieldError; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; +import org.springframework.zero.bind.RelaxedDataBinder; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java index 0d213a0f33..1fcab85503 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.bind; +package org.springframework.zero.bind; import java.util.Collections; import java.util.HashMap; @@ -28,6 +28,7 @@ import org.springframework.context.support.StaticMessageSource; import org.springframework.validation.BindException; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.SpringValidatorAdapter; +import org.springframework.zero.bind.YamlConfigurationFactory; import org.yaml.snakeyaml.error.YAMLException; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java similarity index 84% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java index 873f60e7dc..8203d85952 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; + +import org.springframework.zero.config.JacksonJsonParser; +import org.springframework.zero.config.JsonParser; /** * @author Dave Syer diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java similarity index 92% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java index 1caef14b4b..2012dd972c 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java @@ -13,12 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.List; import java.util.Map; import org.junit.Test; +import org.springframework.zero.config.JsonParser; +import org.springframework.zero.config.SimpleJsonParser; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java index a0f54c1852..4ef7cff491 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.io.IOException; import java.io.InputStream; import java.util.Map; import org.junit.Test; -import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; +import org.springframework.zero.config.YamlMapFactoryBean; +import org.springframework.zero.config.YamlProcessor.ResolutionMethod; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java similarity index 84% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java index 1029a1ab4b..81357d5641 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java @@ -13,7 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; + +import org.springframework.zero.config.JsonParser; +import org.springframework.zero.config.YamlJsonParser; /** * @author Dave Syer diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java index ae76eac428..a9d6898bbf 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.config; +package org.springframework.zero.config; import java.util.Arrays; import java.util.Map; @@ -22,12 +22,13 @@ import java.util.Properties; import org.junit.Ignore; import org.junit.Test; -import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; -import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; -import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; +import org.springframework.zero.config.YamlPropertiesFactoryBean; +import org.springframework.zero.config.YamlProcessor.DocumentMatcher; +import org.springframework.zero.config.YamlProcessor.MatchStatus; +import org.springframework.zero.config.YamlProcessor.ResolutionMethod; import org.yaml.snakeyaml.Yaml; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java index c8508d579e..ce94e2b162 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import java.util.Arrays; @@ -22,12 +22,12 @@ import javax.annotation.PostConstruct; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.TestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.stereotype.Component; +import org.springframework.zero.TestUtils; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -150,7 +150,7 @@ public class EnableConfigurationPropertiesTests { @EnableConfigurationProperties protected static class TestBeanConfiguration { @ConditionalOnMissingBean(TestProperties.class) - @Bean(name = "org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesTests$TestProperties") + @Bean(name = "org.springframework.zero.context.annotation.EnableConfigurationPropertiesTests$TestProperties") public TestProperties testProperties() { return new TestProperties(); } @@ -168,7 +168,7 @@ public class EnableConfigurationPropertiesTests { } @Configuration - @ImportResource("org/springframework/bootstrap/context/annotation/testProperties.xml") + @ImportResource("org/springframework/zero/context/annotation/testProperties.xml") protected static class DefaultXmlConfiguration { } diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java similarity index 89% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java index ab71da42e7..fcdc446b46 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.context.annotation.ConditionalOnNotWebApplication; +import org.springframework.zero.context.annotation.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java index 14cc03dd45..b990226d62 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Ignore; import org.junit.Test; @@ -102,13 +102,13 @@ public class OnBeanConditionTests { } @Configuration - @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") + @ImportResource("org/springframework/zero/context/annotation/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(OnBeanNameConfiguration.class) - @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") + @ImportResource("org/springframework/zero/context/annotation/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java index d9e29da903..d992a73541 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -93,13 +93,13 @@ public class OnClassConditionTests { } @Configuration - @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") + @ImportResource("org/springframework/zero/context/annotation/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(BasicConfiguration.class) - @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") + @ImportResource("org/springframework/zero/context/annotation/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java index f546698865..60dd82ca6a 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.context.annotation.ConditionalOnExpression; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingBeanConditionTests.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingBeanConditionTests.java index 5bd94c287a..d253fb4fd8 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingBeanConditionTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.annotation.OnMissingBeanCondition; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingClassConditionTests.java similarity index 92% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingClassConditionTests.java index 52d2d79b60..a23d530a20 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -49,7 +49,7 @@ public class OnMissingClassConditionTests { } @Configuration - @ConditionalOnMissingClass("org.springframework.bootstrap.context.annotation.OnMissingClassConditionTests") + @ConditionalOnMissingClass("org.springframework.zero.context.annotation.OnMissingClassConditionTests") protected static class BasicConfiguration { @Bean public String bar() { diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnResourceConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnResourceConditionTests.java index 9ec8c738d0..6c168c93ee 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnResourceConditionTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.context.annotation.ConditionalOnResource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/WebApplicationConditionTests.java similarity index 90% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/WebApplicationConditionTests.java index 0e6b1790ad..c6bfa800ce 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/WebApplicationConditionTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.annotation; +package org.springframework.zero.context.annotation; import org.junit.Test; import org.springframework.context.annotation.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.annotation.ConditionalOnNotWebApplication; +import org.springframework.zero.context.annotation.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index a9c0b28920..f3809ff084 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.FileWriter; import java.io.IOException; @@ -44,6 +44,12 @@ 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-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java index 2cc5f23627..fbf60f98a8 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java @@ -14,17 +14,19 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import javax.servlet.Servlet; import javax.servlet.ServletContext; import org.junit.Test; -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-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index e866f813af..19d21b0ec3 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.net.URI; import java.nio.charset.Charset; @@ -22,8 +22,6 @@ 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; @@ -38,6 +36,8 @@ 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; @@ -115,7 +115,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { @Configuration @EnableWebMvc - @PropertySource("classpath:/org/springframework/bootstrap/context/embedded/conf.properties") + @PropertySource("classpath:/org/springframework/zero/context/embedded/conf.properties") public static class AdvancedConfig { @Autowired diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java index 4e01a916cf..b2e00e6b91 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.lang.reflect.Field; import java.util.Properties; @@ -40,6 +40,10 @@ import org.springframework.core.Ordered; import org.springframework.web.context.ServletContextAware; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.request.SessionScope; +import org.springframework.zero.context.embedded.EmbeddedWebApplicationContext; +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.instanceOf; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java index ec9a287638..add605cbbb 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.IOException; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java index be9ec5fe82..1976d636b0 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.IOException; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java index 39dd0c2937..b4bbca6156 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.Arrays; import java.util.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.bootstrap.context.embedded.FilterRegistrationBean; -import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; +import org.springframework.zero.context.embedded.FilterRegistrationBean; +import org.springframework.zero.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.*; import static org.mockito.Matchers.*; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java index 0cd9905711..7d1c229b61 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.ArrayList; import java.util.Enumeration; @@ -31,6 +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 static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyObject; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java index 4cc0521697..50002ee20a 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.IOException; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java index b40ff18c6d..9920000ab1 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.io.IOException; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java similarity index 98% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java index 748b236b86..18f0008ded 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.context.embedded; import java.util.Arrays; import java.util.Collections; @@ -36,7 +36,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 org.springframework.zero.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.*; import static org.mockito.Matchers.*; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java index 94834f0050..05ca433ab9 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded; +package org.springframework.zero.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-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java similarity index 73% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java index 5b0a0a9b3b..0364878643 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.config; +package org.springframework.zero.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-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java similarity index 84% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 8b4526e90e..4b6b2c3043 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.jetty; +package org.springframework.zero.context.embedded.jetty; import java.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.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainer; +import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java similarity index 84% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java index 19e83e134a..7181f58ea3 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.embedded.tomcat; +package org.springframework.zero.context.embedded.tomcat; import java.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.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainer; -import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainer; +import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.inOrder; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java index c80d70bec5..dbeae1005b 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.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-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java index bf48cc58da..a2c799597a 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import org.junit.Test; -import org.springframework.bootstrap.TestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.zero.TestUtils; +import org.springframework.zero.context.initializer.ContextIdApplicationContextInitializer; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java index 401a41b330..dc38df730d 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import java.util.HashMap; import java.util.Map; @@ -31,6 +31,7 @@ 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-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java index 795243648e..04e393f985 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java @@ -13,12 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.context.initializer; +package org.springframework.zero.context.initializer; import org.junit.Test; -import org.springframework.bootstrap.TestUtils; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.zero.TestUtils; +import org.springframework.zero.context.initializer.VcapApplicationContextInitializer; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java index 15fd3d7441..0bb5ff9b3d 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.bootstrap.context.test; +package org.springframework.zero.context.test; import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; -import org.springframework.bootstrap.context.annotation.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.annotation.ConfigurationProperties; +import org.springframework.zero.context.annotation.EnableConfigurationProperties; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java index 8b5d80ee7f..bdbe34b1ff 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.zero.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.zero.logging.JavaLoggerConfigurer; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java similarity index 97% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java index 0a856f9755..8f4c77181c 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.zero.logging; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -62,7 +62,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/bootstrap.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/springzero.log")); } @Test(expected = FileNotFoundException.class) diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingInitializerTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingInitializerTests.java index e240f3ca37..434939baa3 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingInitializerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.zero.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; @@ -92,7 +92,7 @@ public class LoggingInitializerTests { 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/bootstrap.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/springzero.log")); } @Test @@ -138,7 +138,7 @@ public class LoggingInitializerTests { Log logger = LogFactory.getLog(LoggingInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); - assertTrue("Wrong output:\n" + output, output.startsWith("foo/bootstrap.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("foo/springzero.log")); } } diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java rename to spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java index b198303812..317ade89dc 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.logging; +package org.springframework.zero.logging; import java.util.logging.Formatter; import java.util.logging.LogRecord; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/properties/ServerPropertiesTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/properties/ServerPropertiesTests.java index 10034cbf91..cf63d1afcf 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/properties/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.properties; +package org.springframework.zero.properties; import java.net.InetAddress; import java.util.Collections; @@ -23,7 +23,8 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; -import org.springframework.bootstrap.bind.RelaxedDataBinder; +import org.springframework.zero.bind.RelaxedDataBinder; +import org.springframework.zero.properties.ServerProperties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java b/spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java rename to spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java index 1e43159bb8..6fe2d4e459 100644 --- a/spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sampleconfig; +package org.springframework.zero.sampleconfig; import org.springframework.stereotype.Component; diff --git a/spring-zero-core/src/test/resources/logback-nondefault.xml b/spring-zero-core/src/test/resources/logback-nondefault.xml index 367dad76bb..2b19b3a54f 100644 --- a/spring-zero-core/src/test/resources/logback-nondefault.xml +++ b/spring-zero-core/src/test/resources/logback-nondefault.xml @@ -1,6 +1,6 @@ - + ${LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n diff --git a/spring-zero-core/src/test/resources/logback-test.xml b/spring-zero-core/src/test/resources/logback-test.xml index 465daf8a1c..359b71e547 100644 --- a/spring-zero-core/src/test/resources/logback-test.xml +++ b/spring-zero-core/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - + ${LOG_PATTERN} - - + + diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml deleted file mode 100644 index 735b571fc7..0000000000 --- a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml deleted file mode 100644 index c04d85080c..0000000000 --- a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties deleted file mode 100644 index eb99d1fa07..0000000000 --- a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties +++ /dev/null @@ -1 +0,0 @@ -port=8081 diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/foo.xml b/spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/foo.xml similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/foo.xml rename to spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/foo.xml diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml b/spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/testProperties.xml similarity index 61% rename from spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml rename to spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/testProperties.xml index c04d85080c..20e28fe928 100644 --- a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml +++ b/spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/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.zero.context.annotation.EnableConfigurationPropertiesTests$TestProperties" + class="org.springframework.zero.context.annotation.EnableConfigurationPropertiesTests$TestProperties"> diff --git a/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/conf.properties b/spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/conf.properties similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/conf.properties rename to spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/conf.properties diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml similarity index 63% rename from spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml rename to spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml index c4a4d1737a..d734da7227 100644 --- a/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml +++ b/spring-zero-core/src/test/resources/org/springframework/zero/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.zero.context.embedded.MockEmbeddedServletContainerFactory" /> - + diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml b/spring-zero-core/src/test/resources/org/springframework/zero/sample-beans.xml similarity index 83% rename from spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml rename to spring-zero-core/src/test/resources/org/springframework/zero/sample-beans.xml index 3658eb1274..369bd05ecb 100644 --- a/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml +++ b/spring-zero-core/src/test/resources/org/springframework/zero/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-zero-intergration-tests/build.log b/spring-zero-intergration-tests/build.log deleted file mode 100644 index 1ca3e48a12..0000000000 --- a/spring-zero-intergration-tests/build.log +++ /dev/null @@ -1,495 +0,0 @@ -[INFO] Scanning for projects... -[INFO] -[INFO] ------------------------------------------------------------------------ -[INFO] Building spring-zero-integration-tests 0.0.1.BUILD-SNAPSHOT -[INFO] ------------------------------------------------------------------------ -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.pom (16 KB at 1369.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-plugins/23/maven-plugins-23.pom (9 KB at 2994.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/22/maven-parent-22.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/22/maven-parent-22.pom (30 KB at 4841.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/11/apache-11.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/11/apache-11.pom (15 KB at 3616.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.9/maven-javadoc-plugin-2.9.jar (354 KB at 8044.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.pom (7 KB at 2171.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-source-plugin/2.2.1/maven-source-plugin-2.2.1.jar (30 KB at 5863.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.pom (13 KB at 4156.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/plugins/maven-invoker-plugin/1.8/maven-invoker-plugin-1.8.jar (103 KB at 7913.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.0.6/plexus-utils-2.0.6.pom (3 KB at 941.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/2.1/plexus-utils-2.1.pom (4 KB at 1969.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/sonatype/spice/spice-parent/16/spice-parent-16.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/sonatype/spice/spice-parent/16/spice-parent-16.pom (9 KB at 4081.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/sonatype/forge/forge-parent/5/forge-parent-5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/sonatype/forge/forge-parent/5/forge-parent-5.pom (9 KB at 2722.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.5/plexus-utils-1.5.5.pom (6 KB at 2513.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.11/plexus-1.0.11.pom (9 KB at 2919.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.6/maven-artifact-2.0.6.pom (2 KB at 770.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.6/maven-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.6/maven-2.0.6.pom (9 KB at 4417.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/5/maven-parent-5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/5/maven-parent-5.pom (15 KB at 4960.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/3/apache-3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/3/apache-3.pom (4 KB at 1674.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.1/plexus-utils-1.4.1.pom (2 KB at 1864.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.6/maven-model-2.0.6.pom (3 KB at 1487.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.0.6/maven-core-2.0.6.pom (7 KB at 6553.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.6/maven-settings-2.0.6.pom (2 KB at 977.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom (4 KB at 1928.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0.3/plexus-containers-1.0.3.pom (492 B at 480.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.4/plexus-1.0.4.pom (6 KB at 2801.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/junit/junit/4.11/junit-4.11.pom -Downloaded: file:///Users/pwebb/.m2/repository/junit/junit/4.11/junit-4.11.pom (3 KB at 2289.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.pom (766 B at 748.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.3/hamcrest-parent-1.3.pom (2 KB at 1925.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.pom (7 KB at 3347.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.pom (4 KB at 1527.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-file/1.0-beta-2/wagon-file-1.0-beta-2.pom (637 B at 311.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-providers/1.0-beta-2/wagon-providers-1.0-beta-2.pom (2 KB at 1734.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-2/wagon-1.0-beta-2.pom (6 KB at 2872.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/4/maven-parent-4.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/4/maven-parent-4.pom (10 KB at 4880.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-2/wagon-provider-api-1.0-beta-2.pom (680 B at 664.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.0.6/maven-plugin-parameter-documenter-2.0.6.pom (2 KB at 1866.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-lightweight/1.0-beta-2/wagon-http-lightweight-1.0-beta-2.pom (2 KB at 1334.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-http-shared/1.0-beta-2/wagon-http-shared-1.0-beta-2.pom (845 B at 412.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom -Downloaded: file:///Users/pwebb/.m2/repository/jtidy/jtidy/4aug2000r7-dev/jtidy-4aug2000r7-dev.pom (2 KB at 638.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom -Downloaded: file:///Users/pwebb/.m2/repository/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.pom (3 KB at 1098.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.pom (2 KB at 1710.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.0.6/maven-reporting-2.0.6.pom (2 KB at 1405.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.pom (424 B at 414.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0-alpha-7/doxia-1.0-alpha-7.pom (4 KB at 1910.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.6/maven-profile-2.0.6.pom (2 KB at 1933.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.6/maven-repository-metadata-2.0.6.pom (2 KB at 1806.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.0.6/maven-error-diagnostics-2.0.6.pom (2 KB at 832.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.6/maven-project-2.0.6.pom (3 KB at 2575.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.6/maven-artifact-manager-2.0.6.pom (3 KB at 2560.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.6/maven-plugin-registry-2.0.6.pom (2 KB at 1900.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.pom (3 KB at 2055.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.6/maven-plugin-api-2.0.6.pom (2 KB at 710.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-external/1.0-beta-2/wagon-ssh-external-1.0-beta-2.pom (2 KB at 1424.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh-common/1.0-beta-2/wagon-ssh-common-1.0-beta-2.pom (851 B at 415.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.pom (7 KB at 6924.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-7/plexus-container-default-1.0-alpha-7.pom (2 KB at 1258.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/plexus/plexus-containers/1.0.2/plexus-containers-1.0.2.pom (471 B at 230.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/plexus/plexus-root/1.0.3/plexus-root-1.0.3.pom (6 KB at 2939.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/plexus/plexus-utils/1.0.2/plexus-utils-1.0.2.pom (740 B at 361.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.0.6/maven-plugin-descriptor-2.0.6.pom (2 KB at 1970.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.0.6/maven-monitor-2.0.6.pom (2 KB at 1224.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-ssh/1.0-beta-2/wagon-ssh-1.0-beta-2.pom (2 KB at 846.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom -Downloaded: file:///Users/pwebb/.m2/repository/com/jcraft/jsch/0.1.27/jsch-0.1.27.pom (965 B at 942.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/classworlds/classworlds/1.1/classworlds-1.1.pom (4 KB at 3246.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1/plexus-archiver-2.1.pom (3 KB at 2743.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0/plexus-utils-3.0.pom (4 KB at 3971.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-io/2.0.2/plexus-io-2.0.2.pom (2 KB at 1692.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.pom (1018 B at 994.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/plexus-utils-3.0.7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.7/plexus-utils-3.0.7.pom (3 KB at 2453.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/mockito/mockito-core/1.9.5/mockito-core-1.9.5.pom (2 KB at 1417.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.pom (481 B at 469.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-parent/1.1/hamcrest-parent-1.1.pom (6 KB at 5739.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/objenesis/objenesis/1.0/objenesis-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/objenesis/objenesis/1.0/objenesis-1.0.pom (853 B at 833.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/hamcrest/hamcrest-library/1.3/hamcrest-library-1.3.pom (820 B at 800.8 KB/sec) -[INFO] -[INFO] --- maven-javadoc-plugin:2.9:jar (attach-javadocs) @ spring-zero-integration-tests --- -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-core/2.2.1/maven-core-2.2.1.pom (12 KB at 11360.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.2.1/maven-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.2.1/maven-2.2.1.pom (22 KB at 10941.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/11/maven-parent-11.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/11/maven-parent-11.pom (32 KB at 15824.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/5/apache-5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/5/apache-5.pom (5 KB at 2000.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.2.1/maven-settings-2.2.1.pom (3 KB at 2127.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.2.1/maven-model-2.2.1.pom (4 KB at 1582.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.15/plexus-utils-1.5.15.pom (7 KB at 3344.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/2.0.2/plexus-2.0.2.pom (12 KB at 11337.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.pom (889 B at 868.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.14/plexus-components-1.1.14.pom (6 KB at 5705.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.pom (998 B at 974.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-parameter-documenter/2.2.1/maven-plugin-parameter-documenter-2.2.1.pom (2 KB at 1911.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.pom (2 KB at 1853.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-parent/1.5.6/slf4j-parent-1.5.6.pom (8 KB at 3867.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.pom (3 KB at 2914.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.pom (3 KB at 2118.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.2.1/maven-reporting-api-2.2.1.pom (2 KB at 904.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.2.1/maven-reporting-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting/2.2.1/maven-reporting-2.2.1.pom (2 KB at 1409.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.1/doxia-sink-api-1.1.pom (2 KB at 995.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.1/doxia-1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.1/doxia-1.1.pom (15 KB at 14822.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-logging-api/1.1/doxia-logging-api-1.1.pom (2 KB at 1538.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-30/plexus-container-default-1.0-alpha-30.pom (4 KB at 3395.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-30/plexus-containers-1.0-alpha-30.pom (2 KB at 1849.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.5/plexus-utils-1.4.5.pom (3 KB at 2211.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-9/plexus-classworlds-1.2-alpha-9.pom (4 KB at 3147.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.10/plexus-1.0.10.pom (9 KB at 8056.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.2.1/maven-profile-2.2.1.pom (3 KB at 2120.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.2.1/maven-artifact-2.2.1.pom (2 KB at 772.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.2.1/maven-repository-metadata-2.2.1.pom (2 KB at 1827.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-error-diagnostics/2.2.1/maven-error-diagnostics-2.2.1.pom (2 KB at 1668.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.2.1/maven-project-2.2.1.pom (3 KB at 1354.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.2.1/maven-artifact-manager-2.2.1.pom (4 KB at 1515.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.pom (880 B at 429.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.2.1/maven-plugin-registry-2.2.1.pom (2 KB at 1883.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.pom (8 KB at 3896.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/11/commons-parent-11.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/11/commons-parent-11.pom (25 KB at 12035.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/4/apache-4.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/4/apache-4.pom (5 KB at 4389.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.2.1/maven-plugin-api-2.2.1.pom (2 KB at 712.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-descriptor/2.2.1/maven-plugin-descriptor-2.2.1.pom (3 KB at 2015.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-monitor/2.2.1/maven-monitor-2.2.1.pom (2 KB at 1227.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-toolchain/2.2.1/maven-toolchain-2.2.1.pom (4 KB at 3265.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.pom (3 KB at 2317.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/15/maven-shared-components-15.pom (10 KB at 9118.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/16/maven-parent-16.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/16/maven-parent-16.pom (23 KB at 22726.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/7/apache-7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/7/apache-7.pom (15 KB at 14091.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.pom (2 KB at 1354.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia/1.0/doxia-1.0.pom (10 KB at 9418.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/10/maven-parent-10.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/10/maven-parent-10.pom (31 KB at 15446.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.pom (6 KB at 5641.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/9/maven-shared-components-9.pom (4 KB at 3418.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/8/maven-parent-8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/8/maven-parent-8.pom (24 KB at 23567.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.6/plexus-utils-1.5.6.pom (6 KB at 5177.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.12/plexus-1.0.12.pom (10 KB at 9570.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.pom (4 KB at 1807.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-shared-components/12/maven-shared-components-12.pom (10 KB at 4559.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/13/maven-parent-13.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/13/maven-parent-13.pom (23 KB at 22103.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/6/apache-6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/6/apache-6.pom (13 KB at 12496.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.8/maven-artifact-2.0.8.pom (2 KB at 1581.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.8/maven-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.8/maven-2.0.8.pom (12 KB at 11811.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/6/maven-parent-6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-parent/6/maven-parent-6.pom (20 KB at 19576.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.6/plexus-utils-1.4.6.pom (3 KB at 2211.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.8/maven-model-2.0.8.pom (4 KB at 1533.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.8/maven-project-2.0.8.pom (3 KB at 2646.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.8/maven-settings-2.0.8.pom (3 KB at 2009.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.8/maven-profile-2.0.8.pom (2 KB at 1989.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.8/maven-artifact-manager-2.0.8.pom (3 KB at 2636.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.8/maven-repository-metadata-2.0.8.pom (2 KB at 1856.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.8/maven-plugin-registry-2.0.8.pom (2 KB at 1952.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.8/maven-plugin-api-2.0.8.pom (2 KB at 1459.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9/plexus-container-default-1.0-alpha-9.pom (2 KB at 1207.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.pom (3 KB at 2242.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.pom (5 KB at 4323.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sitetools/1.0/doxia-sitetools-1.0.pom (10 KB at 9361.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.pom (3 KB at 1169.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.7/plexus-utils-1.5.7.pom (8 KB at 3937.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.pom (2 KB at 1034.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-components/1.1.12/plexus-components-1.1.12.pom (3 KB at 2932.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.pom (2 KB at 955.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-20/plexus-container-default-1.0-alpha-20.pom (3 KB at 1460.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-containers/1.0-alpha-20/plexus-containers-1.0-alpha-20.pom (2 KB at 263.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.3/plexus-utils-1.3.pom (2 KB at 1009.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.8/plexus-1.0.8.pom (8 KB at 7060.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-classworlds/1.2-alpha-7/plexus-classworlds-1.2-alpha-7.pom (3 KB at 1158.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/1.0.9/plexus-1.0.9.pom (8 KB at 7500.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.pom (8 KB at 3791.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.1/commons-collections-3.1.pom (6 KB at 2970.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.1/commons-lang-2.1.pom (10 KB at 9695.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.pom (140 B at 136.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.pom (4 KB at 3080.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.pom (11 KB at 10775.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.pom (3 KB at 2200.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-modules/1.0/doxia-modules-1.0.pom (3 KB at 2337.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.pom (3 KB at 1314.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.pom (3 KB at 1094.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.pom (2 KB at 1561.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon-provider-api/1.0-beta-6/wagon-provider-api-1.0-beta-6.pom (2 KB at 1718.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/wagon/wagon/1.0-beta-6/wagon-1.0-beta-6.pom (13 KB at 12095.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.4.2/plexus-utils-1.4.2.pom (2 KB at 1913.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.pom (14 KB at 13648.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/9/commons-parent-9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/9/commons-parent-9.pom (22 KB at 21416.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.pom (11 KB at 10775.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/24/commons-parent-24.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/24/commons-parent-24.pom (47 KB at 46157.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/apache/9/apache-9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/apache/9/apache-9.pom (15 KB at 7402.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.pom (8 KB at 3790.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom (6 KB at 5140.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.pom (4 KB at 3735.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.pom (18 KB at 17934.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/5/commons-parent-5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/commons/commons-parent/5/commons-parent-5.pom (16 KB at 7832.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.pom -Downloaded: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.pom (3 KB at 1159.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom -Downloaded: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.pom (19 KB at 18120.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.pom (4 KB at 17.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.2/plexus-utils-3.0.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.2/plexus-utils-3.0.2.pom (3 KB at 817.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.pom (3 KB at 1226.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar -Downloading: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar -Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.jar -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-jdk14/1.5.6/slf4j-jdk14-1.5.6.jar (9 KB at 4304.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar (22 KB at 10907.2 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interactivity-api/1.0-alpha-4/plexus-interactivity-api-1.0-alpha-4.jar (14 KB at 6546.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/slf4j/jcl-over-slf4j/1.5.6/jcl-over-slf4j-1.5.6.jar (17 KB at 8165.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar -Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.2/commons-cli-1.2.jar (41 KB at 13386.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/3.0/maven-reporting-api-3.0.jar (11 KB at 5341.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-invoker/2.0.9/maven-invoker-2.0.9.jar (28 KB at 13809.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.11/plexus-interpolation-1.11.jar (50 KB at 16580.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/shared/maven-common-artifact-filters/1.3/maven-common-artifact-filters-1.3.jar (31 KB at 15165.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0/doxia-sink-api-1.0.jar (10 KB at 4918.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-i18n/1.0-beta-7/plexus-i18n-1.0-beta-7.jar (11 KB at 5131.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-site-renderer/1.0/doxia-site-renderer-1.0.jar (46 KB at 22713.4 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-core/1.0/doxia-core-1.0.jar (54 KB at 26831.1 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-velocity/1.1.7/plexus-velocity-1.1.7.jar (8 KB at 7488.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar -Downloading: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-decoration-model/1.0/doxia-decoration-model-1.0.jar (48 KB at 11959.5 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/oro/oro/2.0.8/oro-2.0.8.jar (64 KB at 15932.9 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar (324 KB at 35993.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-fml/1.0/doxia-module-fml-1.0.jar (19 KB at 18110.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xdoc/1.0/doxia-module-xdoc-1.0.jar (28 KB at 13572.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-apt/1.0/doxia-module-apt-1.0.jar (46 KB at 15324.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-module-xhtml/1.0/doxia-module-xhtml-1.0.jar (22 KB at 10647.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/velocity/velocity/1.5/velocity-1.5.jar (383 KB at 34812.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar -Downloaded: file:///Users/pwebb/.m2/repository/commons-io/commons-io/2.2/commons-io-2.2.jar (170 KB at 33903.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar -Downloaded: file:///Users/pwebb/.m2/repository/commons-codec/commons-codec/1.2/commons-codec-1.2.jar (30 KB at 9793.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar -Downloaded: file:///Users/pwebb/.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar (256 KB at 36524.7 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar -Downloaded: file:///Users/pwebb/.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar (558 KB at 37191.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar -Downloaded: file:///Users/pwebb/.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar (60 KB at 9877.3 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/commons-httpclient/commons-httpclient/3.1/commons-httpclient-3.1.jar (298 KB at 29785.3 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.jar -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.jar -Downloaded: file:///Users/pwebb/.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar (119 KB at 29558.1 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/com/thoughtworks/qdox/qdox/1.12/qdox-1.12.jar (176 KB at 29251.5 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/log4j/log4j/1.2.14/log4j-1.2.14.jar (359 KB at 39870.2 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-archiver/2.1.2/plexus-archiver-2.1.2.jar (181 KB at 30087.2 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.5/plexus-utils-3.0.5.jar (226 KB at 32149.4 KB/sec) -[INFO] Not executing Javadoc as the project is not a Java classpath-capable package -[INFO] -[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ spring-zero-integration-tests --- -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-model/2.0.9/maven-model-2.0.9.pom (4 KB at 1533.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.9/maven-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven/2.0.9/maven-2.0.9.pom (19 KB at 18463.9 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/1.5.1/plexus-utils-1.5.1.pom (3 KB at 2242.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact/2.0.9/maven-artifact-2.0.9.pom (2 KB at 1581.1 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-api/2.0.9/maven-plugin-api-2.0.9.pom (2 KB at 1459.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-project/2.0.9/maven-project-2.0.9.pom (3 KB at 2646.5 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-settings/2.0.9/maven-settings-2.0.9.pom (3 KB at 2009.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-profile/2.0.9/maven-profile-2.0.9.pom (3 KB at 1001.0 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-artifact-manager/2.0.9/maven-artifact-manager-2.0.9.pom (3 KB at 1318.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-repository-metadata/2.0.9/maven-repository-metadata-2.0.9.pom (2 KB at 1856.4 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/maven-plugin-registry/2.0.9/maven-plugin-registry-2.0.9.pom (2 KB at 1924.8 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.pom (4 KB at 1534.2 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus/3.2/plexus-3.2.pom (19 KB at 18306.6 KB/sec) -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar -Downloading: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar -Downloading: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar -Downloading: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/doxia/doxia-sink-api/1.0-alpha-7/doxia-sink-api-1.0-alpha-7.jar (6 KB at 2898.4 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/apache/maven/reporting/maven-reporting-api/2.0.6/maven-reporting-api-2.0.6.jar (10 KB at 4854.0 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar (30 KB at 14705.6 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-interpolation/1.15/plexus-interpolation-1.15.jar (60 KB at 19685.5 KB/sec) -Downloaded: file:///Users/pwebb/.m2/repository/org/codehaus/plexus/plexus-utils/3.0.8/plexus-utils-3.0.8.jar (227 KB at 37731.4 KB/sec) -[INFO] ------------------------------------------------------------------------ -[INFO] BUILD SUCCESS -[INFO] ------------------------------------------------------------------------ -[INFO] Total time: 2.704s -[INFO] Finished at: Wed Jul 03 13:00:17 PDT 2013 -[INFO] Final Memory: 15M/355M -[INFO] ------------------------------------------------------------------------ diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java similarity index 91% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java index e949921028..dfe54239fa 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher; +package org.springframework.zero.launcher; import java.util.List; import java.util.jar.JarEntry; -import org.springframework.bootstrap.launcher.jar.RandomAccessJarFile; +import org.springframework.zero.launcher.jar.RandomAccessJarFile; /** * {@link Launcher} for JAR based archives. This launcher assumes that dependency jars are diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java similarity index 98% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java index 9919c926e6..679ab701d8 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher; +package org.springframework.zero.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.bootstrap.launcher.jar.RandomAccessJarFile; +import org.springframework.zero.launcher.jar.RandomAccessJarFile; /** * Base class for launchers that can start an application with a fully configured diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java similarity index 97% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java index a572855dea..7980348878 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher; +package org.springframework.zero.launcher; import java.lang.reflect.Method; diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java similarity index 92% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java index b09efc52d8..c1f8682349 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher; +package org.springframework.zero.launcher; import java.io.IOException; import java.util.List; import java.util.jar.JarEntry; -import org.springframework.bootstrap.launcher.jar.JarEntryFilter; -import org.springframework.bootstrap.launcher.jar.RandomAccessJarFile; +import org.springframework.zero.launcher.jar.JarEntryFilter; +import org.springframework.zero.launcher.jar.RandomAccessJarFile; /** * {@link Launcher} for WAR based archives. This launcher for standard WAR archives. diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java similarity index 96% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java index abe1b93de0..4c60cc23f5 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.data; +package org.springframework.zero.launcher.data; import java.io.InputStream; diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java similarity index 99% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java index 2756b3bf92..91a9c4e95e 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.data; +package org.springframework.zero.launcher.data; import java.io.File; import java.io.IOException; diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java similarity index 85% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java index 4d04676a47..b6a24e0a97 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java @@ -17,7 +17,7 @@ /** * Classes and interfaces to allows random access to a block of data. * - * @see org.springframework.bootstrap.launcher.data.RandomAccessData + * @see org.springframework.zero.launcher.data.RandomAccessData */ -package org.springframework.bootstrap.launcher.data; +package org.springframework.zero.launcher.data; diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java similarity index 95% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java index 762f3c1cdb..cba4486286 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.launcher.jar; import java.util.jar.JarEntry; diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java similarity index 91% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java index 54e1b4e412..8d71cbf231 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.launcher.jar; import java.util.zip.ZipEntry; -import org.springframework.bootstrap.launcher.data.RandomAccessData; +import org.springframework.zero.launcher.data.RandomAccessData; /** * A {@link ZipEntry} returned from a {@link RandomAccessDataZipInputStream}. diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java similarity index 96% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java index 184dbb62b7..3796bcc467 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.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.bootstrap.launcher.data.RandomAccessData; +import org.springframework.zero.launcher.data.RandomAccessData; /** * A {@link ZipInputStream} backed by {@link RandomAccessData}. Parsed entries provide diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java similarity index 98% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java index 526d3daf69..8b47cbf14c 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.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.bootstrap.launcher.data.RandomAccessData; -import org.springframework.bootstrap.launcher.data.RandomAccessDataFile; +import org.springframework.zero.launcher.data.RandomAccessData; +import org.springframework.zero.launcher.data.RandomAccessDataFile; /** * A Jar file that can loaded from a {@link RandomAccessDataFile}. This class extends and diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java similarity index 92% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java index d24447a335..e94526e6e8 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java @@ -17,5 +17,5 @@ /** * Support for loading and manipulating JAR/WAR files. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.launcher.jar; diff --git a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/package-info.java similarity index 85% rename from spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java rename to spring-zero-launcher/src/main/java/org/springframework/zero/launcher/package-info.java index 67b42b214d..416917b4ac 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/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.bootstrap.launcher.JarLauncher - * @see org.springframework.bootstrap.launcher.WarLauncher + * @see org.springframework.zero.launcher.JarLauncher + * @see org.springframework.zero.launcher.WarLauncher */ -package org.springframework.bootstrap.launcher; +package org.springframework.zero.launcher; diff --git a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java similarity index 96% rename from spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java rename to spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java index 3b8a4f4102..73adea6973 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java +++ b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher; +package org.springframework.zero.launcher; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java similarity index 97% rename from spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java rename to spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java index 28a9ae38fc..c084af67fa 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java +++ b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.data; +package org.springframework.zero.launcher.data; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -39,7 +39,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.bootstrap.launcher.ByteArrayStartsWith; +import org.springframework.zero.launcher.ByteArrayStartsWith; +import org.springframework.zero.launcher.data.RandomAccessData; +import org.springframework.zero.launcher.data.RandomAccessDataFile; /** * Tests for {@link RandomAccessDataFile}. diff --git a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java similarity index 90% rename from spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java rename to spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java index 6be2c8bb68..49f6be1c9c 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java +++ b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.launcher.jar; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @@ -31,7 +31,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.bootstrap.launcher.data.RandomAccessDataFile; +import org.springframework.zero.launcher.data.RandomAccessDataFile; +import org.springframework.zero.launcher.jar.RandomAccessDataZipEntry; +import org.springframework.zero.launcher.jar.RandomAccessDataZipInputStream; /** * Tests for {@link RandomAccessDataZipInputStream}. diff --git a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java similarity index 98% rename from spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java rename to spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java index 46efa926c3..051c6ab04c 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java +++ b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.launcher.jar; +package org.springframework.zero.launcher.jar; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -48,7 +48,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.bootstrap.launcher.data.RandomAccessDataFile; +import org.springframework.zero.launcher.data.RandomAccessDataFile; +import org.springframework.zero.launcher.jar.JarEntryFilter; +import org.springframework.zero.launcher.jar.RandomAccessJarFile; /** * Tests for {@link RandomAccessJarFile}. diff --git a/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy b/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy index 3cb1dc0b25..f5e1f208b6 100644 --- a/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy +++ b/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.bootstrap.maven.*; +import org.springframework.zero.maven.*; Verify.verifyJar( new File( basedir, "target/executable-jar-0.0.1.BUILD-SNAPSHOT.jar" ) diff --git a/spring-zero-maven-plugin/src/it/executable-war/verify.groovy b/spring-zero-maven-plugin/src/it/executable-war/verify.groovy index 22967f9ab3..b0d90d5aae 100644 --- a/spring-zero-maven-plugin/src/it/executable-war/verify.groovy +++ b/spring-zero-maven-plugin/src/it/executable-war/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.bootstrap.maven.*; +import org.springframework.zero.maven.*; Verify.verifyWar( new File( basedir, "target/executable-war-0.0.1.BUILD-SNAPSHOT.war" ) diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java similarity index 99% rename from spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java index 2208db57bb..bd68107bdf 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.File; import java.io.IOException; diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java similarity index 94% rename from spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java index 6a72111fd9..6f50902d0f 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.util.Arrays; import java.util.HashSet; @@ -56,6 +56,6 @@ public class ExecutableJarMojo extends AbstractExecutableArchiveMojo { @Override protected String getLauncherClass() { - return "org.springframework.bootstrap.launcher.JarLauncher"; + return "org.springframework.zero.launcher.JarLauncher"; } } diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java similarity index 96% rename from spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java index 64bd714409..3b0ea5d4e0 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.File; import java.util.Collections; @@ -85,6 +85,6 @@ public class ExecutableWarMojo extends AbstractExecutableArchiveMojo { @Override protected String getLauncherClass() { - return "org.springframework.bootstrap.launcher.WarLauncher"; + return "org.springframework.zero.launcher.WarLauncher"; } } diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java similarity index 98% rename from spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java index 6f9149efb6..03a1e81e72 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.BufferedInputStream; import java.io.File; diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java similarity index 98% rename from spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java index 28fc21660b..1006e74c6c 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.IOException; import java.io.InputStream; diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java similarity index 92% rename from spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java index d83e29af72..5b785f7e93 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.File; import java.io.FileOutputStream; @@ -25,8 +25,9 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.bootstrap.maven.sample.ClassWithMainMethod; -import org.springframework.bootstrap.maven.sample.ClassWithoutMainMethod; +import org.springframework.zero.maven.MainClassFinder; +import org.springframework.zero.maven.sample.ClassWithMainMethod; +import org.springframework.zero.maven.sample.ClassWithoutMainMethod; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java similarity index 94% rename from spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java index f72ea7e4ce..e0d4573bb7 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.jar.JarOutputStream; import org.junit.Test; +import org.springframework.zero.maven.PropertiesMergingResourceTransformer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java similarity index 88% rename from spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java index ca3c33a4e7..cdcd171673 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven; +package org.springframework.zero.maven; import java.io.File; import java.util.Enumeration; @@ -34,15 +34,6 @@ import static org.junit.Assert.assertTrue; */ public class Verify { - public static void main(String[] args) { - try { - verifyJar(new File( - "/Users/pwebb/projects/spring/spring-bootstrap/code/spring-bootstrap-maven-plugin/target/it/executable-jar/target/executable-jar-0.0.1.BUILD-SNAPSHOT.jar")); - } catch (Exception ex) { - ex.printStackTrace(); - } - } - public static void verifyJar(File file) throws Exception { new JarArchiveVerification(file).verify(); } @@ -111,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/bootstrap/launcher/JarLauncher.class")); + + "springframework/zero/launcher/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("org/" + "test/SampleApplication.class")); } @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.bootstrap.launcher.JarLauncher", manifest + assertEquals("org.springframework.zero.launcher.JarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals("org.test.SampleApplication", manifest.getMainAttributes() .getValue("Start-Class")); @@ -140,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/bootstrap/launcher/JarLauncher.class")); + + "springframework/zero/launcher/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("WEB-INF/classes/org/" + "test/SampleApplication.class")); assertTrue("Web content", entries.containsKey("index.html")); @@ -148,7 +139,7 @@ public class Verify { @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.bootstrap.launcher.WarLauncher", manifest + assertEquals("org.springframework.zero.launcher.WarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals("org.test.SampleApplication", manifest.getMainAttributes() .getValue("Start-Class")); diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java similarity index 93% rename from spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java index 99b3621621..b5626436e6 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.maven.sample; +package org.springframework.zero.maven.sample; /** * Sample class with a main method. diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java similarity index 93% rename from spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java index 8d9166de32..ad6e5423b3 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.maven.sample; +package org.springframework.zero.maven.sample; /** * Sample class without a main method. diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java similarity index 67% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java index 7632f3f7ac..a06fd2b1d9 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java @@ -1,20 +1,20 @@ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.actuator.ui; import java.util.Date; import java.util.Map; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.actuate.properties.SecurityProperties; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.EnableAutoConfiguration; @EnableAutoConfiguration @ComponentScan @Controller -public class ActuatorUiBootstrapApplication { +public class SampleActuatorUiApplication { @RequestMapping("/") public String home(Map model) { @@ -25,7 +25,7 @@ public class ActuatorUiBootstrapApplication { } public static void main(String[] args) throws Exception { - SpringApplication.run(ActuatorUiBootstrapApplication.class, args); + SpringApplication.run(SampleActuatorUiApplication.class, args); } @Bean diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java similarity index 90% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index 30ce4e7b57..52ad4bc01e 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.actuator.ui; import java.io.IOException; import java.util.Map; @@ -11,13 +11,14 @@ 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 org.springframework.zero.sample.actuator.ui.SampleActuatorUiApplication; import static org.junit.Assert.assertEquals; @@ -27,7 +28,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer * */ -public class ManagementServiceBootstrapApplicationTests { +public class SampleActuatorUiApplicationPortTests { private static ConfigurableApplicationContext context; @@ -44,7 +45,7 @@ public class ManagementServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ActuatorUiBootstrapApplication.class, args); + .run(SampleActuatorUiApplication.class, args); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java index d97561a60f..81443973f5 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.actuator.ui; import java.io.IOException; import java.util.Arrays; @@ -11,7 +11,6 @@ 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; @@ -22,6 +21,7 @@ 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; @@ -30,9 +30,8 @@ import static org.junit.Assert.assertTrue; * Basic integration tests for demo application. * * @author Dave Syer - * */ -public class ActuatorUiBootstrapApplicationTests { +public class SampleActuatorUiApplicationTests { private static ConfigurableApplicationContext context; @@ -44,7 +43,7 @@ public class ActuatorUiBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ActuatorUiBootstrapApplication.class); + .run(SampleActuatorUiApplication.class); } }); context = future.get(30, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties index a9c2c37837..e423ea60da 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties @@ -3,5 +3,5 @@ handlers = java.util.logging.ConsoleHandler java.util.logging.ConsoleHandler.level = FINE sun.net.www.protocol.http.HttpURLConnection.level = ALL -org.springframework.bootstrap.context.annotation.level = ALL -org.springframework.bootstrap.actuate.autoconfigure.level = ALL +org.springframework.zero.context.annotation.level = ALL +org.springframework.zero.actuate.autoconfigure.level = ALL diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/HelloWorldService.java index fb4a4ac812..0c914ab20d 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.service; +package org.springframework.zero.sample.actuator; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java similarity index 69% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java index 25dc53c3de..92ef72bf02 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.service; +package org.springframework.zero.sample.actuator; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.context.annotation.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.annotation.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration @EnableConfigurationProperties @ComponentScan -public class ServiceBootstrapApplication { +public class SampleActuatorApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(ServiceBootstrapApplication.class, args); + SpringApplication.run(SampleActuatorApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleController.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleController.java index 66ffda0fa2..86ce0481c8 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.service; +package org.springframework.zero.sample.actuator; import java.util.Collections; import java.util.Map; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java similarity index 87% rename from spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java index 3bc7bedb6b..ec8782bf18 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.service; +package org.springframework.zero.sample.actuator; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; import org.springframework.stereotype.Component; +import org.springframework.zero.context.annotation.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) @Component diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties index 3f4cf00025..b1899920c5 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties @@ -3,5 +3,5 @@ handlers = java.util.logging.ConsoleHandler #java.util.logging.ConsoleHandler.level = FINE #sun.net.www.protocol.http.HttpURLConnection.level = ALL -#org.springframework.bootstrap.level = ALL +#org.springframework.zero.level = ALL #org.springframework.security.level = ALL diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java similarity index 91% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index aa87246aa6..59f0647988 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -11,8 +11,6 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.sample.service.ServiceBootstrapApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -25,6 +23,8 @@ 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 org.springframework.zero.sample.actuator.SampleActuatorApplication; import static org.junit.Assert.assertEquals; @@ -33,7 +33,7 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -public class EndpointsPropertiesServiceBootstrapApplicationTests { +public class EndpointsPropertiesSampleActuatorApplicationTests { private ConfigurableApplicationContext context; @@ -60,7 +60,7 @@ public class EndpointsPropertiesServiceBootstrapApplicationTests { @Test public void testCustomErrorPath() throws Exception { - start(ServiceBootstrapApplication.class, "--error.path=/oops"); + start(SampleActuatorApplication.class, "--error.path=/oops"); testError(); } diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java index bf5f256b5e..9f036daed4 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -13,8 +13,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.sample.service.ServiceBootstrapApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -27,6 +25,8 @@ 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 org.springframework.zero.sample.actuator.SampleActuatorApplication; import static org.junit.Assert.assertEquals; @@ -35,7 +35,7 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -public class ManagementAddressServiceBootstrapApplicationTests { +public class ManagementAddressSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; @@ -52,7 +52,7 @@ public class ManagementAddressServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ServiceBootstrapApplication.class, args); + .run(SampleActuatorApplication.class, args); } }); context = future.get(30, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java similarity index 88% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java index 1ff3268e84..e96fa66b08 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.Map; @@ -10,14 +10,14 @@ 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.bootstrap.sample.service.ServiceBootstrapApplication; 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 org.springframework.zero.sample.actuator.SampleActuatorApplication; import static org.junit.Assert.assertEquals; @@ -27,7 +27,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer * */ -public class ManagementServiceBootstrapApplicationTests { +public class ManagementSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; @@ -44,7 +44,7 @@ public class ManagementServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ServiceBootstrapApplication.class, args); + .run(SampleActuatorApplication.class, args); } }); context = future.get(30, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java index 81c1942205..ec00119ab9 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -12,8 +12,6 @@ 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.bootstrap.sample.service.ServiceBootstrapApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -27,6 +25,8 @@ 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 org.springframework.zero.sample.actuator.SampleActuatorApplication; import static org.junit.Assert.assertEquals; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertEquals; * @author Dave Syer * */ -public class NoManagementServiceBootstrapApplicationTests { +public class NoManagementSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; @@ -51,7 +51,7 @@ public class NoManagementServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ServiceBootstrapApplication.class, args); + .run(SampleActuatorApplication.class, args); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java similarity index 95% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java index 41d04809c6..9070afa4dd 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -12,8 +12,6 @@ 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.bootstrap.sample.service.ServiceBootstrapApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -26,6 +24,8 @@ 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 org.springframework.zero.sample.actuator.SampleActuatorApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer * */ -public class ServiceBootstrapApplicationTests { +public class SampleActuatorApplicationTests { private static ConfigurableApplicationContext context; @@ -49,7 +49,7 @@ public class ServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ServiceBootstrapApplication.class); + .run(SampleActuatorApplication.class); } }); context = future.get(30, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java index 4b6158e17b..24840007f7 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.ArrayList; @@ -12,8 +12,6 @@ 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.bootstrap.sample.service.ServiceBootstrapApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -26,6 +24,8 @@ 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 org.springframework.zero.sample.actuator.SampleActuatorApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue; * @author Dave Syer * */ -public class ShutdownServiceBootstrapApplicationTests { +public class ShutdownSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; @@ -48,7 +48,7 @@ public class ShutdownServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ServiceBootstrapApplication.class); + .run(SampleActuatorApplication.class); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java similarity index 88% rename from spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java index d08a0f764a..0890cb2c68 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.test; +package org.springframework.zero.sample.actuator; import java.io.IOException; import java.util.Map; @@ -10,14 +10,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.bootstrap.sample.service.ServiceBootstrapApplication; 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; @@ -27,9 +26,8 @@ import static org.junit.Assert.assertFalse; * classpath). * * @author Dave Syer - * */ -public class UnsecureServiceBootstrapApplicationTests { +public class UnsecureSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; @@ -41,7 +39,7 @@ public class UnsecureServiceBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(ServiceBootstrapApplication.class, + .run(SampleActuatorApplication.class, "--security.basic.enabled=false"); } }); diff --git a/spring-zero-samples/spring-zero-sample-actuator/start.groovy b/spring-zero-samples/spring-zero-sample-actuator/start.groovy index 6cecd252d2..59610a9bb8 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/start.groovy +++ b/spring-zero-samples/spring-zero-sample-actuator/start.groovy @@ -1,5 +1,5 @@ -@Grab("org.springframework.bootstrap:spring-bootstrap-actuator:0.5.0.BUILD-SNAPSHOT") -@Grab("org.springframework.bootstrap:spring-bootstrap-web-starter:0.5.0.BUILD-SNAPSHOT") -@ComponentScan("org.springframework.bootstrap.sample.service") +@Grab("org.springframework.zero:spring-zero-actuator:0.5.0.BUILD-SNAPSHOT") +@Grab("org.springframework.zero:spring-zero-starter-web:0.5.0.BUILD-SNAPSHOT") +@ComponentScan("org.springframework.zero.sample.service") class Start { } diff --git a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java index e24f32cdf4..e0f11cb4e9 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.batch; +package org.springframework.zero.sample.batch; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; @@ -26,17 +26,17 @@ 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.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration @ComponentScan @EnableBatchProcessing -public class BatchBootstrapApplication { +public class SampleBatchApplication { @Autowired private JobBuilderFactory jobs; @@ -69,6 +69,6 @@ public class BatchBootstrapApplication { // System.exit is common for Batch applications since the exit code can be used to // drive a workflow System.exit(SpringApplication.exit(SpringApplication.run( - BatchBootstrapApplication.class, args))); + SampleBatchApplication.class, args))); } } diff --git a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java similarity index 85% rename from spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java index 879eb2af0b..4e42a6f075 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap.sample.batch; +package org.springframework.zero.sample.batch; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -21,12 +21,13 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.bootstrap.SpringApplication; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.sample.batch.SampleBatchApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class BatchBootstrapApplicationTests { +public class SampleBatchApplicationTests { private PrintStream savedOutput; private ByteArrayOutputStream output; @@ -51,7 +52,7 @@ public class BatchBootstrapApplicationTests { @Test public void testDefaultSettings() throws Exception { assertEquals(0, SpringApplication.exit(SpringApplication - .run(BatchBootstrapApplication.class))); + .run(SampleBatchApplication.class))); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("completed with the following parameters")); diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java index de8159fd99..e24cfd367f 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data; +package org.springframework.zero.sample.data.jpa; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; @Configuration @ComponentScan @EnableAutoConfiguration -public class DataBootstrapApplication { +public class SampleDataJpaApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(DataBootstrapApplication.class, args); + SpringApplication.run(SampleDataJpaApplication.class, args); } } diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java similarity index 95% rename from spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java index 1b16187938..e06bdd18ac 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.autoconfigure.orm.jpa.test; +package org.springframework.zero.sample.data.jpa.domain; import java.io.Serializable; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java index 9d0370b5e0..60fc40cff1 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Hotel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; import java.io.Serializable; import java.util.Set; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/HotelSummary.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/HotelSummary.java index 390f3e4474..03be7fd9f7 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/HotelSummary.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; import java.io.Serializable; import java.math.BigDecimal; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Rating.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Rating.java index 002786d194..db46dff858 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Rating.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; public enum Rating { TERRIBLE, POOR, AVERAGE, GOOD, EXCELLENT, diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/RatingCount.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/RatingCount.java index 8a757a65aa..5b0c928a09 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/RatingCount.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; import java.io.Serializable; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java similarity index 98% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java index fd85f5436f..afcb054431 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/Review.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; import java.io.Serializable; import java.util.Date; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/ReviewDetails.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/ReviewDetails.java index 1914cd83c2..f51eb18660 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/ReviewDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; import java.io.Serializable; import java.util.Date; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/TripType.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/TripType.java index e60f2cbe22..5a7729f204 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/TripType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain; +package org.springframework.zero.sample.data.jpa.domain; public enum TripType { BUSINESS, COUPLES, FAMILY, FRIENDS, SOLO diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/CityRepository.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/CityRepository.java index f8eb726ab8..59adf3e3f9 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/CityRepository.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain.repository; +package org.springframework.zero.sample.data.jpa.domain.repository; -import org.springframework.bootstrap.sample.data.domain.City; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; +import org.springframework.zero.sample.data.jpa.domain.City; public interface CityRepository extends Repository { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelRepository.java similarity index 80% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelRepository.java index 16d8059244..dd55b2c163 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelRepository.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain.repository; +package org.springframework.zero.sample.data.jpa.domain.repository; -import org.springframework.bootstrap.sample.data.domain.City; -import org.springframework.bootstrap.sample.data.domain.Hotel; import org.springframework.data.repository.Repository; +import org.springframework.zero.sample.data.jpa.domain.City; +import org.springframework.zero.sample.data.jpa.domain.Hotel; public interface HotelRepository extends Repository { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java similarity index 91% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java index c8b1a36bae..01ccb52ac9 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/HotelSummaryRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain.repository; +package org.springframework.zero.sample.data.jpa.domain.repository; import java.util.List; import java.util.Locale; @@ -23,16 +23,16 @@ import javax.persistence.EntityManager; import javax.persistence.PersistenceContext; import javax.persistence.Query; -import org.springframework.bootstrap.sample.data.domain.City; -import org.springframework.bootstrap.sample.data.domain.Hotel; -import org.springframework.bootstrap.sample.data.domain.HotelSummary; -import org.springframework.bootstrap.sample.data.domain.RatingCount; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; import org.springframework.data.domain.Sort.Order; import org.springframework.stereotype.Repository; +import org.springframework.zero.sample.data.jpa.domain.City; +import org.springframework.zero.sample.data.jpa.domain.Hotel; +import org.springframework.zero.sample.data.jpa.domain.HotelSummary; +import org.springframework.zero.sample.data.jpa.domain.RatingCount; @Repository public class HotelSummaryRepository { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/ReviewRepository.java similarity index 83% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/ReviewRepository.java index 636f5568e2..1d9ed4ae42 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain/repository/ReviewRepository.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.domain.repository; +package org.springframework.zero.sample.data.jpa.domain.repository; -import org.springframework.bootstrap.sample.data.domain.Hotel; -import org.springframework.bootstrap.sample.data.domain.Review; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.data.repository.Repository; +import org.springframework.zero.sample.data.jpa.domain.Hotel; +import org.springframework.zero.sample.data.jpa.domain.Review; public interface ReviewRepository extends Repository { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CitySearchCriteria.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CitySearchCriteria.java index fe4a055526..aa959542bb 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CitySearchCriteria.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.service; +package org.springframework.zero.sample.data.jpa.service; import java.io.Serializable; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java similarity index 82% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java index 130a6ad431..8ab550bba9 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/CityService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.service; +package org.springframework.zero.sample.data.jpa.service; -import org.springframework.bootstrap.sample.data.domain.City; -import org.springframework.bootstrap.sample.data.domain.HotelSummary; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.zero.sample.data.jpa.domain.City; +import org.springframework.zero.sample.data.jpa.domain.HotelSummary; public interface CityService { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/HotelService.java similarity index 75% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/HotelService.java index 9759bdc4e8..a3c70a5789 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/HotelService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.service; +package org.springframework.zero.sample.data.jpa.service; -import org.springframework.bootstrap.sample.data.domain.City; -import org.springframework.bootstrap.sample.data.domain.Hotel; -import org.springframework.bootstrap.sample.data.domain.Review; -import org.springframework.bootstrap.sample.data.domain.ReviewDetails; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import org.springframework.zero.sample.data.jpa.domain.City; +import org.springframework.zero.sample.data.jpa.domain.Hotel; +import org.springframework.zero.sample.data.jpa.domain.Review; +import org.springframework.zero.sample.data.jpa.domain.ReviewDetails; public interface HotelService { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/ReviewsSummary.java similarity index 85% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/ReviewsSummary.java index 21d63f706b..acd8df2ec5 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/ReviewsSummary.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.service; +package org.springframework.zero.sample.data.jpa.service; -import org.springframework.bootstrap.sample.data.domain.Rating; +import org.springframework.zero.sample.data.jpa.domain.Rating; public interface ReviewsSummary { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java similarity index 83% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java index 90c4a62897..70280837f4 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/CityServiceImpl.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.service.impl; +package org.springframework.zero.sample.data.jpa.service.impl; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.sample.data.domain.City; -import org.springframework.bootstrap.sample.data.domain.HotelSummary; -import org.springframework.bootstrap.sample.data.domain.repository.CityRepository; -import org.springframework.bootstrap.sample.data.domain.repository.HotelSummaryRepository; -import org.springframework.bootstrap.sample.data.service.CitySearchCriteria; -import org.springframework.bootstrap.sample.data.service.CityService; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import org.springframework.zero.sample.data.jpa.domain.City; +import org.springframework.zero.sample.data.jpa.domain.HotelSummary; +import org.springframework.zero.sample.data.jpa.domain.repository.CityRepository; +import org.springframework.zero.sample.data.jpa.domain.repository.HotelSummaryRepository; +import org.springframework.zero.sample.data.jpa.service.CitySearchCriteria; +import org.springframework.zero.sample.data.jpa.service.CityService; @Component("cityService") @Transactional diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/HotelServiceImpl.java similarity index 78% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/HotelServiceImpl.java index 898418f9e5..f24c6fc7a1 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/service/impl/HotelServiceImpl.java @@ -14,29 +14,29 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.service.impl; +package org.springframework.zero.sample.data.jpa.service.impl; import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.sample.data.domain.City; -import org.springframework.bootstrap.sample.data.domain.Hotel; -import org.springframework.bootstrap.sample.data.domain.Rating; -import org.springframework.bootstrap.sample.data.domain.RatingCount; -import org.springframework.bootstrap.sample.data.domain.Review; -import org.springframework.bootstrap.sample.data.domain.ReviewDetails; -import org.springframework.bootstrap.sample.data.domain.repository.HotelRepository; -import org.springframework.bootstrap.sample.data.domain.repository.HotelSummaryRepository; -import org.springframework.bootstrap.sample.data.domain.repository.ReviewRepository; -import org.springframework.bootstrap.sample.data.service.HotelService; -import org.springframework.bootstrap.sample.data.service.ReviewsSummary; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.Assert; +import org.springframework.zero.sample.data.jpa.domain.City; +import org.springframework.zero.sample.data.jpa.domain.Hotel; +import org.springframework.zero.sample.data.jpa.domain.Rating; +import org.springframework.zero.sample.data.jpa.domain.RatingCount; +import org.springframework.zero.sample.data.jpa.domain.Review; +import org.springframework.zero.sample.data.jpa.domain.ReviewDetails; +import org.springframework.zero.sample.data.jpa.domain.repository.HotelRepository; +import org.springframework.zero.sample.data.jpa.domain.repository.HotelSummaryRepository; +import org.springframework.zero.sample.data.jpa.domain.repository.ReviewRepository; +import org.springframework.zero.sample.data.jpa.service.HotelService; +import org.springframework.zero.sample.data.jpa.service.ReviewsSummary; @Component("hotelService") @Transactional diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/web/SampleController.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/web/SampleController.java index f8d4be19ce..9de90d5f69 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/web/SampleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.data.web; +package org.springframework.zero.sample.data.jpa.web; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.sample.data.service.CityService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.zero.sample.data.jpa.service.CityService; @Controller public class SampleController { diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java similarity index 87% rename from spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java index 231dac09d0..0d9d3239ba 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.data; +package org.springframework.zero.sample.data.jpa; import java.io.IOException; import java.util.concurrent.Callable; @@ -9,13 +9,14 @@ 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 org.springframework.zero.sample.data.jpa.SampleDataJpaApplication; import static org.junit.Assert.assertEquals; @@ -24,7 +25,7 @@ import static org.junit.Assert.assertEquals; * * @author Dave Syer */ -public class DataBootstrapApplicationTests { +public class SampleDataJpaApplicationTests { private static ConfigurableApplicationContext context; @@ -36,7 +37,7 @@ public class DataBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(DataBootstrapApplication.class); + .run(SampleDataJpaApplication.class); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/HelloWorldService.java index 95b0798945..299edfa399 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.consumer; +package org.springframework.zero.sample.integration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleEndpoint.java similarity index 95% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleEndpoint.java index 925bd76349..0e80ddbb95 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.consumer; +package org.springframework.zero.sample.integration; import java.io.File; import java.io.FileInputStream; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java similarity index 72% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java index b9e0c5b3a2..9886939734 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java @@ -14,24 +14,24 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.consumer; +package org.springframework.zero.sample.integration; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.context.annotation.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.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.context.annotation.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration @EnableConfigurationProperties(ServiceProperties.class) @ComponentScan @ImportResource("integration-context.xml") -public class IntegrationBootstrapApplication { +public class SampleIntegrationApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(IntegrationBootstrapApplication.class, args); + SpringApplication.run(SampleIntegrationApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java similarity index 86% rename from spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java index 17a71ccb25..c703c3f122 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.consumer; +package org.springframework.zero.sample.integration; -import org.springframework.bootstrap.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.annotation.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) public class ServiceProperties { diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java similarity index 83% rename from spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java index 3518866e67..e2e25fcc08 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.consumer; +package org.springframework.zero.sample.integration.consumer; import java.util.concurrent.Callable; import java.util.concurrent.Executors; @@ -8,13 +8,14 @@ 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.bootstrap.sample.producer.ProducerApplication; 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; import static org.junit.Assert.assertTrue; @@ -23,14 +24,14 @@ import static org.junit.Assert.assertTrue; * * @author Dave Syer */ -public class IntegrationBootstrapApplicationTests { +public class SampleIntegrationApplicationTests { private static ConfigurableApplicationContext context; @BeforeClass public static void start() throws Exception { context = (ConfigurableApplicationContext) SpringApplication - .run(IntegrationBootstrapApplication.class); + .run(SampleIntegrationApplication.class); } @AfterClass diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java similarity index 51% rename from spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java rename to spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java index ba129c89bb..71d245c499 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java @@ -1,11 +1,11 @@ -package org.springframework.bootstrap.sample.producer; +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 { @@ -13,13 +13,15 @@ public class ProducerApplication implements CommandLineRunner { @Override public void run(String... args) throws Exception { new File("target/input").mkdirs(); - FileOutputStream stream = new FileOutputStream("target/input/data" - + System.currentTimeMillis() + ".txt"); - for (String arg : args) { - stream.write(arg.getBytes()); + if (args.length > 0) { + FileOutputStream stream = new FileOutputStream("target/input/data" + + System.currentTimeMillis() + ".txt"); + for (String arg : args) { + stream.write(arg.getBytes()); + } + stream.flush(); + stream.close(); } - stream.flush(); - stream.close(); } public static void main(String[] args) throws Exception { diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java index 33f114eac8..fdce7ca4e1 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.jetty; +package org.springframework.zero.sample.jetty; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration @ComponentScan -public class JettyBootstrapApplication { +public class SampleJettyApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(JettyBootstrapApplication.class, args); + SpringApplication.run(SampleJettyApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/service/HelloWorldService.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/service/HelloWorldService.java index f648ed7f22..573514f811 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.jetty.service; +package org.springframework.zero.sample.jetty.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/web/SampleController.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/web/SampleController.java index 8d2308bcb5..8e1a2171e2 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/web/SampleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.jetty.web; +package org.springframework.zero.sample.jetty.web; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.sample.jetty.service.HelloWorldService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.zero.sample.jetty.service.HelloWorldService; @Controller public class SampleController { diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java similarity index 90% rename from spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java index 878b2f454d..72c93991b9 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.jetty; +package org.springframework.zero.sample.jetty; import java.io.IOException; import java.util.concurrent.Callable; @@ -9,13 +9,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; @@ -23,9 +23,8 @@ import static org.junit.Assert.assertEquals; * Basic integration tests for demo application. * * @author Dave Syer - * */ -public class JettyBootstrapApplicationTests { +public class SampleJettyApplicationTests { private static ConfigurableApplicationContext context; @@ -37,7 +36,7 @@ public class JettyBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(JettyBootstrapApplication.class); + .run(SampleJettyApplication.class); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java index 03439c2640..25eeacaddf 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.simple; +package org.springframework.zero.sample.profile; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.CommandLineRunner; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.sample.simple.service.MessageService; 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.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.sample.profile.service.MessageService; @Configuration @EnableAutoConfiguration @ComponentScan -public class ProfileBootstrapApplication implements CommandLineRunner { +public class SampleProfileApplication implements CommandLineRunner { // Simple example shows how a command line spring application can execute an // injected bean service. Also demonstrates how you can use @Value to inject @@ -42,6 +42,6 @@ public class ProfileBootstrapApplication implements CommandLineRunner { } public static void main(String[] args) throws Exception { - SpringApplication.run(ProfileBootstrapApplication.class, args); + SpringApplication.run(SampleProfileApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/GoodbyeWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/GoodbyeWorldService.java index 11189115b8..6d7be8d310 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/GoodbyeWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.simple.service; +package org.springframework.zero.sample.profile.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/HelloWorldService.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/HelloWorldService.java index e9a39feebc..dd388f535f 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.simple.service; +package org.springframework.zero.sample.profile.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Profile; diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/MessageService.java similarity index 92% rename from spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/MessageService.java index bce760282b..f3758cb180 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/service/MessageService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.simple.service; +package org.springframework.zero.sample.profile.service; /** * @author Dave Syer diff --git a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java similarity index 84% rename from spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java index f9bb21fdc2..45bb0d2b22 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.simple; +package org.springframework.zero.sample.profile; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -8,10 +8,11 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.zero.sample.profile.SampleProfileApplication; import static org.junit.Assert.assertTrue; -public class ProfileBootstrapApplicationTests { +public class SampleProfileApplicationTests { private static PrintStream savedOutput; private static ByteArrayOutputStream output; @@ -49,7 +50,7 @@ public class ProfileBootstrapApplicationTests { @Test public void testDefaultProfile() throws Exception { - ProfileBootstrapApplication.main(new String[0]); + SampleProfileApplication.main(new String[0]); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("Hello Phil")); } @@ -57,14 +58,14 @@ public class ProfileBootstrapApplicationTests { @Test public void testGoodbyeProfile() throws Exception { System.setProperty("spring.profiles.active", "goodbye"); - ProfileBootstrapApplication.main(new String[0]); + SampleProfileApplication.main(new String[0]); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("Goodbye Everyone")); } @Test public void testGoodbyeProfileFromCommandline() throws Exception { - ProfileBootstrapApplication + SampleProfileApplication .main(new String[] { "--spring.profiles.active=goodbye" }); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("Goodbye Everyone")); diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java index 98496190c1..2381784c17 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.simple; +package org.springframework.zero.sample.simple; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.CommandLineRunner; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; -import org.springframework.bootstrap.sample.simple.service.HelloWorldService; 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.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.sample.simple.service.HelloWorldService; @Configuration @EnableAutoConfiguration @ComponentScan -public class SimpleBootstrapApplication implements CommandLineRunner { +public class SampleSimpleApplication implements CommandLineRunner { // Simple example shows how a command line spring application can execute an // injected bean service. Also demonstrates how you can use @Value to inject @@ -42,6 +42,6 @@ public class SimpleBootstrapApplication implements CommandLineRunner { } public static void main(String[] args) throws Exception { - SpringApplication.run(SimpleBootstrapApplication.class, args); + SpringApplication.run(SampleSimpleApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/service/HelloWorldService.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/service/HelloWorldService.java index 9416a4032a..60266ba21d 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.xml.service; +package org.springframework.zero.sample.simple.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java similarity index 78% rename from spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java index 4a3905edf3..a99ed5d3dc 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.simple; +package org.springframework.zero.sample.simple; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -9,10 +9,18 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; -public class SimpleBootstrapApplicationTests { +/** + * Tests for {@link SampleSimpleApplication}. + * + * @author Dave Syer + * @author Phillip Webb + */ +public class SampleSimpleApplicationTests { private PrintStream savedOutput; + private ByteArrayOutputStream output; + private String profiles; @Before @@ -39,14 +47,14 @@ public class SimpleBootstrapApplicationTests { @Test public void testDefaultSettings() throws Exception { - SimpleBootstrapApplication.main(new String[0]); + SampleSimpleApplication.main(new String[0]); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("Hello Phil")); } @Test public void testCommandLineOverrides() throws Exception { - SimpleBootstrapApplication.main(new String[] { "--name=Gordon" }); + SampleSimpleApplication.main(new String[] { "--name=Gordon" }); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("Hello Gordon")); } diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java index 6facbc86c3..9de6c7b92d 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.trad; +package org.springframework.zero.sample.tomcat; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration @ComponentScan -public class TradBootstrapApplication { +public class SampleTomcatApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(TradBootstrapApplication.class, args); + SpringApplication.run(SampleTomcatApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/service/HelloWorldService.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/service/HelloWorldService.java index 6f7134c719..33c9f4e043 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.simple.service; +package org.springframework.zero.sample.tomcat.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/web/SampleController.java similarity index 88% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/web/SampleController.java index d6c871fb44..7a74c8443a 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/web/SampleController.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.tomcat.web; +package org.springframework.zero.sample.tomcat.web; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.sample.tomcat.service.HelloWorldService; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.zero.sample.tomcat.service.HelloWorldService; @Controller public class SampleController { diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index d13e2ce7fd..e804d81219 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.tomcat; +package org.springframework.zero.sample.tomcat; import java.io.IOException; import java.util.concurrent.Callable; @@ -9,12 +9,6 @@ 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.bootstrap.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.bootstrap.sample.tomcat.service.HelloWorldService; -import org.springframework.bootstrap.sample.tomcat.web.SampleController; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -24,6 +18,13 @@ 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.SampleTomcatApplication; +import org.springframework.zero.sample.tomcat.service.HelloWorldService; +import org.springframework.zero.sample.tomcat.web.SampleController; import static org.junit.Assert.assertEquals; @@ -31,9 +32,8 @@ import static org.junit.Assert.assertEquals; * Basic integration tests for demo application. * * @author Dave Syer - * */ -public class NonAutoConfigurationBootstrapApplicationTests { +public class NonAutoConfigurationSampleTomcatApplicationTests { private static ConfigurableApplicationContext context; @@ -41,10 +41,10 @@ public class NonAutoConfigurationBootstrapApplicationTests { @Import({ EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @ComponentScan(basePackageClasses = { SampleController.class, HelloWorldService.class }) - public static class NonAutoConfigurationBootstrapApplication { + public static class NonAutoConfigurationSampleTomcatApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(TomcatBootstrapApplication.class, args); + SpringApplication.run(SampleTomcatApplication.class, args); } } @@ -57,7 +57,7 @@ public class NonAutoConfigurationBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(NonAutoConfigurationBootstrapApplication.class); + .run(NonAutoConfigurationSampleTomcatApplication.class); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java index f57b61800e..856d7b5c0b 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.tomcat; +package org.springframework.zero.sample.tomcat; import java.io.IOException; import java.util.concurrent.Callable; @@ -9,13 +9,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; @@ -23,9 +23,8 @@ import static org.junit.Assert.assertEquals; * Basic integration tests for demo application. * * @author Dave Syer - * */ -public class TomcatBootstrapApplicationTests { +public class SampleTomcatApplicationTests { private static ConfigurableApplicationContext context; @@ -37,7 +36,7 @@ public class TomcatBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(TomcatBootstrapApplication.class); + .run(SampleTomcatApplication.class); } }); context = future.get(10, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java similarity index 74% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java index 0cec9ced8b..bf42dcb910 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.tomcat; +package org.springframework.zero.sample.traditional; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.context.annotation.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration @ComponentScan -public class TomcatBootstrapApplication { +public class SampleTraditionalApplication { public static void main(String[] args) throws Exception { - SpringApplication.run(TomcatBootstrapApplication.class, args); + SpringApplication.run(SampleTraditionalApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/config/WebConfig.java similarity index 97% rename from spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java rename to spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/config/WebConfig.java index 0d34d22b6a..b3a3600678 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/config/WebConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.trad.config; +package org.springframework.zero.sample.traditional.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java similarity index 89% rename from spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java index 11c1995932..46019181c5 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.trad; +package org.springframework.zero.sample.traditional; import java.io.IOException; import java.util.concurrent.Callable; @@ -9,13 +9,14 @@ 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 org.springframework.zero.sample.traditional.SampleTraditionalApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -25,7 +26,7 @@ import static org.junit.Assert.assertTrue; * * @author Dave Syer */ -public class TradBootstrapApplicationTests { +public class SampleTraditionalApplicationTests { private static ConfigurableApplicationContext context; @@ -37,7 +38,7 @@ public class TradBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(TradBootstrapApplication.class); + .run(SampleTraditionalApplication.class); } }); context = future.get(30, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/InMemoryMessageRespository.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/InMemoryMessageRespository.java index d8f19e686d..9a82f027cc 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/InMemoryMessageRespository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.web.ui; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/Message.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/Message.java similarity index 96% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/Message.java rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/Message.java index 2a9f363231..c013381b5e 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/Message.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/Message.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.web.ui; import java.util.Calendar; diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/MessageRepository.java similarity index 94% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/MessageRepository.java index de917bdc4f..057149a859 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/MessageRepository.java @@ -11,7 +11,7 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.web.ui; /** * @author Rob Winch diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java similarity index 82% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java index d1b1cb78f4..64c2957e6e 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.web.ui; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration; 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.context.annotation.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration @ComponentScan -public class UiBootstrapApplication { +public class SampleWebUiApplication { @Bean public MessageRepository messageRepository() { @@ -44,7 +44,7 @@ public class UiBootstrapApplication { } public static void main(String[] args) throws Exception { - SpringApplication.run(UiBootstrapApplication.class, args); + SpringApplication.run(SampleWebUiApplication.class, args); } } diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/mvc/MessageController.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/mvc/MessageController.java index e9f0570703..c9203d2373 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/mvc/MessageController.java @@ -11,13 +11,11 @@ * specific language governing permissions and limitations under the License. */ -package org.springframework.bootstrap.sample.ui.mvc; +package org.springframework.zero.sample.web.ui.mvc; import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.sample.ui.Message; -import org.springframework.bootstrap.sample.ui.MessageRepository; import org.springframework.stereotype.Controller; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.ModelAttribute; @@ -26,6 +24,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import org.springframework.zero.sample.web.ui.Message; +import org.springframework.zero.sample.web.ui.MessageRepository; /** * @author Rob Winch diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java index 1b0a2a34c0..e9fc358faf 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.ui; +package org.springframework.zero.sample.web.ui; import java.io.IOException; import java.net.URI; @@ -10,7 +10,6 @@ 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; @@ -19,6 +18,7 @@ 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; @@ -28,9 +28,8 @@ import static org.junit.Assert.assertTrue; * Basic integration tests for demo application. * * @author Dave Syer - * */ -public class UiBootstrapApplicationTests { +public class SampleWebUiApplicationTests { private static ConfigurableApplicationContext context; @@ -42,7 +41,7 @@ public class UiBootstrapApplicationTests { @Override public ConfigurableApplicationContext call() throws Exception { return (ConfigurableApplicationContext) SpringApplication - .run(UiBootstrapApplication.class); + .run(SampleWebUiApplication.class); } }); context = future.get(30, TimeUnit.SECONDS); diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties b/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties index a86ad1a298..95c0d6b589 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties @@ -3,4 +3,4 @@ handlers = java.util.logging.ConsoleHandler java.util.logging.ConsoleHandler.level = FINE sun.net.www.protocol.http.HttpURLConnection.level = ALL -org.springframework.bootstrap.context.annotation.level = ALL +org.springframework.zero.context.annotation.level = ALL diff --git a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java similarity index 72% rename from spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java index 6349f11952..07ab3af1e6 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java +++ b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.xml; +package org.springframework.zero.sample.xml; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.bootstrap.CommandLineRunner; -import org.springframework.bootstrap.SpringApplication; -import org.springframework.bootstrap.sample.xml.service.HelloWorldService; +import org.springframework.zero.CommandLineRunner; +import org.springframework.zero.SpringApplication; +import org.springframework.zero.sample.xml.service.HelloWorldService; -public class XmlBootstrapApplication implements CommandLineRunner { +public class SampleSpringXmlApplication implements CommandLineRunner { @Autowired private HelloWorldService helloWorldService; @@ -32,7 +32,7 @@ public class XmlBootstrapApplication implements CommandLineRunner { } public static void main(String[] args) throws Exception { - // TODO: to make this a pure XML example, will need + // TODO: to make this a pure XML example, will need SpringApplication.run("classpath:/META-INF/application-context.xml", args); } } diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java similarity index 93% rename from spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java index cfad0ac596..96bae7d73f 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java +++ b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/service/HelloWorldService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap.sample.tomcat.service; +package org.springframework.zero.sample.xml.service; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml b/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml index 60af614af7..369e079524 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml +++ b/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml @@ -8,7 +8,7 @@ - - + + diff --git a/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java similarity index 78% rename from spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java index 596df4c5cc..64a2e334cb 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java @@ -1,4 +1,4 @@ -package org.springframework.bootstrap.sample.xml; +package org.springframework.zero.sample.xml; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -6,10 +6,11 @@ import java.io.PrintStream; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.zero.sample.xml.SampleSpringXmlApplication; import static org.junit.Assert.assertTrue; -public class XmlBootstrapApplicationTests { +public class SampleSpringXmlApplicationTests { private static PrintStream savedOutput; private static ByteArrayOutputStream output; @@ -32,7 +33,7 @@ public class XmlBootstrapApplicationTests { @Test public void testDefaultSettings() throws Exception { - XmlBootstrapApplication.main(new String[0]); + SampleSpringXmlApplication.main(new String[0]); String output = getOutput(); assertTrue("Wrong output: " + output, output.contains("Hello World")); }