From 40bf33487177a26e578486942218449658c5e715 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 5 Jul 2013 10:26:50 -0700 Subject: [PATCH 01/15] Restructure projects layout --- .gitignore | 2 +- .travis.yml | 5 - pom.xml | 384 +++++++------- spring-bootstrap-samples/pom.xml | 203 ------- .../pom.xml | 106 ---- .../spring-bootstrap-data-sample/pom.xml | 69 --- .../.springBeans | 14 - .../spring-bootstrap-sample/pom.xml | 35 -- .../spring-bootstrap-trad-sample/README.txt | 17 - .../spring-bootstrap-trad-sample/pom.xml | 168 ------ .../main/assembly/jar-with-dependencies.xml | 26 - spring-bootstrap-starters/pom.xml | 192 ------- .../pom.xml | 23 - .../spring-bootstrap-tomcat-starter/pom.xml | 39 -- .../README.md | 0 .../docs/Features.md | 0 .../pom.xml | 45 +- .../bootstrap/actuate/audit/AuditEvent.java | 0 .../actuate/audit/AuditEventRepository.java | 0 .../audit/InMemoryAuditEventRepository.java | 0 .../audit/listener/AuditApplicationEvent.java | 0 .../actuate/audit/listener/AuditListener.java | 0 .../autoconfigure/AuditAutoConfiguration.java | 0 .../EndpointAutoConfiguration.java | 0 .../EndpointWebMvcAutoConfiguration.java | 0 ...dpointWebMvcChildContextConfiguration.java | 0 .../ErrorMvcAutoConfiguration.java | 0 ...mentServerPropertiesAutoConfiguration.java | 0 .../MetricFilterAutoConfiguration.java | 0 .../MetricRepositoryAutoConfiguration.java | 0 .../SecurityAutoConfiguration.java | 0 .../TraceRepositoryAutoConfiguration.java | 0 .../TraceWebFilterAutoConfiguration.java | 0 .../actuate/endpoint/AbstractEndpoint.java | 0 .../actuate/endpoint/ActionEndpoint.java | 0 .../actuate/endpoint/BeansEndpoint.java | 0 .../actuate/endpoint/DumpEndpoint.java | 0 .../bootstrap/actuate/endpoint/Endpoint.java | 0 .../actuate/endpoint/EnvironmentEndpoint.java | 0 .../actuate/endpoint/HealthEndpoint.java | 0 .../actuate/endpoint/InfoEndpoint.java | 0 .../actuate/endpoint/MetricsEndpoint.java | 0 .../actuate/endpoint/PublicMetrics.java | 0 .../actuate/endpoint/ShutdownEndpoint.java | 0 .../actuate/endpoint/TraceEndpoint.java | 0 .../endpoint/VanillaPublicMetrics.java | 0 .../endpoint/mvc/EndpointHandlerAdapter.java | 0 .../endpoint/mvc/EndpointHandlerMapping.java | 0 .../fixme/ManagementServerConfiguration.java | 0 .../actuate/health/HealthIndicator.java | 0 .../health/VanillaHealthIndicator.java | 0 .../actuate/metrics/CounterService.java | 0 .../metrics/DefaultCounterService.java | 0 .../actuate/metrics/DefaultGaugeService.java | 0 .../actuate/metrics/GaugeService.java | 0 .../metrics/InMemoryMetricRepository.java | 0 .../actuate/metrics/Measurement.java | 0 .../bootstrap/actuate/metrics/Metric.java | 0 .../actuate/metrics/MetricRepository.java | 0 .../ManagementServerProperties.java | 0 .../properties/SecurityProperties.java | 0 .../security/AuthenticationAuditListener.java | 0 .../security/AuthorizationAuditListener.java | 0 .../trace/InMemoryTraceRepository.java | 0 .../bootstrap/actuate/trace/Trace.java | 0 .../actuate/trace/TraceRepository.java | 0 .../actuate/trace/WebRequestTraceFilter.java | 0 .../actuate/web/BasicErrorController.java | 0 .../actuate/web/ErrorController.java | 0 .../main/resources/META-INF/spring.factories | 0 .../bootstrap/actuate/TestUtils.java | 0 .../actuate/audit/AuditEventTests.java | 0 .../InMemoryAuditEventRepositoryTests.java | 0 .../audit/listener/AuditListenerTests.java | 0 .../AuditAutoConfigurationTests.java | 0 .../EndpointAutoConfigurationTests.java | 0 .../EndpointWebMvcAutoConfigurationTests.java | 0 ...erverPropertiesAutoConfigurationTests.java | 0 .../MetricFilterAutoConfigurationTests.java | 0 ...etricRepositoryAutoConfigurationTests.java | 0 .../SecurityAutoConfigurationTests.java | 0 ...TraceRepositoryAutoConfigurationTests.java | 0 .../TraceWebFilterAutoConfigurationTest.java | 0 .../endpoint/AbstractEndpointTests.java | 0 .../actuate/endpoint/BeansEndpointTests.java | 0 .../actuate/endpoint/DumpEndpointTests.java | 0 .../endpoint/EnvironmentEndpointTests.java | 0 .../actuate/endpoint/HealthEndpointTests.java | 0 .../actuate/endpoint/InfoEndpointTests.java | 0 .../endpoint/MetricsEndpointTests.java | 0 .../endpoint/ShutdownEndpointTests.java | 0 .../actuate/endpoint/TraceEndpointTests.java | 0 .../endpoint/VanillaPublicMetricsTests.java | 0 .../mvc/EndpointHandlerAdapterTests.java | 0 .../mvc/EndpointHandlerMappingTests.java | 0 .../fixme/ErrorConfigurationTests.java | 0 .../health/VanillaHealthIndicatorTests.java | 0 .../metrics/DefaultCounterServiceTests.java | 0 .../metrics/DefaultGaugeServiceTests.java | 0 .../InMemoryMetricRepositoryTests.java | 0 .../properties/SecurityPropertiesTests.java | 0 .../AuthenticationAuditListenerTests.java | 0 .../AuthorizationAuditListenerTests.java | 0 .../trace/InMemoryTraceRepositoryTests.java | 0 .../trace/WebRequestTraceFilterTests.java | 0 .../src/test/resources/git.properties | 0 .../pom.xml | 107 ++-- .../autoconfigure/AutoConfigurationUtils.java | 0 .../MessageSourceAutoConfiguration.java | 0 .../PropertyPlaceholderAutoConfiguration.java | 0 .../batch/BatchAutoConfiguration.java | 0 .../batch/BatchDatabaseInitializer.java | 0 .../batch/JobExecutionEvent.java | 0 .../batch/JobExecutionExitCodeGenerator.java | 0 .../batch/JobLauncherCommandLineRunner.java | 0 .../JpaRepositoriesAutoConfiguration.java | 0 ...JpaRepositoriesAutoConfigureRegistrar.java | 0 .../jdbc/AbstractDataSourceConfiguration.java | 0 .../jdbc/BasicDataSourceConfiguration.java | 0 .../jdbc/DataSourceAutoConfiguration.java | 0 ...ceTransactionManagerAutoConfiguration.java | 0 .../jdbc/EmbeddedDatabaseConfiguration.java | 0 .../jdbc/TomcatDataSourceConfiguration.java | 0 .../jpa/HibernateJpaAutoConfiguration.java | 0 .../orm/jpa/JpaAutoConfiguration.java | 0 .../thymeleaf/ThymeleafAutoConfiguration.java | 0 ...ddedServletContainerAutoConfiguration.java | 0 .../web/MultipartAutoConfiguration.java | 0 .../ServerPropertiesAutoConfiguration.java | 0 .../web/WebMvcAutoConfiguration.java | 0 .../annotation/AutoConfigurationSorter.java | 0 .../annotation/AutoConfigureAfter.java | 0 .../annotation/ComponentScanDetector.java | 0 .../annotation/EnableAutoConfiguration.java | 0 ...EnableAutoConfigurationImportSelector.java | 0 .../bootstrap/main/Spring.java | 2 + .../main/resources/META-INF/spring.factories | 8 - .../autoconfigure}/AdhocTestSuite.java | 2 +- .../MessageSourceAutoConfigurationTests.java | 0 .../autoconfigure}/SpringJUnitTests.java | 4 +- .../batch/BatchAutoConfigurationTests.java | 0 .../JobExecutionExitCodeGeneratorTests.java | 0 ...JpaRepositoriesAutoConfigurationTests.java | 0 .../data/JpaWebAutoConfigurationTests.java | 0 .../autoconfigure/data/test/City.java | 0 .../data/test/CityRepository.java | 0 .../BasicDataSourceConfigurationTests.java | 0 .../DataSourceAutoConfigurationTests.java | 0 ...nsactionManagerAutoConfigurationTests.java | 0 .../EmbeddedDatabaseConfigurationTests.java | 0 .../TomcatDataSourceConfigurationTests.java | 0 .../HibernateJpaAutoConfigurationTests.java | 0 .../autoconfigure/orm/jpa/test/City.java | 0 .../ThymeleafAutoConfigurationTests.java | 0 ...ervletContainerAutoConfigurationTests.java | 0 .../web/MultipartAutoConfigurationTests.java | 0 .../ServerPropertiesConfigurationTests.java | 0 .../web/WebMvcAutoConfigurationTests.java | 0 .../AutoConfigurationSorterTest.java | 0 .../ComponentScanDetectorConfiguration.java | 0 .../bootstrap/main/SimpleMainTests.java | 0 .../bootstrap/autoconfigure/jdbc/schema.sql | 0 .../bootstrap/context/annotation/foo.xml | 0 .../context/annotation/testProperties.xml | 0 .../context/embedded/conf.properties | 0 ...pleEmbeddedWebApplicationConfiguration.xml | 0 .../bootstrap/sample-beans.xml | 0 .../resources/fixme}/static/css/style.css | 0 .../bootstrap/autoconfigure/jdbc/schema.sql | 4 + .../src/test/resources/templates/layout.html | 0 .../src/test/resources/templates/template.txt | 0 .../src/test/resources/templates/tiles.xml | 0 .../src/test/resources/templates/view.html | 0 .../test/resources/test/messages.properties | 0 .../pom.xml | 67 +-- .../samples/actuator.groovy | 0 .../samples/app.groovy | 0 .../samples/integration.groovy | 0 .../samples/job.groovy | 0 .../samples/runner.groovy | 0 .../samples/runner.xml | 0 .../samples/template.groovy | 0 .../samples/ui.groovy | 0 .../samples/web.groovy | 0 .../src/main/assembly/descriptor.xml | 0 .../bootstrap/cli/BootstrapCliException.java | 0 .../bootstrap/cli/Command.java | 0 .../bootstrap/cli/CommandFactory.java | 0 .../bootstrap/cli/NoSuchCommandException.java | 0 .../bootstrap/cli/SpringBootstrapCli.java | 0 .../cli/command/AbstractCommand.java | 0 .../bootstrap/cli/command/CleanCommand.java | 0 .../bootstrap/cli/command/CreateCommand.java | 0 .../cli/command/DefaultCommandFactory.java | 0 .../bootstrap/cli/command/OptionHandler.java | 0 .../cli/command/OptionParsingCommand.java | 0 .../bootstrap/cli/command/RunCommand.java | 0 .../bootstrap/cli/command/ScriptCommand.java | 0 .../command/ScriptCompilationCustomizer.java | 0 .../bootstrap/cli/command/VersionCommand.java | 0 .../bootstrap/cli/compiler/AstUtils.java | 0 .../compiler/CompilerAutoConfiguration.java | 0 .../cli/compiler/DependencyCustomizer.java | 0 .../compiler/ExtendedGroovyClassLoader.java | 0 .../cli/compiler/GroovyCompiler.java | 0 .../compiler/GroovyCompilerConfiguration.java | 0 .../SpringBatchCompilerAutoConfiguration.java | 0 ...ingBootstrapCompilerAutoConfiguration.java | 4 +- ...gIntegrationCompilerAutoConfiguration.java | 0 .../SpringMvcCompilerAutoConfiguration.java | 0 .../bootstrap/cli/runner/BootstrapRunner.java | 0 .../runner/BootstrapRunnerConfiguration.java | 0 .../cli/template/GroovyTemplate.java | 0 .../src/main/resources/.gitignore | 0 ...ringframework.bootstrap.cli.CommandFactory | 0 ...rap.cli.compiler.CompilerAutoConfiguration | 0 .../src/main/scripts/spring | 0 .../bootstrap/cli/SampleIntegrationTests.java | 0 .../cli/SpringBootstrapCliTests.java | 0 .../cli/command/ScriptCommandTests.java | 0 .../test/resources/commands/closure.groovy | 0 .../test/resources/commands/command.groovy | 0 .../test/resources/commands/handler.groovy | 0 .../src/test/resources/commands/mixin.groovy | 0 .../test/resources/commands/runnable.groovy | 0 .../src/test/resources/commands/script.groovy | 0 .../src/test/resources/commands/test.groovy | 0 .../src/test/resources/css/bootstrap.min.css | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/templates/home.html | 0 .../src/test/resources/templates/test.txt | 0 spring-zero-core/pom.xml | 117 +++++ .../org/springframework/bootstrap/Banner.java | 0 .../bootstrap/BeanDefinitionLoader.java | 0 .../bootstrap/CommandLineRunner.java | 0 .../bootstrap/ExitCodeGenerator.java | 0 .../bootstrap/SpringApplication.java | 0 .../bind/CustomPropertyConstructor.java | 0 .../bootstrap/bind/InetAddressEditor.java | 0 .../bind/PropertiesConfigurationFactory.java | 0 .../bind/PropertySourcesPropertyValues.java | 0 .../bootstrap/bind/RelaxedDataBinder.java | 0 .../bind/YamlConfigurationFactory.java | 0 .../bootstrap/config/JacksonJsonParser.java | 0 .../bootstrap/config/JsonParser.java | 0 .../bootstrap/config/JsonParserFactory.java | 0 .../bootstrap/config/SimpleJsonParser.java | 0 .../bootstrap/config/YamlJsonParser.java | 0 .../bootstrap/config/YamlMapFactoryBean.java | 0 .../bootstrap/config/YamlProcessor.java | 0 .../config/YamlPropertiesFactoryBean.java | 0 .../annotation/AbstractOnBeanCondition.java | 0 .../context/annotation/AssertMissingBean.java | 0 .../AssertMissingBeanCondition.java | 0 .../context/annotation/ConditionLogUtils.java | 0 .../context/annotation/ConditionalOnBean.java | 0 .../annotation/ConditionalOnClass.java | 0 .../annotation/ConditionalOnExpression.java | 0 .../annotation/ConditionalOnMissingBean.java | 0 .../annotation/ConditionalOnMissingClass.java | 0 .../ConditionalOnNotWebApplication.java | 0 .../annotation/ConditionalOnResource.java | 0 .../ConditionalOnWebApplication.java | 0 .../annotation/ConfigurationProperties.java | 0 ...urationPropertiesBindingConfiguration.java | 0 .../EnableConfigurationProperties.java | 0 ...ConfigurationPropertiesImportSelector.java | 0 .../context/annotation/OnBeanCondition.java | 0 .../context/annotation/OnClassCondition.java | 0 .../annotation/OnExpressionCondition.java | 0 .../annotation/OnMissingBeanCondition.java | 0 .../annotation/OnMissingClassCondition.java | 0 .../OnNotWebApplicationCondition.java | 0 .../annotation/OnResourceCondition.java | 0 .../annotation/OnWebApplicationCondition.java | 0 .../PropertySourcesBindingPostProcessor.java | 0 ...stractEmbeddedServletContainerFactory.java | 0 ...onConfigEmbeddedWebApplicationContext.java | 0 ...urableEmbeddedServletContainerFactory.java | 0 .../embedded/EmbeddedServletContainer.java | 0 .../EmbeddedServletContainerCustomizer.java | 0 ...tContainerCustomizerBeanPostProcessor.java | 0 .../EmbeddedServletContainerException.java | 0 .../EmbeddedServletContainerFactory.java | 0 .../EmbeddedWebApplicationContext.java | 0 .../bootstrap/context/embedded/ErrorPage.java | 0 .../embedded/FilterRegistrationBean.java | 0 .../context/embedded/RegistrationBean.java | 0 .../embedded/ServletContextInitializer.java | 0 .../embedded/ServletRegistrationBean.java | 0 ...onContextServletContextAwareProcessor.java | 0 .../XmlEmbeddedWebApplicationContext.java | 0 .../jetty/JettyEmbeddedServletContainer.java | 0 .../JettyEmbeddedServletContainerFactory.java | 0 ...ervletContextInitializerConfiguration.java | 0 .../context/embedded/jetty/package-info.java | 0 .../context/embedded/package-info.java | 0 ...etContextInitializerLifecycleListener.java | 0 .../TomcatEmbeddedServletContainer.java | 0 ...TomcatEmbeddedServletContainerFactory.java | 0 .../TomcatEmbeddedWebappClassLoader.java | 0 .../context/embedded/tomcat/package-info.java | 0 ...nfigFileApplicationContextInitializer.java | 0 ...ontextIdApplicationContextInitializer.java | 0 ...DelegateApplicationContextInitializer.java | 0 .../LoggingApplicationContextInitializer.java | 0 .../VcapApplicationContextInitializer.java | 0 .../logging/JavaLoggerConfigurer.java | 0 .../bootstrap/logging/LogbackConfigurer.java | 0 .../properties/ServerProperties.java | 0 .../web/SpringServletInitializer.java | 0 .../main/resources/META-INF/spring.factories | 7 + .../src/main/resources/favicon.ico | Bin .../bootstrap/logging/log4j.properties | 36 +- .../bootstrap/logging/logback.xml | 0 .../bootstrap/logging/logging.properties | 16 +- .../bootstrap/BeanDefinitionLoaderTests.java | 0 .../bootstrap/SpringApplicationTests.java | 0 .../springframework/bootstrap/TestUtils.java | 0 .../PropertiesConfigurationFactoryTests.java | 0 .../PropertySourcesPropertyValuesTests.java | 0 .../bind/RelaxedDataBinderTests.java | 0 .../bind/YamlConfigurationFactoryTests.java | 0 .../bootstrap/config/JacksonParserTests.java | 0 .../config/SimpleJsonParserTests.java | 0 .../config/YamlMapFactoryBeanTests.java | 0 .../bootstrap/config/YamlParserTests.java | 0 .../YamlPropertiesFactoryBeanTests.java | 0 .../EnableConfigurationPropertiesTests.java | 0 .../NotWebApplicationConditionTests.java | 0 .../annotation/OnBeanConditionTests.java | 0 .../annotation/OnClassConditionTests.java | 0 .../OnExpressionConditionTests.java | 0 .../OnMissingBeanConditionTests.java | 0 .../OnMissingClassConditionTests.java | 0 .../annotation/OnResourceConditionTests.java | 0 .../WebApplicationConditionTests.java | 0 ...tEmbeddedServletContainerFactoryTests.java | 0 ...figEmbeddedWebApplicationContextTests.java | 0 ...edServletContainerMvcIntegrationTests.java | 0 .../EmbeddedWebApplicationContextTests.java | 0 .../context/embedded/ExampleFilter.java | 0 .../context/embedded/ExampleServlet.java | 0 .../embedded/FilterRegistrationBeanTests.java | 0 .../MockEmbeddedServletContainerFactory.java | 0 .../context/embedded/MockFilter.java | 0 .../context/embedded/MockServlet.java | 0 .../ServletRegistrationBeanTests.java | 0 ...XmlEmbeddedWebApplicationContextTests.java | 0 ...leEmbeddedWebApplicationConfiguration.java | 0 ...yEmbeddedServletContainerFactoryTests.java | 0 ...tEmbeddedServletContainerFactoryTests.java | 0 ...ileApplicationContextInitializerTests.java | 0 ...tIdApplicationContextInitializerTests.java | 0 ...gateApplicationContextInitializerTest.java | 0 ...capApplicationContextInitializerTests.java | 0 .../EnableConfigurationPropertiesTests.java | 0 .../logging/JavaLoggerConfigurerTests.java | 0 .../logging/LogbackConfigurerTests.java | 0 .../logging/LoggingInitializerTests.java | 3 +- .../bootstrap/logging/TestFormatter.java | 0 .../properties/ServerPropertiesTests.java | 0 .../bootstrap/sampleconfig/MyComponent.java | 0 .../src/test/resources/application.properties | 0 .../enableprofile-myprofile.properties | 0 .../test/resources/enableprofile.properties | 0 .../src/test/resources/logback-nondefault.xml | 0 .../src/test/resources/logback-test.xml | 0 .../resources/logging-nondefault.properties | 4 +- .../bootstrap/context/annotation/foo.xml | 10 + .../context/annotation/testProperties.xml | 12 + .../context/embedded/conf.properties | 1 + ...pleEmbeddedWebApplicationConfiguration.xml | 11 + .../bootstrap/sample-beans.xml | 9 + .../specificfile-specificprofile.properties | 0 .../resources/specificlocation.properties | 0 .../src/test/resources/testprofiles.yml | 0 .../test/resources/testproperties.properties | 0 .../src/test/resources/testsetprofiles.yml | 0 .../src/test/resources/testyaml.yml | 0 spring-zero-intergration-tests/build.log | 495 ++++++++++++++++++ spring-zero-intergration-tests/pom.xml | 106 ++++ .../src/it/settings.xml | 0 .../pom.xml | 9 +- .../bootstrap/launcher/JarLauncher.java | 0 .../bootstrap/launcher/Launcher.java | 0 .../bootstrap/launcher/MainMethodRunner.java | 0 .../bootstrap/launcher/WarLauncher.java | 0 .../launcher/data/RandomAccessData.java | 0 .../launcher/data/RandomAccessDataFile.java | 0 .../bootstrap/launcher/data/package-info.java | 0 .../launcher/jar/JarEntryFilter.java | 0 .../jar/RandomAccessDataZipEntry.java | 0 .../jar/RandomAccessDataZipInputStream.java | 0 .../launcher/jar/RandomAccessJarFile.java | 0 .../bootstrap/launcher/jar/package-info.java | 0 .../bootstrap/launcher/package-info.java | 0 .../launcher/ByteArrayStartsWith.java | 0 .../data/RandomAccessDataFileTest.java | 0 .../RandomAccessDataZipInputStreamTest.java | 0 .../launcher/jar/RandomAccessJarFileTest.java | 0 .../pom.xml | 155 +++--- .../src/it/executable-jar/pom.xml | 2 +- .../main/java/org/test/SampleApplication.java | 0 .../src/it/executable-jar/verify.groovy | 0 .../src/it/executable-war/pom.xml | 2 +- .../main/java/org/test/SampleApplication.java | 0 .../executable-war/src/main/webapp/index.html | 0 .../src/it/executable-war/verify.groovy | 0 spring-zero-maven-plugin/src/it/settings.xml | 35 ++ .../maven/AbstractExecutableArchiveMojo.java | 2 +- .../bootstrap/maven/ExecutableJarMojo.java | 0 .../bootstrap/maven/ExecutableWarMojo.java | 0 .../bootstrap/maven/MainClassFinder.java | 0 .../PropertiesMergingResourceTransformer.java | 0 .../resources/META-INF/plexus/components.xml | 4 +- .../bootstrap/maven/MainClassFinderTests.java | 0 ...ertiesMergingResourceTransformerTests.java | 10 +- .../bootstrap/maven/Verify.java | 0 .../maven/sample/ClassWithMainMethod.java | 0 .../maven/sample/ClassWithoutMainMethod.java | 0 spring-zero-samples/pom.xml | 29 + .../spring-zero-sample-actuator-ui/pom.xml | 49 ++ .../ui/ActuatorUiBootstrapApplication.java | 0 .../src/main/resources/css/bootstrap.min.css | 0 .../src/main/resources/templates/error.html | 0 .../src/main/resources/templates/home.html | 0 .../ActuatorUiBootstrapApplicationTests.java | 0 ...ementServiceBootstrapApplicationTests.java | 0 .../src/test/resources/logging.properties | 14 +- .../spring-zero-sample-actuator}/pom.xml | 70 ++- .../sample/service/HelloWorldService.java | 0 .../sample/service/SampleController.java | 0 .../service/ServiceBootstrapApplication.java | 0 .../sample/service/ServiceProperties.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/logging.properties | 14 +- ...rtiesServiceBootstrapApplicationTests.java | 0 ...dressServiceBootstrapApplicationTests.java | 0 ...ementServiceBootstrapApplicationTests.java | 0 ...ementServiceBootstrapApplicationTests.java | 0 .../ServiceBootstrapApplicationTests.java | 0 ...tdownServiceBootstrapApplicationTests.java | 0 ...ecureServiceBootstrapApplicationTests.java | 0 .../spring-zero-sample-actuator}/start.groovy | 0 .../spring-zero-sample-batch/pom.xml | 32 ++ .../batch/BatchBootstrapApplication.java | 0 .../batch/BatchBootstrapApplicationTests.java | 0 .../spring-zero-sample-data-jpa}/pom.xml | 34 +- .../sample/data/DataBootstrapApplication.java | 0 .../bootstrap/sample/data/domain/City.java | 0 .../bootstrap/sample/data/domain/Hotel.java | 0 .../sample/data/domain/HotelSummary.java | 0 .../bootstrap/sample/data/domain/Rating.java | 0 .../sample/data/domain/RatingCount.java | 0 .../bootstrap/sample/data/domain/Review.java | 0 .../sample/data/domain/ReviewDetails.java | 0 .../sample/data/domain/TripType.java | 0 .../domain/repository/CityRepository.java | 0 .../domain/repository/HotelRepository.java | 0 .../repository/HotelSummaryRepository.java | 0 .../domain/repository/ReviewRepository.java | 0 .../data/service/CitySearchCriteria.java | 0 .../sample/data/service/CityService.java | 0 .../sample/data/service/HotelService.java | 0 .../sample/data/service/ReviewsSummary.java | 0 .../data/service/impl/CityServiceImpl.java | 0 .../data/service/impl/HotelServiceImpl.java | 0 .../sample/data/web/SampleController.java | 0 .../src/main/resources/application.properties | 0 .../src/main/resources/import.sql | 0 .../data/DataBootstrapApplicationTests.java | 0 .../spring-zero-sample-integration/pom.xml | 32 ++ .../sample/consumer/HelloWorldService.java | 0 .../IntegrationBootstrapApplication.java | 0 .../sample/consumer/SampleEndpoint.java | 0 .../sample/consumer/ServiceProperties.java | 0 .../src/main/resources/application.properties | 0 .../main/resources/integration-context.xml | 0 .../src/main/resources/logback.xml | 0 .../IntegrationBootstrapApplicationTests.java | 0 .../sample/producer/ProducerApplication.java | 0 .../spring-zero-sample-jetty}/pom.xml | 30 +- .../jetty/JettyBootstrapApplication.java | 0 .../jetty/service/HelloWorldService.java | 0 .../sample/jetty/web/SampleController.java | 0 .../jetty/JettyBootstrapApplicationTests.java | 0 .../spring-zero-sample-profile}/pom.xml | 26 +- .../simple/ProfileBootstrapApplication.java | 0 .../simple/service/GoodbyeWorldService.java | 0 .../simple/service/HelloWorldService.java | 0 .../sample/simple/service/MessageService.java | 0 .../src/main/resources/application.yml | 0 .../ProfileBootstrapApplicationTests.java | 0 .../spring-zero-sample-simple}/pom.xml | 26 +- .../simple/SimpleBootstrapApplication.java | 0 .../simple/service/HelloWorldService.java | 0 .../src/main/resources/application.properties | 0 .../SimpleBootstrapApplicationTests.java | 0 .../spring-zero-sample-tomcat}/pom.xml | 37 +- .../tomcat/TomcatBootstrapApplication.java | 0 .../tomcat/service/HelloWorldService.java | 0 .../sample/tomcat/web/SampleController.java | 0 ...onfigurationBootstrapApplicationTests.java | 0 .../TomcatBootstrapApplicationTests.java | 0 .../.gitignore | 0 .../spring-zero-sample-traditional}/pom.xml | 48 +- .../sample/trad/TradBootstrapApplication.java | 0 .../sample/trad/config/WebConfig.java | 0 .../src/main/resources/log4j.properties | 0 .../src/main/webapp/WEB-INF/views/home.jsp | 0 .../src/main/webapp/WEB-INF/web.xml | 0 .../src/main/webapp/index.html | 0 .../trad/TradBootstrapApplicationTests.java | 0 .../src/test/resources/log4j.properties | 0 .../spring-zero-sample-web-ui/pom.xml | 40 ++ .../sample/ui/InMemoryMessageRespository.java | 0 .../bootstrap/sample/ui/Message.java | 0 .../sample/ui/MessageRepository.java | 0 .../sample/ui/UiBootstrapApplication.java | 0 .../sample/ui/mvc/MessageController.java | 0 .../src/main/resources/css/bootstrap.min.css | 0 .../src/main/resources/favicon.ico | Bin .../src/main/resources/js/jquery-1.7.2.js | 0 .../src/main/resources/js/jquery.validate.js | 0 .../src/main/resources/templates/layout.html | 0 .../resources/templates/messages/form.html | 0 .../resources/templates/messages/list.html | 0 .../resources/templates/messages/view.html | 0 .../ui/UiBootstrapApplicationTests.java | 0 .../src/test/resources/logging.properties | 12 +- .../spring-zero-sample-xml}/pom.xml | 26 +- .../sample/xml/XmlBootstrapApplication.java | 0 .../sample/xml/service/HelloWorldService.java | 0 .../META-INF/application-context.xml | 0 .../xml/XmlBootstrapApplicationTests.java | 0 spring-zero-starters/pom.xml | 24 + .../spring-zero-starter-actuator}/pom.xml | 13 +- .../spring-zero-starter-batch}/pom.xml | 19 +- .../spring-zero-starter-data-jpa}/pom.xml | 24 +- .../spring-zero-starter-integration}/pom.xml | 33 +- .../spring-zero-starter-security}/pom.xml | 11 +- .../spring-zero-starter-web}/pom.xml | 22 +- .../spring-zero-starter}/pom.xml | 55 +- 544 files changed, 1712 insertions(+), 1580 deletions(-) delete mode 100644 .travis.yml delete mode 100644 spring-bootstrap-samples/pom.xml delete mode 100644 spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml delete mode 100644 spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml delete mode 100644 spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans delete mode 100644 spring-bootstrap-samples/spring-bootstrap-sample/pom.xml delete mode 100644 spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt delete mode 100644 spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml delete mode 100644 spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml delete mode 100644 spring-bootstrap-starters/pom.xml delete mode 100644 spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml delete mode 100644 spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml rename {spring-bootstrap-actuator => spring-zero-actuator}/README.md (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/docs/Features.md (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/pom.xml (80%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/main/resources/META-INF/spring.factories (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java (100%) rename {spring-bootstrap-actuator => spring-zero-actuator}/src/test/resources/git.properties (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/pom.xml (61%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/java/org/springframework/bootstrap/main/Spring.java (97%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/main/resources/META-INF/spring.factories (66%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure}/AdhocTestSuite.java (95%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java (100%) rename {spring-bootstrap/src/test/java/org/springframework/bootstrap => spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure}/SpringJUnitTests.java (93%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/org/springframework/bootstrap/context/annotation/foo.xml (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/org/springframework/bootstrap/context/annotation/testProperties.xml (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/org/springframework/bootstrap/context/embedded/conf.properties (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/org/springframework/bootstrap/sample-beans.xml (100%) rename {spring-bootstrap/src/test/resources => spring-zero-autoconfigure/src/test/resources/fixme}/static/css/style.css (100%) create mode 100644 spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/resources/templates/layout.html (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/resources/templates/template.txt (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/resources/templates/tiles.xml (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/resources/templates/view.html (100%) rename {spring-bootstrap => spring-zero-autoconfigure}/src/test/resources/test/messages.properties (100%) rename {spring-bootstrap-cli => spring-zero-cli}/pom.xml (70%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/actuator.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/app.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/integration.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/job.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/runner.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/runner.xml (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/template.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/ui.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/samples/web.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/assembly/descriptor.xml (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/Command.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java (98%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/resources/.gitignore (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/main/scripts/spring (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/closure.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/command.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/handler.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/mixin.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/runnable.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/script.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/commands/test.groovy (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/css/bootstrap.min.css (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/log4j.properties (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/templates/home.html (100%) rename {spring-bootstrap-cli => spring-zero-cli}/src/test/resources/templates/test.txt (100%) create mode 100644 spring-zero-core/pom.xml rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/Banner.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/CommandLineRunner.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/SpringApplication.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/JsonParser.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java (100%) rename {spring-bootstrap => spring-zero-core}/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java (100%) create mode 100644 spring-zero-core/src/main/resources/META-INF/spring.factories rename {spring-bootstrap => spring-zero-core}/src/main/resources/favicon.ico (100%) rename {spring-bootstrap => spring-zero-core}/src/main/resources/org/springframework/bootstrap/logging/log4j.properties (97%) rename {spring-bootstrap => spring-zero-core}/src/main/resources/org/springframework/bootstrap/logging/logback.xml (100%) rename {spring-bootstrap => spring-zero-core}/src/main/resources/org/springframework/bootstrap/logging/logging.properties (97%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/TestUtils.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java (99%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/application.properties (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/enableprofile-myprofile.properties (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/enableprofile.properties (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/logback-nondefault.xml (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/logback-test.xml (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/logging-nondefault.properties (98%) create mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml create mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml create mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties create mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml create mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml rename {spring-bootstrap => spring-zero-core}/src/test/resources/specificfile-specificprofile.properties (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/specificlocation.properties (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/testprofiles.yml (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/testproperties.properties (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/testsetprofiles.yml (100%) rename {spring-bootstrap => spring-zero-core}/src/test/resources/testyaml.yml (100%) create mode 100644 spring-zero-intergration-tests/build.log create mode 100644 spring-zero-intergration-tests/pom.xml rename {spring-bootstrap-maven-plugin => spring-zero-intergration-tests}/src/it/settings.xml (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/pom.xml (65%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/Launcher.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/main/java/org/springframework/bootstrap/launcher/package-info.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java (100%) rename {spring-bootstrap-launcher => spring-zero-launcher}/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/pom.xml (83%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-jar/pom.xml (94%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-jar/src/main/java/org/test/SampleApplication.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-jar/verify.groovy (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-war/pom.xml (94%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-war/src/main/java/org/test/SampleApplication.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-war/src/main/webapp/index.html (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/it/executable-war/verify.groovy (100%) create mode 100644 spring-zero-maven-plugin/src/it/settings.xml rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java (99%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java (100%) rename {spring-bootstrap => spring-zero-maven-plugin}/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/main/resources/META-INF/plexus/components.xml (93%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java (100%) rename {spring-bootstrap => spring-zero-maven-plugin}/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java (84%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/test/java/org/springframework/bootstrap/maven/Verify.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java (100%) rename {spring-bootstrap-maven-plugin => spring-zero-maven-plugin}/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java (100%) create mode 100644 spring-zero-samples/pom.xml create mode 100644 spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/main/resources/css/bootstrap.min.css (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/main/resources/templates/error.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/main/resources/templates/home.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample => spring-zero-samples/spring-zero-sample-actuator-ui}/src/test/resources/logging.properties (97%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/pom.xml (77%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/main/resources/application.properties (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/main/resources/logging.properties (97%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-actuator-sample => spring-zero-samples/spring-zero-sample-actuator}/start.groovy (100%) create mode 100644 spring-zero-samples/spring-zero-sample-batch/pom.xml rename {spring-bootstrap-samples/spring-bootstrap-batch-sample => spring-zero-samples/spring-zero-sample-batch}/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-batch-sample => spring-zero-samples/spring-zero-sample-batch}/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-batch-sample => spring-zero-samples/spring-zero-sample-data-jpa}/pom.xml (51%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/Hotel.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/HotelSummary.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/Rating.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/RatingCount.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/Review.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/ReviewDetails.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/TripType.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/CityRepository.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelRepository.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/domain/repository/ReviewRepository.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/service/CitySearchCriteria.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/service/CityService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/service/HotelService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/service/ReviewsSummary.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/service/impl/CityServiceImpl.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/service/impl/HotelServiceImpl.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/java/org/springframework/bootstrap/sample/data/web/SampleController.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/resources/application.properties (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/main/resources/import.sql (100%) rename {spring-bootstrap-samples/spring-bootstrap-data-sample => spring-zero-samples/spring-zero-sample-data-jpa}/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java (100%) create mode 100644 spring-zero-samples/spring-zero-sample-integration/pom.xml rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/resources/application.properties (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/resources/integration-context.xml (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/main/resources/logback.xml (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-samples/spring-zero-sample-integration}/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-jetty-sample => spring-zero-samples/spring-zero-sample-jetty}/pom.xml (67%) rename {spring-bootstrap-samples/spring-bootstrap-jetty-sample => spring-zero-samples/spring-zero-sample-jetty}/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-jetty-sample => spring-zero-samples/spring-zero-sample-jetty}/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-jetty-sample => spring-zero-samples/spring-zero-sample-jetty}/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-jetty-sample => spring-zero-samples/spring-zero-sample-jetty}/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/pom.xml (56%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/src/main/resources/application.yml (100%) rename {spring-bootstrap-samples/spring-bootstrap-profile-sample => spring-zero-samples/spring-zero-sample-profile}/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-xml-sample => spring-zero-samples/spring-zero-sample-simple}/pom.xml (51%) rename {spring-bootstrap-samples/spring-bootstrap-simple-sample => spring-zero-samples/spring-zero-sample-simple}/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-simple-sample => spring-zero-samples/spring-zero-sample-simple}/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-simple-sample => spring-zero-samples/spring-zero-sample-simple}/src/main/resources/application.properties (100%) rename {spring-bootstrap-samples/spring-bootstrap-simple-sample => spring-zero-samples/spring-zero-sample-simple}/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java (100%) rename {spring-bootstrap-starters/spring-bootstrap-web-starter => spring-zero-samples/spring-zero-sample-tomcat}/pom.xml (58%) rename {spring-bootstrap-samples/spring-bootstrap-tomcat-sample => spring-zero-samples/spring-zero-sample-tomcat}/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-tomcat-sample => spring-zero-samples/spring-zero-sample-tomcat}/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-tomcat-sample => spring-zero-samples/spring-zero-sample-tomcat}/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-tomcat-sample => spring-zero-samples/spring-zero-sample-tomcat}/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-tomcat-sample => spring-zero-samples/spring-zero-sample-tomcat}/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/.gitignore (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-traditional}/pom.xml (50%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/main/resources/log4j.properties (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/main/webapp/WEB-INF/views/home.jsp (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/main/webapp/WEB-INF/web.xml (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/main/webapp/index.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-trad-sample => spring-zero-samples/spring-zero-sample-traditional}/src/test/resources/log4j.properties (100%) create mode 100644 spring-zero-samples/spring-zero-sample-web-ui/pom.xml rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/java/org/springframework/bootstrap/sample/ui/Message.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/java/org/springframework/bootstrap/sample/ui/mvc/MessageController.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/css/bootstrap.min.css (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/favicon.ico (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/js/jquery-1.7.2.js (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/js/jquery.validate.js (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/templates/layout.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/templates/messages/form.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/templates/messages/list.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/main/resources/templates/messages/view.html (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-ui-sample => spring-zero-samples/spring-zero-sample-web-ui}/src/test/resources/logging.properties (97%) rename {spring-bootstrap-samples/spring-bootstrap-simple-sample => spring-zero-samples/spring-zero-sample-xml}/pom.xml (51%) rename {spring-bootstrap-samples/spring-bootstrap-xml-sample => spring-zero-samples/spring-zero-sample-xml}/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-xml-sample => spring-zero-samples/spring-zero-sample-xml}/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java (100%) rename {spring-bootstrap-samples/spring-bootstrap-xml-sample => spring-zero-samples/spring-zero-sample-xml}/src/main/resources/META-INF/application-context.xml (100%) rename {spring-bootstrap-samples/spring-bootstrap-xml-sample => spring-zero-samples/spring-zero-sample-xml}/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java (100%) create mode 100644 spring-zero-starters/pom.xml rename {spring-bootstrap-starters/spring-bootstrap-actuator-starter => spring-zero-starters/spring-zero-starter-actuator}/pom.xml (66%) rename {spring-bootstrap-starters/spring-bootstrap-batch-starter => spring-zero-starters/spring-zero-starter-batch}/pom.xml (76%) rename {spring-bootstrap-starters/spring-bootstrap-jpa-starter => spring-zero-starters/spring-zero-starter-data-jpa}/pom.xml (74%) rename {spring-bootstrap-samples/spring-bootstrap-integration-sample => spring-zero-starters/spring-zero-starter-integration}/pom.xml (54%) rename {spring-bootstrap-starters/spring-bootstrap-security-starter => spring-zero-starters/spring-zero-starter-security}/pom.xml (70%) rename {spring-bootstrap-samples/spring-bootstrap-tomcat-sample => spring-zero-starters/spring-zero-starter-web}/pom.xml (70%) rename {spring-bootstrap-starters/spring-bootstrap-starter => spring-zero-starters/spring-zero-starter}/pom.xml (68%) diff --git a/.gitignore b/.gitignore index 5251eb99a9..3116e183be 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,4 @@ build target .springBeans dependency-reduced-pom.xml - +build.log diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d7d0dce8b3..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,5 +0,0 @@ -language: java - -install: mvn -U install --quiet -DskipTests=true -script: mvn clean test - diff --git a/pom.xml b/pom.xml index 452f74d91a..ad61ff648c 100644 --- a/pom.xml +++ b/pom.xml @@ -2,16 +2,18 @@ 4.0.0 - org.springframework.bootstrap - spring-bootstrap-parent + org.springframework.zero + spring-zero 0.5.0.BUILD-SNAPSHOT pom 3.0.0 + ${basedir} 1.6 UTF-8 + 3.0.5 4.0.0.BUILD-SNAPSHOT 3.1.3.RELEASE 1.0.0.CI-SNAPSHOT @@ -21,47 +23,28 @@ 8.1.9.v20130131 1.7.2 - http://github.com/SpringSource/spring-bootstrap scm:git:git://github.com/SpringSource/spring-bootstrap.git scm:git:ssh://git@github.com/SpringSource/spring-bootstrap.git - - dsyer - Dave Syer - dsyer@gopivotal.com - - - phillweb - Phillip Webb - pweb@gopivotal.com + spring + SpringSource + http://www.springsource.org - - - - http://www.springsource.com/download/community - - - spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version} - - - - spring-repo-release - Spring Release Repository - http://repo.springsource.org/libs-release-local - - - spring-repo-snapshot - Spring Snapshot Repository - http://repo.springsource.org/libs-snapshot-local - - - + + spring-zero-actuator + spring-zero-autoconfigure + spring-zero-cli + spring-zero-core + spring-zero-intergration-tests + spring-zero-launcher + spring-zero-maven-plugin + spring-zero-starters + @@ -82,7 +65,6 @@ 2.7 - org.apache.maven.plugins maven-dependency-plugin 2.6 @@ -90,6 +72,10 @@ maven-eclipse-plugin 2.9 + + maven-exec-plugin + 1.2.1 + maven-failsafe-plugin 2.13 @@ -106,6 +92,10 @@ maven-jar-plugin 2.4 + + maven-javadoc-plugin + 2.9 + maven-plugin-plugin 3.2 @@ -118,10 +108,6 @@ maven-shade-plugin 2.0 - - maven-surefire-plugin - 2.13 - maven-site-plugin 3.2 @@ -131,17 +117,18 @@ 2.2.1 - maven-javadoc-plugin - 2.9 - - - maven-exec-plugin - 1.2.1 + maven-surefire-plugin + 2.13 maven-war-plugin 2.3 + + org.codehaus.mojo + versions-maven-plugin + 2.0 + @@ -160,11 +147,11 @@ .settings/org.eclipse.jdt.ui.prefs - http://static.springsource.org/sts/jdtconfig/org.eclipse.jdt.ui.prefs + ${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs .settings/org.eclipse.jdt.core.prefs - http://static.springsource.org/sts/jdtconfig/org.eclipse.jdt.core.prefs + ${main.basedir}/eclipse/org.eclipse.jdt.core.prefs @@ -174,22 +161,17 @@ attach-javadocs - verify jar - - - maven-source-plugin attach-sources - verify jar-no-fork @@ -206,16 +188,11 @@ **/Abstract*.java - junit:junit - - file:/dev/./urandom - org.codehaus.mojo versions-maven-plugin - 2.0 @@ -224,7 +201,7 @@ ch.qos.logback logback-classic - 1.0.7 + 1.0.10 com.fasterxml.jackson.core @@ -286,6 +263,46 @@ ivy 2.3.0 + + org.apache.maven + maven-archiver + 2.5 + + + org.apache.maven + maven-artifact + ${maven.version} + + + org.apache.maven + maven-core + ${maven.version} + + + org.apache.maven + maven-model + ${maven.version} + + + org.apache.maven + maven-plugin-api + ${maven.version} + + + org.apache.maven + maven-settings + ${maven.version} + + + org.apache.maven.plugins + maven-shade-plugin + 1.6 + + + org.apache.maven.plugin-tools + maven-plugin-annotations + 3.2 + org.apache.tomcat.embed tomcat-embed-core @@ -326,6 +343,16 @@ groovy-templates 2.1.3 + + org.codehaus.plexus + plexus-archiver + 2.2 + + + org.codehaus.plexus + plexus-utils + 3.0.10 + org.eclipse.jetty jetty-webapp @@ -352,16 +379,16 @@ jetty-annotations ${jetty.version} - - com.h2database - h2 - 1.3.171 - org.hamcrest hamcrest-library 1.3 + + com.h2database + h2 + 1.3.171 + org.hibernate hibernate-entitymanager @@ -387,40 +414,30 @@ mockito-core 1.9.5 + + org.ow2.asm + asm + 4.0 + org.slf4j jcl-over-slf4j - 1.7.2 + 1.7.5 org.slf4j slf4j-api - 1.7.2 + 1.7.5 org.slf4j slf4j-log4j12 - 1.7.2 + 1.7.5 org.slf4j slf4j-jdk14 - 1.7.2 - - - org.springframework.security - spring-security-javaconfig - ${spring.security.javaconfig.version} - - - org.springframework.security - spring-security-web - ${spring.security.version} - - - org.springframework.security - spring-security-core - ${spring.security.version} + 1.7.5 org.springframework @@ -432,11 +449,6 @@ spring-beans ${spring.version} - - org.springframework - spring-expression - ${spring.version} - org.springframework spring-core @@ -460,17 +472,7 @@ org.springframework - spring-web - ${spring.version} - - - org.springframework - spring-jms - ${spring.version} - - - org.springframework - spring-webmvc + spring-expression ${spring.version} @@ -478,6 +480,11 @@ spring-jdbc ${spring.version} + + org.springframework + spring-jms + ${spring.version} + org.springframework spring-orm @@ -504,16 +511,21 @@ spring-tx ${spring.version} + + org.springframework + spring-web + ${spring.version} + + + org.springframework + spring-webmvc + ${spring.version} + org.springframework.batch spring-batch-core ${spring.batch.version} - - org.springframework.integration - spring-integration-core - ${spring.integration.version} - org.springframework.data spring-data-jpa @@ -530,9 +542,49 @@ - org.springframework.hateoas - spring-hateoas - 0.5.0.RELEASE + org.springframework.integration + spring-integration-core + ${spring.integration.version} + + + org.springframework.integration + spring-integration-file + ${spring.integration.version} + + + org.springframework.integration + spring-integration-http + ${spring.integration.version} + + + org.springframework.integration + spring-integration-ip + ${spring.integration.version} + + + org.springframework.integration + spring-integration-stream + ${spring.integration.version} + + + org.springframework.security + spring-security-core + ${spring.security.version} + + + org.springframework.security + spring-security-javaconfig + ${spring.security.javaconfig.version} + + + org.springframework.security + spring-security-web + ${spring.security.version} + + + org.thymeleaf + thymeleaf + 2.0.16 org.thymeleaf @@ -563,92 +615,27 @@ test - + + http://www.springsource.com/download/community + + spring-docs + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-bootstrap/docs/${project.version} + + + spring-repo-release + Spring Release Repository + http://repo.springsource.org/libs-release-local + + + spring-repo-snapshot + Spring Snapshot Repository + http://repo.springsource.org/libs-snapshot-local + + - setup - - spring-bootstrap-launcher - spring-bootstrap-maven-plugin - - - - default - - true - - - spring-bootstrap - spring-bootstrap-actuator - spring-bootstrap-cli - spring-bootstrap-launcher - spring-bootstrap-maven-plugin - spring-bootstrap-samples - spring-bootstrap-starters - - - - staging - - - spring-site-staging - file:///${java.io.tmpdir}/spring-bootstrap/docs - - - spring-milestone-staging - file:///${java.io.tmpdir}/spring-bootstrap/milestone - - - spring-snapshot-staging - file:///${java.io.tmpdir}/spring-bootstrap/snapshot - - - - - milestone - - - spring-repo-milestone - Spring Milestone Repository - https://repo.springsource.org/libs-milestone-local - - - - - central - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - bootstrap - + + snapshot-repositories true @@ -671,6 +658,21 @@ + + jdk8 + + 1.8 + + + + + maven-javadoc-plugin + + -Xdoclint:none -quiet + + + + + - diff --git a/spring-bootstrap-samples/pom.xml b/spring-bootstrap-samples/pom.xml deleted file mode 100644 index bdd0ce1233..0000000000 --- a/spring-bootstrap-samples/pom.xml +++ /dev/null @@ -1,203 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-parent - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-samples - pom - - spring-bootstrap-sample - spring-bootstrap-actuator-sample - spring-bootstrap-actuator-ui-sample - spring-bootstrap-batch-sample - spring-bootstrap-data-sample - spring-bootstrap-integration-sample - spring-bootstrap-jetty-sample - spring-bootstrap-profile-sample - spring-bootstrap-simple-sample - spring-bootstrap-tomcat-sample - spring-bootstrap-trad-sample - spring-bootstrap-ui-sample - spring-bootstrap-xml-sample - - - - - - org.codehaus.mojo - exec-maven-plugin - - true - ${start-class} - - - - - - - - maven-dependency-plugin - - - unpack - prepare-package - true - - unpack - - - - - ${project.groupId} - spring-bootstrap-launcher - ${project.version} - jar - - - ${project.build.directory}/assembly - - - - copy - prepare-package - true - - copy-dependencies - - - ${project.build.directory}/assembly/lib - runtime - - - - - - - maven-assembly-plugin - - - ${project.parent.basedir}/src/main/assembly/jar-with-dependencies.xml - - - - org.springframework.bootstrap.launcher.JarLauncher - - - ${start-class} - - - - - - jar-with-dependencies - package - true - - single - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - ${project.groupId} - spring-bootstrap - ${project.version} - - - - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - META-INF/spring.handlers - - - META-INF/spring.factories - - - META-INF/spring.schemas - - - - ${start-class} - - - - - - - - - - - - ${project.groupId} - spring-bootstrap-maven-plugin - ${project.version} - true - true - - - - maven-deploy-plugin - - true - - - - - - - - org.springframework - spring-core - ${spring.version} - - - commons-logging - commons-logging - - - - - - - - org.slf4j - jcl-over-slf4j - runtime - - - diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml deleted file mode 100644 index b847540af5..0000000000 --- a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-samples - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-actuator-ui-sample - - / - org.springframework.bootstrap.sample.ui.UiBootstrapApplication - - - - ${project.groupId} - spring-bootstrap - ${project.version} - - - ${project.groupId} - spring-bootstrap-actuator - ${project.version} - - - org.thymeleaf - thymeleaf-spring3 - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - - - org.hibernate - hibernate-validator - - - org.slf4j - slf4j-jdk14 - runtime - - - org.springframework.security - spring-security-javaconfig - - - org.springframework.security - spring-security-web - - - - - - maven-dependency-plugin - - - maven-shade-plugin - - - maven-exec-plugin - - - - - - - org.eclipse.m2e - lifecycle-mapping - 1.0.0 - - - - - - - org.apache.maven.plugins - - - maven-dependency-plugin - - - [2.6,) - - - - copy-dependencies - - - - - - - - - - - - - - - diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml deleted file mode 100644 index 9e50bf22c4..0000000000 --- a/spring-bootstrap-samples/spring-bootstrap-data-sample/pom.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-samples - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-data-sample - executable-jar - - - ${project.groupId} - spring-bootstrap - ${project.version} - - - org.slf4j - slf4j-jdk14 - runtime - - - org.eclipse.jetty - jetty-webapp - runtime - - - org.eclipse.jetty - jetty-util - runtime - - - org.springframework - spring-webmvc - - - javax.servlet - javax.servlet-api - runtime - - - org.springframework - spring-aop - runtime - - - org.springframework - spring-orm - - - org.springframework - spring-jdbc - - - org.hibernate - hibernate-entitymanager - - - org.springframework.data - spring-data-jpa - - - org.hsqldb - hsqldb - runtime - - - diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans b/spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans deleted file mode 100644 index 51f8f5d53e..0000000000 --- a/spring-bootstrap-samples/spring-bootstrap-integration-sample/.springBeans +++ /dev/null @@ -1,14 +0,0 @@ - - - 1 - - - - - - - src/main/resources/integration-context.xml - - - - diff --git a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml deleted file mode 100644 index 61f9f91b64..0000000000 --- a/spring-bootstrap-samples/spring-bootstrap-sample/pom.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-samples - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-sample - pom - - - ${project.groupId} - spring-bootstrap - ${project.version} - runtime - - - org.slf4j - slf4j-jdk14 - runtime - - - org.apache.tomcat.embed - tomcat-embed-core - runtime - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - runtime - - - diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt b/spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt deleted file mode 100644 index ebad46ee04..0000000000 --- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/README.txt +++ /dev/null @@ -1,17 +0,0 @@ -This is a simple template for creating issue reproduction projects per -the README.markdown file in the root of this repository (and at -https://github.com/cbeams/spring-framework-issues#readme). Please read -that document completely before starting. - -As described at the link above, copy this project to a new directory -having the same name as the JIRA issue you're trying to reproduce and -edit from there. - -Both Gradle (build.gradle) and Maven (pom.xml) build scripts are -included for your convenience and choice. Once you've created your -copy of this directory, delete whichever build script you don't wish -to use, and then edit the remaining one to suit your needs. - -Note that this project contains a log4j.properties file in -src/test/resources that you may wish to configure to emit more detailed -logging. The log level for org.springframework is set to WARN by default. diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml b/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml deleted file mode 100644 index ff254ddd49..0000000000 --- a/spring-bootstrap-samples/spring-bootstrap-trad-sample/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-samples - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-trad-sample - spring-bootstrap-trad-sample - war - - - / - org.springframework.bootstrap.sample.trad.TradBootstrapApplication - - - - - - org.springframework - spring-context - - - - commons-logging - commons-logging - - - - - org.springframework - spring-webmvc - - - - - org.slf4j - slf4j-api - - - org.slf4j - jcl-over-slf4j - runtime - - - org.slf4j - slf4j-log4j12 - runtime - - - log4j - log4j - runtime - - - - - ${project.groupId} - spring-bootstrap - ${project.version} - provided - - - org.apache.tomcat.embed - tomcat-embed-core - provided - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - provided - - - org.apache.tomcat.embed - tomcat-embed-jasper - provided - - - - - - - - org.codehaus.mojo - exec-maven-plugin - - true - ${start-class} - - - - ${project.groupId} - spring-bootstrap - ${project.version} - - - org.apache.tomcat.embed - tomcat-embed-core - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - ${tomcat.version} - - - org.apache.tomcat.embed - tomcat-embed-jasper - ${tomcat.version} - - - - - org.apache.maven.plugins - maven-war-plugin - - - - org.springframework.bootstrap.launcher.WarLauncher - - - org.springframework.bootstrap.sample.trad.TradBootstrapApplication - - - false - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unpack - prepare-package - - unpack - - - - - ${project.groupId} - spring-bootstrap-launcher - ${project.version} - jar - - - ${project.build.directory}/${project.artifactId}-${project.version} - - - - copy - prepare-package - - copy-dependencies - - - provided - ${project.build.directory}/${project.artifactId}-${project.version}/WEB-INF/lib-provided - - - - - - - - - diff --git a/spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml b/spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml deleted file mode 100644 index 44626f91aa..0000000000 --- a/spring-bootstrap-samples/src/main/assembly/jar-with-dependencies.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - full - - jar - - false - - - - - ${project.groupId}:${project.artifactId} - - true - - - - - ${project.build.directory}/assembly - / - - - diff --git a/spring-bootstrap-starters/pom.xml b/spring-bootstrap-starters/pom.xml deleted file mode 100644 index 5867cea47f..0000000000 --- a/spring-bootstrap-starters/pom.xml +++ /dev/null @@ -1,192 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-parent - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-starters - pom - - UTF-8 - UTF-8 - 0.5.0.BUILD-SNAPSHOT - org.springframework.bootstrap.main.Spring - - - spring-bootstrap-starter - spring-bootstrap-actuator-starter - spring-bootstrap-batch-starter - spring-bootstrap-integration-starter - spring-bootstrap-jpa-starter - spring-bootstrap-security-starter - spring-bootstrap-tomcat-starter - spring-bootstrap-web-starter - - - - - org.springframework.bootstrap - spring-bootstrap - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-actuator - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-actuator-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-web-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-tomcat-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-jpa-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-batch-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-integration-starter - ${spring.bootstrap.version} - - - org.springframework.bootstrap - spring-bootstrap-security-starter - ${spring.bootstrap.version} - - - - - - org.springframework - spring-test - - - commons-logging - commons-logging - - - test - - - junit - junit - test - - - org.mockito - mockito-core - test - - - org.hamcrest - hamcrest-library - test - - - - - - - org.springframework.bootstrap - spring-bootstrap-maven-plugin - ${spring.bootstrap.version} - true - true - - - - - - - org.codehaus.mojo - exec-maven-plugin - - true - ${start-class} - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - org.springframework.bootstrap - spring-bootstrap - ${spring.bootstrap.version} - - - - true - true - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - package - - shade - - - - - META-INF/spring.handlers - - - META-INF/spring.factories - - - META-INF/spring.schemas - - - - ${start-class} - - - - - - - - - - diff --git a/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml deleted file mode 100644 index ed1f279a4d..0000000000 --- a/spring-bootstrap-starters/spring-bootstrap-integration-starter/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-starters - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-integration-starter - jar - - - ${project.groupId} - spring-bootstrap-starter - ${project.version} - - - org.springframework.integration - spring-integration-core - - - diff --git a/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml b/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml deleted file mode 100644 index 25550156b8..0000000000 --- a/spring-bootstrap-starters/spring-bootstrap-tomcat-starter/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - org.springframework.bootstrap - spring-bootstrap-starters - 0.5.0.BUILD-SNAPSHOT - - spring-bootstrap-tomcat-starter - - - org.springframework.bootstrap - spring-bootstrap-starter - - - org.apache.tomcat.embed - tomcat-embed-core - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - - - org.springframework - spring-webmvc - - - commons-logging - commons-logging - - - - - javax.servlet - javax.servlet-api - - - diff --git a/spring-bootstrap-actuator/README.md b/spring-zero-actuator/README.md similarity index 100% rename from spring-bootstrap-actuator/README.md rename to spring-zero-actuator/README.md diff --git a/spring-bootstrap-actuator/docs/Features.md b/spring-zero-actuator/docs/Features.md similarity index 100% rename from spring-bootstrap-actuator/docs/Features.md rename to spring-zero-actuator/docs/Features.md diff --git a/spring-bootstrap-actuator/pom.xml b/spring-zero-actuator/pom.xml similarity index 80% rename from spring-bootstrap-actuator/pom.xml rename to spring-zero-actuator/pom.xml index 884f836070..528da315bd 100644 --- a/spring-bootstrap-actuator/pom.xml +++ b/spring-zero-actuator/pom.xml @@ -3,21 +3,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-parent + org.springframework.zero + spring-zero 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-actuator + spring-zero-actuator jar + + ${basedir}/.. + + - org.springframework.bootstrap - spring-bootstrap + ${project.groupId} + spring-zero-autoconfigure ${project.version} - org.springframework - spring-webmvc + com.fasterxml.jackson.core + jackson-databind + + + org.hibernate + hibernate-validator org.springframework @@ -25,7 +33,13 @@ org.springframework - spring-expression + spring-context + + + + javax.servlet + javax.servlet-api + true org.springframework @@ -33,17 +47,9 @@ test - javax.servlet - javax.servlet-api - provided - - - org.hibernate - hibernate-validator - - - com.fasterxml.jackson.core - jackson-databind + org.springframework + spring-webmvc + true org.springframework.security @@ -60,6 +66,7 @@ tomcat-embed-core true + org.apache.tomcat.embed tomcat-embed-logging-juli diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEvent.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/AuditEventRepository.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepository.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditApplicationEvent.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/audit/listener/AuditListener.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ErrorMvcAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ActionEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/Endpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/PublicMetrics.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpoint.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetrics.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapter.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMapping.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/fixme/ManagementServerConfiguration.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/HealthIndicator.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicator.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/CounterService.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterService.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeService.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/GaugeService.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepository.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Measurement.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/Metric.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/metrics/MetricRepository.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/ManagementServerProperties.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/properties/SecurityProperties.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListener.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListener.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepository.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/Trace.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/TraceRepository.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/BasicErrorController.java diff --git a/spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java similarity index 100% rename from spring-bootstrap-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java rename to spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/web/ErrorController.java diff --git a/spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories b/spring-zero-actuator/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-bootstrap-actuator/src/main/resources/META-INF/spring.factories rename to spring-zero-actuator/src/main/resources/META-INF/spring.factories diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/TestUtils.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/AuditEventTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/InMemoryAuditEventRepositoryTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/audit/listener/AuditListenerTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/AuditAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/SecurityAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/AbstractEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/BeansEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/DumpEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/EnvironmentEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/HealthEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/InfoEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/MetricsEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/ShutdownEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/TraceEndpointTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/VanillaPublicMetricsTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/endpoint/mvc/EndpointHandlerMappingTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/health/VanillaHealthIndicatorTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultCounterServiceTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/DefaultGaugeServiceTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/metrics/InMemoryMetricRepositoryTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/properties/SecurityPropertiesTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthenticationAuditListenerTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/security/AuthorizationAuditListenerTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/InMemoryTraceRepositoryTests.java diff --git a/spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java similarity index 100% rename from spring-bootstrap-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java rename to spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilterTests.java diff --git a/spring-bootstrap-actuator/src/test/resources/git.properties b/spring-zero-actuator/src/test/resources/git.properties similarity index 100% rename from spring-bootstrap-actuator/src/test/resources/git.properties rename to spring-zero-actuator/src/test/resources/git.properties diff --git a/spring-bootstrap/pom.xml b/spring-zero-autoconfigure/pom.xml similarity index 61% rename from spring-bootstrap/pom.xml rename to spring-zero-autoconfigure/pom.xml index a1a7848fbf..2de900f63b 100644 --- a/spring-bootstrap/pom.xml +++ b/spring-zero-autoconfigure/pom.xml @@ -3,45 +3,31 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-parent + org.springframework.zero + spring-zero 0.5.0.BUILD-SNAPSHOT - spring-bootstrap + spring-zero-autoconfigure jar + + ${basedir}/.. + + - org.springframework - spring-core - - - org.springframework - spring-context + ${project.groupId} + spring-zero-core + ${project.version} - org.hibernate.javax.persistence - hibernate-jpa-2.0-api + commons-dbcp + commons-dbcp true - javax.servlet - javax.servlet-api - true - - - org.hibernate - hibernate-validator - true - - - org.yaml - snakeyaml - true - - - com.fasterxml.jackson.core - jackson-databind + nz.net.ultraq.web.thymeleaf + thymeleaf-layout-dialect true @@ -54,19 +40,19 @@ tomcat-jdbc true - - commons-dbcp - commons-dbcp - true - org.eclipse.jetty jetty-webapp true - org.eclipse.jetty - jetty-util + org.hibernate + hibernate-entitymanager + true + + + org.hibernate.javax.persistence + hibernate-jpa-2.0-api true @@ -94,35 +80,19 @@ spring-webmvc true - - org.springframework.data - spring-data-jpa - true - - - org.springframework.hateoas - spring-hateoas - true - org.springframework.batch spring-batch-core true - org.springframework.integration - spring-integration-core + org.springframework.data + spring-data-jpa true - ch.qos.logback - logback-classic - true - - - org.apache.maven.plugins - maven-shade-plugin - 1.6 + org.thymeleaf + thymeleaf true @@ -130,17 +100,14 @@ thymeleaf-spring3 true - - nz.net.ultraq.web.thymeleaf - thymeleaf-layout-dialect - true - - - org.hibernate - hibernate-entitymanager - true - + + ${project.groupId} + spring-zero-core + ${project.version} + tests + test + org.hsqldb hsqldb @@ -151,15 +118,5 @@ spring-test test - - commons-httpclient - commons-httpclient - test - - - org.apache.tomcat.embed - tomcat-embed-logging-juli - test - diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/AutoConfigurationUtils.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/PropertyPlaceholderAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/BatchDatabaseInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionEvent.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGenerator.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/AbstractDataSourceConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/orm/jpa/JpaAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorter.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/AutoConfigureAfter.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/ComponentScanDetector.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/context/annotation/EnableAutoConfigurationImportSelector.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/main/Spring.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java index 5a1f2bb5a0..9122239abc 100644 --- a/spring-bootstrap/src/main/java/org/springframework/bootstrap/main/Spring.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/main/Spring.java @@ -41,6 +41,8 @@ import org.springframework.util.ClassUtils; @ComponentScan public class Spring { + // FIXME can we delete this? is it used? does it belong here + private static ClassPathScanningCandidateComponentProvider scanner = new ClassPathScanningCandidateComponentProvider( true); diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories similarity index 66% rename from spring-bootstrap/src/main/resources/META-INF/spring.factories rename to spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories index 7836cb266b..117934f292 100644 --- a/spring-bootstrap/src/main/resources/META-INF/spring.factories +++ b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories @@ -12,11 +12,3 @@ org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConf org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration,\ org.springframework.bootstrap.autoconfigure.web.MultipartAutoConfiguration,\ org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration - -# 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 diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/AdhocTestSuite.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/AdhocTestSuite.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java index 76562ed241..fbba0d8234 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/AdhocTestSuite.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/AdhocTestSuite.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.bootstrap.autoconfigure; import org.junit.Ignore; import org.junit.runner.RunWith; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/MessageSourceAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringJUnitTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringJUnitTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java index 4614dd944f..7b2b79b4fe 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringJUnitTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/SpringJUnitTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.bootstrap; +package org.springframework.bootstrap.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.SpringJUnitTests.TestConfiguration; 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; diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/BatchAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/JpaWebAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/City.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/data/test/CityRepository.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test/City.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/MultipartAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/ServerPropertiesConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/web/WebMvcAutoConfigurationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/AutoConfigurationSorterTest.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/context/annotation/ComponentScanDetectorConfiguration.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/main/SimpleMainTests.java diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/foo.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/foo.xml diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/annotation/testProperties.xml diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/conf.properties similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/conf.properties diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml diff --git a/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml b/spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml rename to spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml diff --git a/spring-bootstrap/src/test/resources/static/css/style.css b/spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css similarity index 100% rename from spring-bootstrap/src/test/resources/static/css/style.css rename to spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css 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 new file mode 100644 index 0000000000..38de881057 --- /dev/null +++ b/spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql @@ -0,0 +1,4 @@ +CREATE TABLE FOO ( + id INTEGER IDENTITY PRIMARY KEY, + name VARCHAR(30), +); \ No newline at end of file diff --git a/spring-bootstrap/src/test/resources/templates/layout.html b/spring-zero-autoconfigure/src/test/resources/templates/layout.html similarity index 100% rename from spring-bootstrap/src/test/resources/templates/layout.html rename to spring-zero-autoconfigure/src/test/resources/templates/layout.html diff --git a/spring-bootstrap/src/test/resources/templates/template.txt b/spring-zero-autoconfigure/src/test/resources/templates/template.txt similarity index 100% rename from spring-bootstrap/src/test/resources/templates/template.txt rename to spring-zero-autoconfigure/src/test/resources/templates/template.txt diff --git a/spring-bootstrap/src/test/resources/templates/tiles.xml b/spring-zero-autoconfigure/src/test/resources/templates/tiles.xml similarity index 100% rename from spring-bootstrap/src/test/resources/templates/tiles.xml rename to spring-zero-autoconfigure/src/test/resources/templates/tiles.xml diff --git a/spring-bootstrap/src/test/resources/templates/view.html b/spring-zero-autoconfigure/src/test/resources/templates/view.html similarity index 100% rename from spring-bootstrap/src/test/resources/templates/view.html rename to spring-zero-autoconfigure/src/test/resources/templates/view.html diff --git a/spring-bootstrap/src/test/resources/test/messages.properties b/spring-zero-autoconfigure/src/test/resources/test/messages.properties similarity index 100% rename from spring-bootstrap/src/test/resources/test/messages.properties rename to spring-zero-autoconfigure/src/test/resources/test/messages.properties diff --git a/spring-bootstrap-cli/pom.xml b/spring-zero-cli/pom.xml similarity index 70% rename from spring-bootstrap-cli/pom.xml rename to spring-zero-cli/pom.xml index 6f7b0fc119..8dfb51468d 100644 --- a/spring-bootstrap-cli/pom.xml +++ b/spring-zero-cli/pom.xml @@ -3,28 +3,42 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-parent + org.springframework.zero + spring-zero 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-cli + spring-zero-cli jar + ${basedir}/.. org.springframework.bootstrap.cli.SpringBootstrapCli + + + + net.sf.jopt-simple + jopt-simple + + + org.apache.ivy + ivy + + + org.codehaus.groovy + groovy + + + + org.codehaus.groovy + groovy-templates + true + + maven-shade-plugin - - - ${project.groupId} - spring-bootstrap - ${project.version} - - - true *:* @@ -44,18 +58,6 @@ - - META-INF/spring.handlers - - - META-INF/spring.factories - - - META-INF/spring.schemas - - - - org.codehaus.groovy - groovy - - - org.codehaus.groovy - groovy-templates - true - - - org.apache.ivy - ivy - - - net.sf.jopt-simple - jopt-simple - - diff --git a/spring-bootstrap-cli/samples/actuator.groovy b/spring-zero-cli/samples/actuator.groovy similarity index 100% rename from spring-bootstrap-cli/samples/actuator.groovy rename to spring-zero-cli/samples/actuator.groovy diff --git a/spring-bootstrap-cli/samples/app.groovy b/spring-zero-cli/samples/app.groovy similarity index 100% rename from spring-bootstrap-cli/samples/app.groovy rename to spring-zero-cli/samples/app.groovy diff --git a/spring-bootstrap-cli/samples/integration.groovy b/spring-zero-cli/samples/integration.groovy similarity index 100% rename from spring-bootstrap-cli/samples/integration.groovy rename to spring-zero-cli/samples/integration.groovy diff --git a/spring-bootstrap-cli/samples/job.groovy b/spring-zero-cli/samples/job.groovy similarity index 100% rename from spring-bootstrap-cli/samples/job.groovy rename to spring-zero-cli/samples/job.groovy diff --git a/spring-bootstrap-cli/samples/runner.groovy b/spring-zero-cli/samples/runner.groovy similarity index 100% rename from spring-bootstrap-cli/samples/runner.groovy rename to spring-zero-cli/samples/runner.groovy diff --git a/spring-bootstrap-cli/samples/runner.xml b/spring-zero-cli/samples/runner.xml similarity index 100% rename from spring-bootstrap-cli/samples/runner.xml rename to spring-zero-cli/samples/runner.xml diff --git a/spring-bootstrap-cli/samples/template.groovy b/spring-zero-cli/samples/template.groovy similarity index 100% rename from spring-bootstrap-cli/samples/template.groovy rename to spring-zero-cli/samples/template.groovy diff --git a/spring-bootstrap-cli/samples/ui.groovy b/spring-zero-cli/samples/ui.groovy similarity index 100% rename from spring-bootstrap-cli/samples/ui.groovy rename to spring-zero-cli/samples/ui.groovy diff --git a/spring-bootstrap-cli/samples/web.groovy b/spring-zero-cli/samples/web.groovy similarity index 100% rename from spring-bootstrap-cli/samples/web.groovy rename to spring-zero-cli/samples/web.groovy diff --git a/spring-bootstrap-cli/src/main/assembly/descriptor.xml b/spring-zero-cli/src/main/assembly/descriptor.xml similarity index 100% rename from spring-bootstrap-cli/src/main/assembly/descriptor.xml rename to spring-zero-cli/src/main/assembly/descriptor.xml diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/BootstrapCliException.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/Command.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/Command.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/CommandFactory.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/NoSuchCommandException.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/SpringBootstrapCli.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/AbstractCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CleanCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/CreateCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/DefaultCommandFactory.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionHandler.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/OptionParsingCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/RunCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/ScriptCompilationCustomizer.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/command/VersionCommand.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/CompilerAutoConfiguration.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/DependencyCustomizer.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/ExtendedGroovyClassLoader.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompiler.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/GroovyCompilerConfiguration.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java similarity index 98% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java index 3ddb15c904..d52990b7f7 100644 --- a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java @@ -40,8 +40,8 @@ public class SpringBootstrapCompilerAutoConfiguration extends CompilerAutoConfig public void applyDependencies(DependencyCustomizer dependencies) { dependencies.ifAnyMissingClasses( "org.springframework.bootstrap.SpringApplication").add( - "org.springframework.bootstrap", "spring-bootstrap", - "0.5.0.BUILD-SNAPSHOT"); + "org.springframework.zero", "spring-zero-autoconfigure", + "0.0.1.BUILD-SNAPSHOT"); dependencies.ifAnyResourcesPresent("logback.xml").add("ch.qos.logback", "logback-classic", "1.0.7"); dependencies.ifNotAdded("cg.qos.logback", "logback-classic") diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunner.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/runner/BootstrapRunnerConfiguration.java diff --git a/spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java similarity index 100% rename from spring-bootstrap-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java rename to spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/template/GroovyTemplate.java diff --git a/spring-bootstrap-cli/src/main/resources/.gitignore b/spring-zero-cli/src/main/resources/.gitignore similarity index 100% rename from spring-bootstrap-cli/src/main/resources/.gitignore rename to spring-zero-cli/src/main/resources/.gitignore diff --git a/spring-bootstrap-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 similarity index 100% rename from spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory rename to spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory diff --git a/spring-bootstrap-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 similarity index 100% rename from spring-bootstrap-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration rename to spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration diff --git a/spring-bootstrap-cli/src/main/scripts/spring b/spring-zero-cli/src/main/scripts/spring similarity index 100% rename from spring-bootstrap-cli/src/main/scripts/spring rename to spring-zero-cli/src/main/scripts/spring diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java b/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java similarity index 100% rename from spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java rename to spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SampleIntegrationTests.java diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java b/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java similarity index 100% rename from spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java rename to spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/SpringBootstrapCliTests.java diff --git a/spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java b/spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java similarity index 100% rename from spring-bootstrap-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java rename to spring-zero-cli/src/test/java/org/springframework/bootstrap/cli/command/ScriptCommandTests.java diff --git a/spring-bootstrap-cli/src/test/resources/commands/closure.groovy b/spring-zero-cli/src/test/resources/commands/closure.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/closure.groovy rename to spring-zero-cli/src/test/resources/commands/closure.groovy diff --git a/spring-bootstrap-cli/src/test/resources/commands/command.groovy b/spring-zero-cli/src/test/resources/commands/command.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/command.groovy rename to spring-zero-cli/src/test/resources/commands/command.groovy diff --git a/spring-bootstrap-cli/src/test/resources/commands/handler.groovy b/spring-zero-cli/src/test/resources/commands/handler.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/handler.groovy rename to spring-zero-cli/src/test/resources/commands/handler.groovy diff --git a/spring-bootstrap-cli/src/test/resources/commands/mixin.groovy b/spring-zero-cli/src/test/resources/commands/mixin.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/mixin.groovy rename to spring-zero-cli/src/test/resources/commands/mixin.groovy diff --git a/spring-bootstrap-cli/src/test/resources/commands/runnable.groovy b/spring-zero-cli/src/test/resources/commands/runnable.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/runnable.groovy rename to spring-zero-cli/src/test/resources/commands/runnable.groovy diff --git a/spring-bootstrap-cli/src/test/resources/commands/script.groovy b/spring-zero-cli/src/test/resources/commands/script.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/script.groovy rename to spring-zero-cli/src/test/resources/commands/script.groovy diff --git a/spring-bootstrap-cli/src/test/resources/commands/test.groovy b/spring-zero-cli/src/test/resources/commands/test.groovy similarity index 100% rename from spring-bootstrap-cli/src/test/resources/commands/test.groovy rename to spring-zero-cli/src/test/resources/commands/test.groovy diff --git a/spring-bootstrap-cli/src/test/resources/css/bootstrap.min.css b/spring-zero-cli/src/test/resources/css/bootstrap.min.css similarity index 100% rename from spring-bootstrap-cli/src/test/resources/css/bootstrap.min.css rename to spring-zero-cli/src/test/resources/css/bootstrap.min.css diff --git a/spring-bootstrap-cli/src/test/resources/log4j.properties b/spring-zero-cli/src/test/resources/log4j.properties similarity index 100% rename from spring-bootstrap-cli/src/test/resources/log4j.properties rename to spring-zero-cli/src/test/resources/log4j.properties diff --git a/spring-bootstrap-cli/src/test/resources/templates/home.html b/spring-zero-cli/src/test/resources/templates/home.html similarity index 100% rename from spring-bootstrap-cli/src/test/resources/templates/home.html rename to spring-zero-cli/src/test/resources/templates/home.html diff --git a/spring-bootstrap-cli/src/test/resources/templates/test.txt b/spring-zero-cli/src/test/resources/templates/test.txt similarity index 100% rename from spring-bootstrap-cli/src/test/resources/templates/test.txt rename to spring-zero-cli/src/test/resources/templates/test.txt diff --git a/spring-zero-core/pom.xml b/spring-zero-core/pom.xml new file mode 100644 index 0000000000..0eeb3c4ab6 --- /dev/null +++ b/spring-zero-core/pom.xml @@ -0,0 +1,117 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero + 0.5.0.BUILD-SNAPSHOT + + spring-zero-core + jar + + ${basedir}/.. + + + + + org.springframework + spring-core + + + org.springframework + spring-context + + + + ch.qos.logback + logback-classic + true + + + com.fasterxml.jackson.core + jackson-databind + true + + + javax.servlet + javax.servlet-api + true + + + org.apache.tomcat.embed + tomcat-embed-core + true + + + org.eclipse.jetty + jetty-webapp + true + + + org.eclipse.jetty + jetty-util + true + + + org.hibernate + hibernate-validator + true + + + org.slf4j + slf4j-api + true + + + org.springframework + spring-web + true + + + org.yaml + snakeyaml + true + + + + commons-httpclient + commons-httpclient + test + + + org.apache.tomcat.embed + tomcat-embed-logging-juli + test + + + org.springframework + spring-test + test + + + org.springframework + spring-webmvc + test + + + org.slf4j + jcl-over-slf4j + test + + + + + + maven-jar-plugin + + + + test-jar + + + + + + + diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/Banner.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/CommandLineRunner.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/SpringApplication.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParser.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AbstractOnBeanCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/AssertMissingBeanCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionLogUtils.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnClass.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnExpression.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnMissingClass.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnNotWebApplication.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnResource.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConditionalOnWebApplication.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationProperties.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/ConfigurationPropertiesBindingConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationProperties.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesImportSelector.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnBeanCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnClassCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnExpressionCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingBeanCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnMissingClassCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnNotWebApplicationCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnResourceCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/OnWebApplicationCondition.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/annotation/PropertySourcesBindingPostProcessor.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/properties/ServerProperties.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java rename to spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java diff --git a/spring-zero-core/src/main/resources/META-INF/spring.factories b/spring-zero-core/src/main/resources/META-INF/spring.factories new file mode 100644 index 0000000000..03db1ac821 --- /dev/null +++ b/spring-zero-core/src/main/resources/META-INF/spring.factories @@ -0,0 +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 diff --git a/spring-bootstrap/src/main/resources/favicon.ico b/spring-zero-core/src/main/resources/favicon.ico similarity index 100% rename from spring-bootstrap/src/main/resources/favicon.ico rename to spring-zero-core/src/main/resources/favicon.ico diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties similarity index 97% rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties rename to spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties index 710dcac51b..6442a1edf7 100644 --- a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties +++ b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/log4j.properties @@ -1,18 +1,18 @@ -log4j.rootCategory=INFO, CONSOLE, FILE - -PID=???? -catalina.base=/tmp -LOG_PATH=${catalina.base}/logs -LOG_FILE=${LOG_PATH}/service.log -LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] service%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n - -# CONSOLE is set to be a ConsoleAppender using a PatternLayout. -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN} - -log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.File=${LOG_FILE} -log4j.appender.FILE.MaxFileSize=10MB -log4j.appender.FILE.layout = org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN} +log4j.rootCategory=INFO, CONSOLE, FILE + +PID=???? +catalina.base=/tmp +LOG_PATH=${catalina.base}/logs +LOG_FILE=${LOG_PATH}/service.log +LOG_PATTERN=[%d{yyyy-MM-dd HH:mm:ss.SSS}] service%X{context} - ${PID} %5p [%t] --- %c{1}: %m%n + +# CONSOLE is set to be a ConsoleAppender using a PatternLayout. +log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender +log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout +log4j.appender.CONSOLE.layout.ConversionPattern=${LOG_PATTERN} + +log4j.appender.FILE=org.apache.log4j.RollingFileAppender +log4j.appender.FILE.File=${LOG_FILE} +log4j.appender.FILE.MaxFileSize=10MB +log4j.appender.FILE.layout = org.apache.log4j.PatternLayout +log4j.appender.FILE.layout.ConversionPattern=${LOG_PATTERN} diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logback.xml similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml rename to spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logback.xml diff --git a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties similarity index 97% rename from spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties rename to spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties index 28f690be39..4dc44e89ef 100644 --- a/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties +++ b/spring-zero-core/src/main/resources/org/springframework/bootstrap/logging/logging.properties @@ -1,9 +1,9 @@ -handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler -.level = INFO - -# File Logging -java.util.logging.FileHandler.pattern = %t/service.log -java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter -java.util.logging.FileHandler.level = INFO -java.util.logging.FileHandler.limit = 10485760 +handlers = java.util.logging.FileHandler, java.util.logging.ConsoleHandler +.level = INFO + +# File Logging +java.util.logging.FileHandler.pattern = %t/service.log +java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter +java.util.logging.FileHandler.level = INFO +java.util.logging.FileHandler.limit = 10485760 java.util.logging.FileHandler.count = 10 \ No newline at end of file diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/TestUtils.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlParserTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/EnableConfigurationPropertiesTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/NotWebApplicationConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnBeanConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnClassConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnExpressionConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingBeanConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnMissingClassConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/OnResourceConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/annotation/WebApplicationConditionTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java similarity index 99% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java index 90d475dfb6..e240f3ca37 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/LoggingInitializerTests.java @@ -39,11 +39,12 @@ public class LoggingInitializerTests { private LoggingApplicationContextInitializer initializer = new LoggingApplicationContextInitializer(); private PrintStream savedOutput; + private ByteArrayOutputStream output; @Before public void init() { - this.savedOutput = System.out; + this.savedOutput = System.err; this.output = new ByteArrayOutputStream(); System.setOut(new PrintStream(this.output)); } diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/properties/ServerPropertiesTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java b/spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java similarity index 100% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java rename to spring-zero-core/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java diff --git a/spring-bootstrap/src/test/resources/application.properties b/spring-zero-core/src/test/resources/application.properties similarity index 100% rename from spring-bootstrap/src/test/resources/application.properties rename to spring-zero-core/src/test/resources/application.properties diff --git a/spring-bootstrap/src/test/resources/enableprofile-myprofile.properties b/spring-zero-core/src/test/resources/enableprofile-myprofile.properties similarity index 100% rename from spring-bootstrap/src/test/resources/enableprofile-myprofile.properties rename to spring-zero-core/src/test/resources/enableprofile-myprofile.properties diff --git a/spring-bootstrap/src/test/resources/enableprofile.properties b/spring-zero-core/src/test/resources/enableprofile.properties similarity index 100% rename from spring-bootstrap/src/test/resources/enableprofile.properties rename to spring-zero-core/src/test/resources/enableprofile.properties diff --git a/spring-bootstrap/src/test/resources/logback-nondefault.xml b/spring-zero-core/src/test/resources/logback-nondefault.xml similarity index 100% rename from spring-bootstrap/src/test/resources/logback-nondefault.xml rename to spring-zero-core/src/test/resources/logback-nondefault.xml diff --git a/spring-bootstrap/src/test/resources/logback-test.xml b/spring-zero-core/src/test/resources/logback-test.xml similarity index 100% rename from spring-bootstrap/src/test/resources/logback-test.xml rename to spring-zero-core/src/test/resources/logback-test.xml diff --git a/spring-bootstrap/src/test/resources/logging-nondefault.properties b/spring-zero-core/src/test/resources/logging-nondefault.properties similarity index 98% rename from spring-bootstrap/src/test/resources/logging-nondefault.properties rename to spring-zero-core/src/test/resources/logging-nondefault.properties index ec997fde4d..7aba690145 100644 --- a/spring-bootstrap/src/test/resources/logging-nondefault.properties +++ b/spring-zero-core/src/test/resources/logging-nondefault.properties @@ -1,3 +1,3 @@ -handlers = java.util.logging.ConsoleHandler -.level = INFO +handlers = java.util.logging.ConsoleHandler +.level = INFO java.util.logging.ConsoleHandler.formatter = \ No newline at end of file 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 new file mode 100644 index 0000000000..735b571fc7 --- /dev/null +++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml @@ -0,0 +1,10 @@ + + + + + + + + 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 new file mode 100644 index 0000000000..c04d85080c --- /dev/null +++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml @@ -0,0 +1,12 @@ + + + + + + + + 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 new file mode 100644 index 0000000000..eb99d1fa07 --- /dev/null +++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties @@ -0,0 +1 @@ +port=8081 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/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml new file mode 100644 index 0000000000..c4a4d1737a --- /dev/null +++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml b/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml new file mode 100644 index 0000000000..3658eb1274 --- /dev/null +++ b/spring-zero-core/src/test/resources/org/springframework/bootstrap/sample-beans.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/spring-bootstrap/src/test/resources/specificfile-specificprofile.properties b/spring-zero-core/src/test/resources/specificfile-specificprofile.properties similarity index 100% rename from spring-bootstrap/src/test/resources/specificfile-specificprofile.properties rename to spring-zero-core/src/test/resources/specificfile-specificprofile.properties diff --git a/spring-bootstrap/src/test/resources/specificlocation.properties b/spring-zero-core/src/test/resources/specificlocation.properties similarity index 100% rename from spring-bootstrap/src/test/resources/specificlocation.properties rename to spring-zero-core/src/test/resources/specificlocation.properties diff --git a/spring-bootstrap/src/test/resources/testprofiles.yml b/spring-zero-core/src/test/resources/testprofiles.yml similarity index 100% rename from spring-bootstrap/src/test/resources/testprofiles.yml rename to spring-zero-core/src/test/resources/testprofiles.yml diff --git a/spring-bootstrap/src/test/resources/testproperties.properties b/spring-zero-core/src/test/resources/testproperties.properties similarity index 100% rename from spring-bootstrap/src/test/resources/testproperties.properties rename to spring-zero-core/src/test/resources/testproperties.properties diff --git a/spring-bootstrap/src/test/resources/testsetprofiles.yml b/spring-zero-core/src/test/resources/testsetprofiles.yml similarity index 100% rename from spring-bootstrap/src/test/resources/testsetprofiles.yml rename to spring-zero-core/src/test/resources/testsetprofiles.yml diff --git a/spring-bootstrap/src/test/resources/testyaml.yml b/spring-zero-core/src/test/resources/testyaml.yml similarity index 100% rename from spring-bootstrap/src/test/resources/testyaml.yml rename to spring-zero-core/src/test/resources/testyaml.yml diff --git a/spring-zero-intergration-tests/build.log b/spring-zero-intergration-tests/build.log new file mode 100644 index 0000000000..1ca3e48a12 --- /dev/null +++ b/spring-zero-intergration-tests/build.log @@ -0,0 +1,495 @@ +[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-intergration-tests/pom.xml b/spring-zero-intergration-tests/pom.xml new file mode 100644 index 0000000000..f58ee26e26 --- /dev/null +++ b/spring-zero-intergration-tests/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero + 0.5.0.BUILD-SNAPSHOT + + spring-zero-integration-tests + pom + + ${basedir}/.. + + + + + ${project.groupId} + spring-zero-actuator + ${project.version} + + + ${project.groupId} + spring-zero-autoconfigure + ${project.version} + + + ${project.groupId} + spring-zero-cli + ${project.version} + + + ${project.groupId} + spring-zero-core + ${project.version} + + + ${project.groupId} + spring-zero-launcher + ${project.version} + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + + + ${project.groupId} + spring-zero-starter + ${project.version} + + + ${project.groupId} + spring-zero-starter-actuator + ${project.version} + + + ${project.groupId} + spring-zero-starter-batch + ${project.version} + + + ${project.groupId} + spring-zero-starter-data-jpa + ${project.version} + + + ${project.groupId} + spring-zero-starter-integration + ${project.version} + + + ${project.groupId} + spring-zero-starter-security + ${project.version} + + + ${project.groupId} + spring-zero-starter-web + ${project.version} + + + + + + + maven-invoker-plugin + + src/it/settings.xml + ${project.parent.basedir}/spring-zero-samples/ + ${project.build.directory}/local-repo + + + + integration-test + install + + install + run + + + + + + + diff --git a/spring-bootstrap-maven-plugin/src/it/settings.xml b/spring-zero-intergration-tests/src/it/settings.xml similarity index 100% rename from spring-bootstrap-maven-plugin/src/it/settings.xml rename to spring-zero-intergration-tests/src/it/settings.xml diff --git a/spring-bootstrap-launcher/pom.xml b/spring-zero-launcher/pom.xml similarity index 65% rename from spring-bootstrap-launcher/pom.xml rename to spring-zero-launcher/pom.xml index 95891143ba..10651bba2a 100644 --- a/spring-bootstrap-launcher/pom.xml +++ b/spring-zero-launcher/pom.xml @@ -3,10 +3,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-parent + org.springframework.zero + spring-zero 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-launcher + spring-zero-launcher jar + + ${basedir}/.. + diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/JarLauncher.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/Launcher.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/MainMethodRunner.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/WarLauncher.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessData.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFile.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/data/package-info.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/JarEntryFilter.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipEntry.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStream.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFile.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/jar/package-info.java diff --git a/spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java b/spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java similarity index 100% rename from spring-bootstrap-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java rename to spring-zero-launcher/src/main/java/org/springframework/bootstrap/launcher/package-info.java diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java similarity index 100% rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/ByteArrayStartsWith.java diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java similarity index 100% rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/data/RandomAccessDataFileTest.java diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java similarity index 100% rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessDataZipInputStreamTest.java diff --git a/spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java similarity index 100% rename from spring-bootstrap-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java rename to spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java diff --git a/spring-bootstrap-maven-plugin/pom.xml b/spring-zero-maven-plugin/pom.xml similarity index 83% rename from spring-bootstrap-maven-plugin/pom.xml rename to spring-zero-maven-plugin/pom.xml index 0b8b26b36f..e47d5de482 100644 --- a/spring-bootstrap-maven-plugin/pom.xml +++ b/spring-zero-maven-plugin/pom.xml @@ -3,15 +3,93 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-parent + org.springframework.zero + spring-zero 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-maven-plugin + spring-zero-maven-plugin maven-plugin - 3.0.5 + ${basedir}/.. + + + + org.apache.maven + maven-archiver + + + org.apache.maven + maven-artifact + + + org.apache.maven + maven-core + + + org.apache.maven + maven-model + + + org.apache.maven + maven-plugin-api + + + org.apache.maven + maven-settings + + + org.codehaus.plexus + plexus-archiver + + + org.codehaus.plexus + plexus-container-default + + + org.codehaus.plexus + plexus-component-api + + + + + org.codehaus.plexus + plexus-utils + + + org.ow2.asm + asm + + + + org.apache.maven.plugins + maven-shade-plugin + true + + + asm + asm + + + asm-commons + asm + + + + + + org.apache.maven.plugin-tools + maven-plugin-annotations + provided + + + + ${project.groupId} + spring-zero-launcher + ${project.version} + test + + @@ -69,73 +147,4 @@ - - - org.apache.maven - maven-plugin-api - ${mavenVersion} - - - org.apache.maven - maven-artifact - ${mavenVersion} - - - org.apache.maven - maven-model - ${mavenVersion} - - - org.apache.maven - maven-core - ${mavenVersion} - - - org.apache.maven - maven-settings - ${mavenVersion} - - - org.apache.maven.plugin-tools - maven-plugin-annotations - 3.2 - provided - - - org.apache.maven - maven-archiver - 2.5 - - - org.ow2.asm - asm - 4.0 - - - org.codehaus.plexus - plexus-archiver - 2.2 - - - org.codehaus.plexus - plexus-container-default - - - org.codehaus.plexus - plexus-component-api - - - - - org.codehaus.plexus - plexus-utils - 3.0.10 - - - ${project.groupId} - spring-bootstrap-launcher - ${project.version} - test - - diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar/pom.xml b/spring-zero-maven-plugin/src/it/executable-jar/pom.xml similarity index 94% rename from spring-bootstrap-maven-plugin/src/it/executable-jar/pom.xml rename to spring-zero-maven-plugin/src/it/executable-jar/pom.xml index 4e93230ef8..b3795bc817 100644 --- a/spring-bootstrap-maven-plugin/src/it/executable-jar/pom.xml +++ b/spring-zero-maven-plugin/src/it/executable-jar/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.bootstrap.maven.it + org.springframework.zero.maven.it executable-jar 0.0.1.BUILD-SNAPSHOT executable-jar diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java b/spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java rename to spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java diff --git a/spring-bootstrap-maven-plugin/src/it/executable-jar/verify.groovy b/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy similarity index 100% rename from spring-bootstrap-maven-plugin/src/it/executable-jar/verify.groovy rename to spring-zero-maven-plugin/src/it/executable-jar/verify.groovy diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/pom.xml b/spring-zero-maven-plugin/src/it/executable-war/pom.xml similarity index 94% rename from spring-bootstrap-maven-plugin/src/it/executable-war/pom.xml rename to spring-zero-maven-plugin/src/it/executable-war/pom.xml index 99a9639a92..efc70508cd 100644 --- a/spring-bootstrap-maven-plugin/src/it/executable-war/pom.xml +++ b/spring-zero-maven-plugin/src/it/executable-war/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - org.springframework.bootstrap.maven.it + org.springframework.zero.maven.it executable-war 0.0.1.BUILD-SNAPSHOT executable-war diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java b/spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java rename to spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/src/main/webapp/index.html b/spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html similarity index 100% rename from spring-bootstrap-maven-plugin/src/it/executable-war/src/main/webapp/index.html rename to spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html diff --git a/spring-bootstrap-maven-plugin/src/it/executable-war/verify.groovy b/spring-zero-maven-plugin/src/it/executable-war/verify.groovy similarity index 100% rename from spring-bootstrap-maven-plugin/src/it/executable-war/verify.groovy rename to spring-zero-maven-plugin/src/it/executable-war/verify.groovy diff --git a/spring-zero-maven-plugin/src/it/settings.xml b/spring-zero-maven-plugin/src/it/settings.xml new file mode 100644 index 0000000000..e1e0ace341 --- /dev/null +++ b/spring-zero-maven-plugin/src/it/settings.xml @@ -0,0 +1,35 @@ + + + + + it-repo + + true + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + local.central + @localRepositoryUrl@ + + true + + + true + + + + + + diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java similarity index 99% rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java index 496850790e..2208db57bb 100644 --- a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/AbstractExecutableArchiveMojo.java @@ -289,7 +289,7 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo { String version = getClass().getPackage().getImplementationVersion(); DefaultArtifact artifact = new DefaultArtifact( - "org.springframework.bootstrap:spring-bootstrap-launcher:" + version); + "org.springframework.zero:spring-zero-launcher:" + version); ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest( artifact, repositories, "plugin"); ArtifactDescriptorResult descriptorResult = this.repositorySystem diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableJarMojo.java diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/ExecutableWarMojo.java diff --git a/spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/MainClassFinder.java diff --git a/spring-bootstrap/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java b/spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java similarity index 100% rename from spring-bootstrap/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java rename to spring-zero-maven-plugin/src/main/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformer.java diff --git a/spring-bootstrap-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml similarity index 93% rename from spring-bootstrap-maven-plugin/src/main/resources/META-INF/plexus/components.xml rename to spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml index 8ed12cc6f9..f24d528037 100644 --- a/spring-bootstrap-maven-plugin/src/main/resources/META-INF/plexus/components.xml +++ b/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins:maven-resources-plugin:testResources org.apache.maven.plugins:maven-compiler-plugin:testCompile org.apache.maven.plugins:maven-surefire-plugin:test - org.springframework.bootstrap:spring-bootstrap-maven-plugin:executable-jar + org.springframework.zero:spring-zero-maven-plugin:executable-jar org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy @@ -62,7 +62,7 @@ org.apache.maven.plugins:maven-resources-plugin:testResources org.apache.maven.plugins:maven-compiler-plugin:testCompile org.apache.maven.plugins:maven-surefire-plugin:test - org.springframework.bootstrap:spring-bootstrap-maven-plugin:executable-war + org.springframework.zero:spring-zero-maven-plugin:executable-war org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/MainClassFinderTests.java diff --git a/spring-bootstrap/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java similarity index 84% rename from spring-bootstrap/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java index abbdf82bb1..f72ea7e4ce 100644 --- a/spring-bootstrap/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/PropertiesMergingResourceTransformerTests.java @@ -16,11 +16,11 @@ package org.springframework.bootstrap.maven; +import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.jar.JarOutputStream; import org.junit.Test; -import org.springframework.core.io.ByteArrayResource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -38,16 +38,16 @@ public class PropertiesMergingResourceTransformerTests { public void testProcess() throws Exception { assertFalse(this.transformer.hasTransformedResource()); this.transformer.processResource("foo", - new ByteArrayResource("foo=bar".getBytes()).getInputStream(), null); + new ByteArrayInputStream("foo=bar".getBytes()), null); assertTrue(this.transformer.hasTransformedResource()); } @Test public void testMerge() throws Exception { this.transformer.processResource("foo", - new ByteArrayResource("foo=bar".getBytes()).getInputStream(), null); + new ByteArrayInputStream("foo=bar".getBytes()), null); this.transformer.processResource("bar", - new ByteArrayResource("foo=spam".getBytes()).getInputStream(), null); + new ByteArrayInputStream("foo=spam".getBytes()), null); assertEquals("bar,spam", this.transformer.getData().getProperty("foo")); } @@ -55,7 +55,7 @@ public class PropertiesMergingResourceTransformerTests { public void testOutput() throws Exception { this.transformer.resource = "foo"; this.transformer.processResource("foo", - new ByteArrayResource("foo=bar".getBytes()).getInputStream(), null); + new ByteArrayInputStream("foo=bar".getBytes()), null); ByteArrayOutputStream out = new ByteArrayOutputStream(); JarOutputStream os = new JarOutputStream(out); this.transformer.modifyOutputStream(os); diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/Verify.java diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithMainMethod.java diff --git a/spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java similarity index 100% rename from spring-bootstrap-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java rename to spring-zero-maven-plugin/src/test/java/org/springframework/bootstrap/maven/sample/ClassWithoutMainMethod.java diff --git a/spring-zero-samples/pom.xml b/spring-zero-samples/pom.xml new file mode 100644 index 0000000000..ca7263fd8b --- /dev/null +++ b/spring-zero-samples/pom.xml @@ -0,0 +1,29 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero + 0.5.0.BUILD-SNAPSHOT + + spring-zero-samples + pom + + ${basedir}/.. + + + spring-zero-sample-actuator + spring-zero-sample-actuator-ui + spring-zero-sample-batch + spring-zero-sample-data-jpa + spring-zero-sample-integration + spring-zero-sample-jetty + spring-zero-sample-profile + spring-zero-sample-simple + spring-zero-sample-tomcat + spring-zero-sample-traditional + spring-zero-sample-web-ui + spring-zero-sample-xml + + diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml new file mode 100644 index 0000000000..bfe4f4bf05 --- /dev/null +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml @@ -0,0 +1,49 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero-samples + 0.5.0.BUILD-SNAPSHOT + + spring-zero-sample-actuator-ui + executable-jar + + ${basedir}/../.. + + + + ${project.groupId} + spring-zero-starter-actuator + ${project.version} + + + ${project.groupId} + spring-zero-starter-web + ${project.version} + + + org.springframework.security + spring-security-javaconfig + + + org.springframework.security + spring-security-web + + + org.thymeleaf + thymeleaf-spring3 + + + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/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/bootstrap/sample/ui/ActuatorUiBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/css/bootstrap.min.css b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/css/bootstrap.min.css similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/css/bootstrap.min.css rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/css/bootstrap.min.css diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/error.html b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/error.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/error.html rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/error.html diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/home.html b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/home.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/main/resources/templates/home.html rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/main/resources/templates/home.html diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/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/bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/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/bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/resources/logging.properties b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties similarity index 97% rename from spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/resources/logging.properties rename to spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties index 5fc37e6974..a9c2c37837 100644 --- a/spring-bootstrap-samples/spring-bootstrap-actuator-ui-sample/src/test/resources/logging.properties +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/resources/logging.properties @@ -1,7 +1,7 @@ -handlers = java.util.logging.ConsoleHandler -.level = INFO - -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 +handlers = java.util.logging.ConsoleHandler +.level = INFO + +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 diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml b/spring-zero-samples/spring-zero-sample-actuator/pom.xml similarity index 77% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-actuator/pom.xml index 4c52dca7b6..84d62b3a20 100644 --- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-actuator/pom.xml @@ -3,15 +3,52 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-actuator-sample - jar + spring-zero-sample-actuator + executable-jar - org.springframework.bootstrap.sample.service.ServiceBootstrapApplication + ${basedir}/../.. + + + ${project.groupId} + spring-zero-starter-actuator + ${project.version} + + + com.fasterxml.jackson.core + jackson-databind + + + javax.servlet + javax.servlet-api + + + org.springframework + spring-webmvc + + + org.springframework.security + spring-security-javaconfig + + + org.springframework.security + spring-security-web + + + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + tomcat @@ -86,27 +123,4 @@ - - - ${project.groupId} - spring-bootstrap-actuator - ${project.version} - - - org.springframework.security - spring-security-javaconfig - - - org.springframework.security - spring-security-web - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/SampleController.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java rename to spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/bootstrap/sample/service/ServiceProperties.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/application.properties similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/application.properties rename to spring-zero-samples/spring-zero-sample-actuator/src/main/resources/application.properties diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/logging.properties b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties similarity index 97% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/logging.properties rename to spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties index a494d4cad7..3f4cf00025 100644 --- a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/main/resources/logging.properties +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/resources/logging.properties @@ -1,7 +1,7 @@ -handlers = java.util.logging.ConsoleHandler -.level = INFO - -#java.util.logging.ConsoleHandler.level = FINE -#sun.net.www.protocol.http.HttpURLConnection.level = ALL -#org.springframework.bootstrap.level = ALL -#org.springframework.security.level = ALL +handlers = java.util.logging.ConsoleHandler +.level = INFO + +#java.util.logging.ConsoleHandler.level = FINE +#sun.net.www.protocol.http.HttpURLConnection.level = ALL +#org.springframework.bootstrap.level = ALL +#org.springframework.security.level = ALL diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy b/spring-zero-samples/spring-zero-sample-actuator/start.groovy similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-actuator-sample/start.groovy rename to spring-zero-samples/spring-zero-sample-actuator/start.groovy diff --git a/spring-zero-samples/spring-zero-sample-batch/pom.xml b/spring-zero-samples/spring-zero-sample-batch/pom.xml new file mode 100644 index 0000000000..b8baffbbdf --- /dev/null +++ b/spring-zero-samples/spring-zero-sample-batch/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero-samples + 0.5.0.BUILD-SNAPSHOT + + spring-zero-sample-batch + executable-jar + + ${basedir}/../.. + + + + ${project.groupId} + spring-zero-starter-batch + ${project.version} + + + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-batch-sample/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-batch-sample/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/bootstrap/sample/batch/BatchBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml similarity index 51% rename from spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-data-jpa/pom.xml index 5fe21aa70a..af1f1fe468 100644 --- a/spring-bootstrap-samples/spring-bootstrap-batch-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml @@ -3,34 +3,40 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-batch-sample + spring-zero-sample-data-jpa executable-jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-starter-data-jpa ${project.version} - org.springframework.batch - spring-batch-core - - - org.springframework - spring-jdbc + ${project.groupId} + spring-zero-starter-web + ${project.version} org.hsqldb hsqldb - - - org.slf4j - slf4j-jdk14 runtime + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/DataBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/DataBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain/City.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/Hotel.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/Hotel.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/HotelSummary.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/HotelSummary.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/Rating.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/Rating.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/RatingCount.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/RatingCount.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/Review.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/Review.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/ReviewDetails.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/ReviewDetails.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/TripType.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/TripType.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/CityRepository.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/CityRepository.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/HotelRepository.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/HotelRepository.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/HotelSummaryRepository.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/ReviewRepository.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/domain/repository/ReviewRepository.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/CitySearchCriteria.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/CitySearchCriteria.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/CityService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/CityService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/HotelService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/HotelService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/ReviewsSummary.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/ReviewsSummary.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/impl/CityServiceImpl.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/impl/CityServiceImpl.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/impl/HotelServiceImpl.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/service/impl/HotelServiceImpl.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/web/SampleController.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/web/SampleController.java diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/application.properties rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/import.sql b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/import.sql similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/src/main/resources/import.sql rename to spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/import.sql diff --git a/spring-bootstrap-samples/spring-bootstrap-data-sample/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/bootstrap/sample/data/DataBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-data-sample/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/bootstrap/sample/data/DataBootstrapApplicationTests.java diff --git a/spring-zero-samples/spring-zero-sample-integration/pom.xml b/spring-zero-samples/spring-zero-sample-integration/pom.xml new file mode 100644 index 0000000000..44b43bd46f --- /dev/null +++ b/spring-zero-samples/spring-zero-sample-integration/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero-samples + 0.5.0.BUILD-SNAPSHOT + + spring-zero-sample-integration + executable-jar + + ${basedir}/../.. + + + + org.springframework.zero + spring-zero-starter-integration + ${project.version} + + + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/SampleEndpoint.java diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java rename to spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/bootstrap/sample/consumer/ServiceProperties.java diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-integration/src/main/resources/application.properties similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/application.properties rename to spring-zero-samples/spring-zero-sample-integration/src/main/resources/application.properties diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/integration-context.xml b/spring-zero-samples/spring-zero-sample-integration/src/main/resources/integration-context.xml similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/integration-context.xml rename to spring-zero-samples/spring-zero-sample-integration/src/main/resources/integration-context.xml diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/logback.xml b/spring-zero-samples/spring-zero-sample-integration/src/main/resources/logback.xml similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/main/resources/logback.xml rename to spring-zero-samples/spring-zero-sample-integration/src/main/resources/logback.xml diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java rename to spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/bootstrap/sample/producer/ProducerApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml b/spring-zero-samples/spring-zero-sample-jetty/pom.xml similarity index 67% rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-jetty/pom.xml index 07713f3bd0..eccf6b857e 100644 --- a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-jetty/pom.xml @@ -3,22 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-jetty-sample + spring-zero-sample-jetty executable-jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-starter ${project.version} - org.slf4j - slf4j-jdk14 - runtime + org.springframework + spring-webmvc org.eclipse.jetty @@ -30,14 +32,20 @@ jetty-util runtime - - org.springframework - spring-webmvc - javax.servlet javax.servlet-api runtime + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/service/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/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/bootstrap/sample/jetty/service/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/bootstrap/sample/jetty/web/SampleController.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/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/bootstrap/sample/jetty/web/SampleController.java diff --git a/spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-jetty-sample/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/bootstrap/sample/jetty/JettyBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml b/spring-zero-samples/spring-zero-sample-profile/pom.xml similarity index 56% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-profile/pom.xml index 9ef9724ed5..46b40d65b5 100644 --- a/spring-bootstrap-samples/spring-bootstrap-profile-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-profile/pom.xml @@ -3,27 +3,35 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-profile-sample + spring-zero-sample-profile executable-jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-starter ${project.version} - - org.slf4j - slf4j-jdk14 - runtime - org.yaml snakeyaml runtime + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/GoodbyeWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/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/bootstrap/sample/simple/service/GoodbyeWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/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/bootstrap/sample/simple/service/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/bootstrap/sample/simple/service/MessageService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/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/bootstrap/sample/simple/service/MessageService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/resources/application.yml b/spring-zero-samples/spring-zero-sample-profile/src/main/resources/application.yml similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/main/resources/application.yml rename to spring-zero-samples/spring-zero-sample-profile/src/main/resources/application.yml diff --git a/spring-bootstrap-samples/spring-bootstrap-profile-sample/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-profile-sample/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/bootstrap/sample/simple/ProfileBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml b/spring-zero-samples/spring-zero-sample-simple/pom.xml similarity index 51% rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-simple/pom.xml index 8bf8a520f7..1457432890 100644 --- a/spring-bootstrap-samples/spring-bootstrap-xml-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-simple/pom.xml @@ -3,22 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-xml-sample + spring-zero-sample-simple executable-jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-starter ${project.version} - - org.slf4j - slf4j-jdk14 - runtime - + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple/service/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-simple/src/main/resources/application.properties similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/main/resources/application.properties rename to spring-zero-samples/spring-zero-sample-simple/src/main/resources/application.properties diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/bootstrap/sample/simple/SimpleBootstrapApplicationTests.java diff --git a/spring-bootstrap-starters/spring-bootstrap-web-starter/pom.xml b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml similarity index 58% rename from spring-bootstrap-starters/spring-bootstrap-web-starter/pom.xml rename to spring-zero-samples/spring-zero-sample-tomcat/pom.xml index 93d3ac6e35..04935bf2bc 100644 --- a/spring-bootstrap-starters/spring-bootstrap-web-starter/pom.xml +++ b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml @@ -3,16 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-starters + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-web-starter - jar + spring-zero-sample-tomcat + executable-jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap-starter + spring-zero-starter ${project.version} @@ -26,20 +29,16 @@ org.springframework spring-webmvc - - - commons-logging - commons-logging - - - - - javax.servlet - javax.servlet-api - - - com.fasterxml.jackson.core - jackson-databind + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/service/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/web/SampleController.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/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/bootstrap/sample/tomcat/web/SampleController.java diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/.gitignore b/spring-zero-samples/spring-zero-sample-traditional/.gitignore similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/.gitignore rename to spring-zero-samples/spring-zero-sample-traditional/.gitignore diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/pom.xml b/spring-zero-samples/spring-zero-sample-traditional/pom.xml similarity index 50% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-traditional/pom.xml index 00a471ae06..4095d6612f 100644 --- a/spring-bootstrap-samples/spring-bootstrap-ui-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-traditional/pom.xml @@ -1,64 +1,54 @@ - + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-ui-sample + spring-zero-sample-traditional + executable-war + ${basedir}/../.. / - org.springframework.bootstrap.sample.ui.UiBootstrapApplication + ${project.groupId} - spring-bootstrap + spring-zero-starter ${project.version} org.springframework spring-webmvc - - org.thymeleaf - thymeleaf-spring3 - - - nz.net.ultraq.web.thymeleaf - thymeleaf-layout-dialect - + org.apache.tomcat.embed tomcat-embed-core + provided org.apache.tomcat.embed tomcat-embed-logging-juli + provided - org.hibernate - hibernate-validator - - - org.slf4j - slf4j-jdk14 - runtime + org.apache.tomcat.embed + tomcat-embed-jasper + provided - maven-dependency-plugin - - - maven-shade-plugin - - - maven-exec-plugin + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/config/WebConfig.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/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/bootstrap/sample/trad/config/WebConfig.java diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/resources/log4j.properties b/spring-zero-samples/spring-zero-sample-traditional/src/main/resources/log4j.properties similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/resources/log4j.properties rename to spring-zero-samples/spring-zero-sample-traditional/src/main/resources/log4j.properties diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/views/home.jsp b/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/views/home.jsp rename to spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/views/home.jsp diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/web.xml b/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/WEB-INF/web.xml rename to spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/WEB-INF/web.xml diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/index.html b/spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/index.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/main/webapp/index.html rename to spring-zero-samples/spring-zero-sample-traditional/src/main/webapp/index.html diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/resources/log4j.properties b/spring-zero-samples/spring-zero-sample-traditional/src/test/resources/log4j.properties similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-trad-sample/src/test/resources/log4j.properties rename to spring-zero-samples/spring-zero-sample-traditional/src/test/resources/log4j.properties diff --git a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml new file mode 100644 index 0000000000..a790637251 --- /dev/null +++ b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml @@ -0,0 +1,40 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero-samples + 0.5.0.BUILD-SNAPSHOT + + spring-zero-sample-web-ui + executable-jar + + ${basedir}/../.. + + + + ${project.groupId} + spring-zero-starter-web + ${project.version} + + + org.thymeleaf + thymeleaf-spring3 + + + nz.net.ultraq.web.thymeleaf + thymeleaf-layout-dialect + + + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/InMemoryMessageRespository.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/InMemoryMessageRespository.java diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/Message.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/Message.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/Message.java diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/MessageRepository.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/MessageRepository.java diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/UiBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/mvc/MessageController.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/mvc/MessageController.java diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/css/bootstrap.min.css b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/css/bootstrap.min.css similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/css/bootstrap.min.css rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/css/bootstrap.min.css diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/favicon.ico b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/favicon.ico similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/favicon.ico rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/favicon.ico diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery-1.7.2.js b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery-1.7.2.js similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery-1.7.2.js rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery-1.7.2.js diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery.validate.js b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery.validate.js similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/js/jquery.validate.js rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/js/jquery.validate.js diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/layout.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/layout.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/layout.html rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/layout.html diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/form.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/form.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/form.html rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/form.html diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/list.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/list.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/list.html rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/list.html diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/view.html b/spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/view.html similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/main/resources/templates/messages/view.html rename to spring-zero-samples/spring-zero-sample-web-ui/src/main/resources/templates/messages/view.html diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/bootstrap/sample/ui/UiBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/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/bootstrap/sample/ui/UiBootstrapApplicationTests.java diff --git a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/resources/logging.properties b/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties similarity index 97% rename from spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/resources/logging.properties rename to spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties index 4c989d9a9b..a86ad1a298 100644 --- a/spring-bootstrap-samples/spring-bootstrap-ui-sample/src/test/resources/logging.properties +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/test/resources/logging.properties @@ -1,6 +1,6 @@ -handlers = java.util.logging.ConsoleHandler -.level = INFO - -java.util.logging.ConsoleHandler.level = FINE -sun.net.www.protocol.http.HttpURLConnection.level = ALL -org.springframework.bootstrap.context.annotation.level = ALL +handlers = java.util.logging.ConsoleHandler +.level = INFO + +java.util.logging.ConsoleHandler.level = FINE +sun.net.www.protocol.http.HttpURLConnection.level = ALL +org.springframework.bootstrap.context.annotation.level = ALL diff --git a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml b/spring-zero-samples/spring-zero-sample-xml/pom.xml similarity index 51% rename from spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml rename to spring-zero-samples/spring-zero-sample-xml/pom.xml index b9c5b9ece2..e987c69895 100644 --- a/spring-bootstrap-samples/spring-bootstrap-simple-sample/pom.xml +++ b/spring-zero-samples/spring-zero-sample-xml/pom.xml @@ -3,22 +3,30 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-samples 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-simple-sample + spring-zero-sample-xml executable-jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-starter ${project.version} - - org.slf4j - slf4j-jdk14 - runtime - + + + + ${project.groupId} + spring-zero-maven-plugin + ${project.version} + true + + + diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java rename to spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplication.java diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java rename to spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml/service/HelloWorldService.java diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/resources/META-INF/application-context.xml b/spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/main/resources/META-INF/application-context.xml rename to spring-zero-samples/spring-zero-sample-xml/src/main/resources/META-INF/application-context.xml diff --git a/spring-bootstrap-samples/spring-bootstrap-xml-sample/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java b/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java similarity index 100% rename from spring-bootstrap-samples/spring-bootstrap-xml-sample/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java rename to spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/bootstrap/sample/xml/XmlBootstrapApplicationTests.java diff --git a/spring-zero-starters/pom.xml b/spring-zero-starters/pom.xml new file mode 100644 index 0000000000..e82942c123 --- /dev/null +++ b/spring-zero-starters/pom.xml @@ -0,0 +1,24 @@ + + + 4.0.0 + + org.springframework.zero + spring-zero + 0.5.0.BUILD-SNAPSHOT + + spring-zero-starters + pom + + ${basedir}/.. + + + spring-zero-starter-actuator + spring-zero-starter-batch + spring-zero-starter-integration + spring-zero-starter-data-jpa + spring-zero-starter-security + spring-zero-starter + spring-zero-starter-web + + diff --git a/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml b/spring-zero-starters/spring-zero-starter-actuator/pom.xml similarity index 66% rename from spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml rename to spring-zero-starters/spring-zero-starter-actuator/pom.xml index 47e350e814..0d31c5c529 100644 --- a/spring-bootstrap-starters/spring-bootstrap-actuator-starter/pom.xml +++ b/spring-zero-starters/spring-zero-starter-actuator/pom.xml @@ -3,21 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-starters + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-actuator-starter + spring-zero-starter-actuator jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap-starter + spring-zero-starter ${project.version} ${project.groupId} - spring-bootstrap-actuator + spring-zero-actuator ${project.version} diff --git a/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml b/spring-zero-starters/spring-zero-starter-batch/pom.xml similarity index 76% rename from spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml rename to spring-zero-starters/spring-zero-starter-batch/pom.xml index 1c38bf119e..d5ffc46428 100644 --- a/spring-bootstrap-starters/spring-bootstrap-batch-starter/pom.xml +++ b/spring-zero-starters/spring-zero-starter-batch/pom.xml @@ -3,29 +3,32 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-starters + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-batch-starter + spring-zero-starter-batch jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap-starter + spring-zero-starter ${project.version} - org.springframework.batch - spring-batch-core + org.hsqldb + hsqldb org.springframework spring-jdbc - org.hsqldb - hsqldb + org.springframework.batch + spring-batch-core diff --git a/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml b/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml similarity index 74% rename from spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml rename to spring-zero-starters/spring-zero-starter-data-jpa/pom.xml index 26b1cbdba4..9174bd195f 100644 --- a/spring-bootstrap-starters/spring-bootstrap-jpa-starter/pom.xml +++ b/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml @@ -3,18 +3,25 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-starters + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-jpa-starter + spring-zero-starter-data-jpa jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap-starter + spring-zero-starter ${project.version} + + org.hibernate + hibernate-entitymanager + org.springframework spring-orm @@ -23,18 +30,9 @@ org.springframework spring-jdbc - - org.hibernate - hibernate-entitymanager - org.springframework.data spring-data-jpa - - org.hsqldb - hsqldb - runtime - diff --git a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml b/spring-zero-starters/spring-zero-starter-integration/pom.xml similarity index 54% rename from spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml rename to spring-zero-starters/spring-zero-starter-integration/pom.xml index 3ba4e36455..88dc4b4140 100644 --- a/spring-bootstrap-samples/spring-bootstrap-integration-sample/pom.xml +++ b/spring-zero-starters/spring-zero-starter-integration/pom.xml @@ -3,19 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-integration-sample + spring-zero-starter-integration jar - org.springframework.bootstrap.sample.service.IntegrationBootstrapApplication + ${basedir}/../.. - org.springframework.bootstrap - spring-bootstrap-actuator + ${project.groupId} + spring-zero-starter ${project.version} @@ -25,19 +25,18 @@ org.springframework.integration spring-integration-file - ${spring.integration.version} - ch.qos.logback - logback-classic + org.springframework.integration + spring-integration-http + + + org.springframework.integration + spring-integration-ip + + + org.springframework.integration + spring-integration-stream - - - - org.apache.maven.plugins - maven-shade-plugin - - - diff --git a/spring-bootstrap-starters/spring-bootstrap-security-starter/pom.xml b/spring-zero-starters/spring-zero-starter-security/pom.xml similarity index 70% rename from spring-bootstrap-starters/spring-bootstrap-security-starter/pom.xml rename to spring-zero-starters/spring-zero-starter-security/pom.xml index 34fb7bc0cb..97532d0e2f 100644 --- a/spring-bootstrap-starters/spring-bootstrap-security-starter/pom.xml +++ b/spring-zero-starters/spring-zero-starter-security/pom.xml @@ -3,16 +3,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-starters + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-security-starter + spring-zero-starter-security jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap-starter + spring-zero-starter ${project.version} diff --git a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml b/spring-zero-starters/spring-zero-starter-web/pom.xml similarity index 70% rename from spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml rename to spring-zero-starters/spring-zero-starter-web/pom.xml index cbe9ced5be..c5eaa47897 100644 --- a/spring-bootstrap-samples/spring-bootstrap-tomcat-sample/pom.xml +++ b/spring-zero-starters/spring-zero-starter-web/pom.xml @@ -3,21 +3,24 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-samples + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-tomcat-sample - executable-jar + spring-zero-starter-web + jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-starter ${project.version} - org.springframework - spring-webmvc + javax.servlet + javax.servlet-api org.apache.tomcat.embed @@ -28,9 +31,8 @@ tomcat-embed-logging-juli - org.slf4j - slf4j-jdk14 - runtime + org.springframework + spring-webmvc diff --git a/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml b/spring-zero-starters/spring-zero-starter/pom.xml similarity index 68% rename from spring-bootstrap-starters/spring-bootstrap-starter/pom.xml rename to spring-zero-starters/spring-zero-starter/pom.xml index 13d31e6a94..e418b39597 100644 --- a/spring-bootstrap-starters/spring-bootstrap-starter/pom.xml +++ b/spring-zero-starters/spring-zero-starter/pom.xml @@ -3,18 +3,47 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.bootstrap - spring-bootstrap-starters + org.springframework.zero + spring-zero-starters 0.5.0.BUILD-SNAPSHOT - spring-bootstrap-starter + spring-zero-starter jar + + ${basedir}/../.. + ${project.groupId} - spring-bootstrap + spring-zero-core ${project.version} + + ${project.groupId} + spring-zero-autoconfigure + ${project.version} + + + com.fasterxml.jackson.core + jackson-databind + + + org.hibernate + hibernate-validator + + + org.slf4j + jcl-over-slf4j + + + org.slf4j + slf4j-jdk14 + runtime + + + org.springframework + spring-beans + org.springframework spring-core @@ -25,10 +54,6 @@ - - org.springframework - spring-beans - org.springframework spring-context @@ -37,19 +62,5 @@ org.springframework spring-expression - - org.springframework - spring-aop - true - - - org.slf4j - jcl-over-slf4j - - - org.slf4j - slf4j-jdk14 - runtime - From d039822064b3ed1c16973428fc4b477f8b86048e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 5 Jul 2013 15:49:43 -0700 Subject: [PATCH 02/15] Source formatting and clean-up --- .../actuate/trace/WebRequestTraceFilter.java | 3 +++ .../actuate/fixme/ErrorConfigurationTests.java | 1 - .../batch/JobLauncherCommandLineRunner.java | 1 + .../bootstrap/cli/compiler/AstUtils.java | 3 ++- .../AbstractEmbeddedServletContainerFactory.java | 11 +++++++++-- .../bootstrap/web/SpringServletInitializer.java | 1 + .../launcher/jar/RandomAccessJarFileTest.java | 2 +- .../sample/producer/ProducerApplication.java | 3 ++- ...NonAutoConfigurationBootstrapApplicationTests.java | 4 ++-- 9 files changed, 21 insertions(+), 8 deletions(-) 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/bootstrap/actuate/trace/WebRequestTraceFilter.java index e1c893ce97..2f0ba219f2 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/bootstrap/actuate/trace/WebRequestTraceFilter.java @@ -83,6 +83,7 @@ public class WebRequestTraceFilter implements Filter, Ordered { this.dumpRequests = dumpRequests; } + @Override public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) req; @@ -133,9 +134,11 @@ public class WebRequestTraceFilter implements Filter, Ordered { return trace; } + @Override public void init(FilterConfig filterConfig) throws ServletException { } + @Override public void destroy() { } 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/bootstrap/actuate/fixme/ErrorConfigurationTests.java index 64461112ca..e70fbabc3b 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/bootstrap/actuate/fixme/ErrorConfigurationTests.java @@ -16,7 +16,6 @@ package org.springframework.bootstrap.actuate.fixme; - /** * @author Dave Syer */ 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/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java index 18f2a30d6b..50e31b5e16 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/bootstrap/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -63,6 +63,7 @@ public class JobLauncherCommandLineRunner implements CommandLineRunner, this.publisher = publisher; } + @Override public void run(String... args) throws JobExecutionException { logger.info("Running default command line with: " + Arrays.asList(args)); launchJobFromProperties(StringUtils.splitArrayElementsIntoProperties(args, "=")); diff --git a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java index dc4c626140..b7f1397b99 100644 --- a/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java +++ b/spring-zero-cli/src/main/java/org/springframework/bootstrap/cli/compiler/AstUtils.java @@ -29,7 +29,8 @@ public abstract class AstUtils { /** * Determine if an {@link AnnotatedNode} has one or more of the specified annotations. */ - public static boolean hasAtLeastOneAnnotation(AnnotatedNode node, String... annotations) { + public static boolean hasAtLeastOneAnnotation(AnnotatedNode node, + String... annotations) { for (AnnotationNode annotationNode : node.getAnnotations()) { for (String annotation : annotations) { 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/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java index 228d8c1ce7..a67ad206b8 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -98,6 +98,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * @param contextPath the contextPath to set * @see #getContextPath */ + @Override public void setContextPath(String contextPath) { Assert.notNull(contextPath, "ContextPath must not be null"); if (contextPath.length() > 0) { @@ -117,6 +118,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * Returns the context path for the embedded servlet container. The path will start * with "/" and not end with "/". The root context is represented by an empty string. */ + @Override public String getContextPath() { return this.contextPath; } @@ -127,6 +129,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * * @param port the port to set */ + @Override public void setPort(int port) { if (port < 0 || port > 65535) { throw new IllegalArgumentException("Port must be between 1 and 65535"); @@ -137,6 +140,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements /** * Returns the port that the embedded servlet container should listen on. */ + @Override public int getPort() { return this.port; } @@ -146,6 +150,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * * @param address the address to set (defaults to null) */ + @Override public void setAddress(InetAddress address) { this.address = address; } @@ -153,18 +158,20 @@ public abstract class AbstractEmbeddedServletContainerFactory implements /** * @return the address the embedded container binds to */ + @Override public InetAddress getAddress() { return this.address; } /** * Sets {@link ServletContextInitializer} that should be applied in addition to - * {@link #getEmbeddedServletContainer(ServletContextInitializer...)} parameters. - * This method will replace any previously set or added initializers. + * {@link #getEmbeddedServletContainer(ServletContextInitializer...)} parameters. This + * method will replace any previously set or added initializers. * @param initializers the initializers to set * @see #addInitializers * @see #getInitializers */ + @Override public void setInitializers(List initializers) { Assert.notNull(initializers, "Initializers must not be null"); this.initializers = new ArrayList(initializers); diff --git a/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java index ba7c51d31e..27f7d0fceb 100644 --- a/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java @@ -35,6 +35,7 @@ public abstract class SpringServletInitializer implements WebApplicationInitiali /** Logger available to subclasses. */ protected final Log logger = LogFactory.getLog(getClass()); + @Override public void onStartup(ServletContext servletContext) throws ServletException { WebApplicationContext rootAppContext = this .createRootApplicationContext(servletContext); 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/bootstrap/launcher/jar/RandomAccessJarFileTest.java index 906290dc6e..46efa926c3 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java +++ b/spring-zero-launcher/src/test/java/org/springframework/bootstrap/launcher/jar/RandomAccessJarFileTest.java @@ -52,7 +52,7 @@ import org.springframework.bootstrap.launcher.data.RandomAccessDataFile; /** * Tests for {@link RandomAccessJarFile}. - * + * * @author Phillip Webb */ public class RandomAccessJarFileTest { 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/bootstrap/sample/producer/ProducerApplication.java index c715340e18..ba129c89bb 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/bootstrap/sample/producer/ProducerApplication.java @@ -13,7 +13,8 @@ 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"); + FileOutputStream stream = new FileOutputStream("target/input/data" + + System.currentTimeMillis() + ".txt"); for (String arg : args) { stream.write(arg.getBytes()); } 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/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java index cc01bb3ad5..d13e2ce7fd 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/bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java @@ -38,8 +38,8 @@ public class NonAutoConfigurationBootstrapApplicationTests { private static ConfigurableApplicationContext context; @Configuration - @Import({ EmbeddedServletContainerAutoConfiguration.class, WebMvcAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class }) + @Import({ EmbeddedServletContainerAutoConfiguration.class, + WebMvcAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class }) @ComponentScan(basePackageClasses = { SampleController.class, HelloWorldService.class }) public static class NonAutoConfigurationBootstrapApplication { From 261955c50b8fb44311324d2188bf6e3f92237e0c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 5 Jul 2013 16:44:24 -0700 Subject: [PATCH 03/15] Restructure 'bootstrap' to use 'zero' --- eclipse/eclipse-code-formatter.xml | 2 +- spring-zero-actuator/README.md | 60 +-- spring-zero-actuator/docs/Features.md | 28 +- .../actuate/audit/AuditEvent.java | 2 +- .../actuate/audit/AuditEventRepository.java | 2 +- .../audit/InMemoryAuditEventRepository.java | 2 +- .../audit/listener/AuditApplicationEvent.java | 4 +- .../actuate/audit/listener/AuditListener.java | 6 +- .../autoconfigure/AuditAutoConfiguration.java | 20 +- .../EndpointAutoConfiguration.java | 42 +- .../EndpointWebMvcAutoConfiguration.java | 28 +- ...dpointWebMvcChildContextConfiguration.java | 18 +- .../ErrorMvcAutoConfiguration.java | 18 +- ...mentServerPropertiesAutoConfiguration.java | 18 +- .../MetricFilterAutoConfiguration.java | 14 +- .../MetricRepositoryAutoConfiguration.java | 18 +- .../SecurityAutoConfiguration.java | 26 +- .../TraceRepositoryAutoConfiguration.java | 10 +- .../TraceWebFilterAutoConfiguration.java | 12 +- .../actuate/endpoint/AbstractEndpoint.java | 2 +- .../actuate/endpoint/ActionEndpoint.java | 2 +- .../actuate/endpoint/BeansEndpoint.java | 4 +- .../actuate/endpoint/DumpEndpoint.java | 4 +- .../actuate/endpoint/Endpoint.java | 2 +- .../actuate/endpoint/EnvironmentEndpoint.java | 4 +- .../actuate/endpoint/HealthEndpoint.java | 6 +- .../actuate/endpoint/InfoEndpoint.java | 4 +- .../actuate/endpoint/MetricsEndpoint.java | 6 +- .../actuate/endpoint/PublicMetrics.java | 4 +- .../actuate/endpoint/ShutdownEndpoint.java | 6 +- .../actuate/endpoint/TraceEndpoint.java | 8 +- .../endpoint/VanillaPublicMetrics.java | 6 +- .../endpoint/mvc/EndpointHandlerAdapter.java | 4 +- .../endpoint/mvc/EndpointHandlerMapping.java | 6 +- .../fixme/ManagementServerConfiguration.java | 22 +- .../actuate/health/HealthIndicator.java | 2 +- .../health/VanillaHealthIndicator.java | 2 +- .../actuate/metrics/CounterService.java | 2 +- .../metrics/DefaultCounterService.java | 2 +- .../actuate/metrics/DefaultGaugeService.java | 2 +- .../actuate/metrics/GaugeService.java | 2 +- .../metrics/InMemoryMetricRepository.java | 2 +- .../actuate/metrics/Measurement.java | 2 +- .../actuate/metrics/Metric.java | 2 +- .../actuate/metrics/MetricRepository.java | 2 +- .../ManagementServerProperties.java | 6 +- .../properties/SecurityProperties.java | 4 +- .../security/AuthenticationAuditListener.java | 6 +- .../security/AuthorizationAuditListener.java | 6 +- .../trace/InMemoryTraceRepository.java | 2 +- .../actuate/trace/Trace.java | 2 +- .../actuate/trace/TraceRepository.java | 2 +- .../actuate/trace/WebRequestTraceFilter.java | 2 +- .../actuate/web/BasicErrorController.java | 4 +- .../actuate/web/ErrorController.java | 2 +- .../main/resources/META-INF/spring.factories | 22 +- .../actuate/TestUtils.java | 2 +- .../actuate/audit/AuditEventTests.java | 3 +- .../InMemoryAuditEventRepositoryTests.java | 4 +- .../audit/listener/AuditListenerTests.java | 8 +- .../AuditAutoConfigurationTests.java | 11 +- .../EndpointAutoConfigurationTests.java | 21 +- .../EndpointWebMvcAutoConfigurationTests.java | 22 +- ...erverPropertiesAutoConfigurationTests.java | 5 +- .../MetricFilterAutoConfigurationTests.java | 7 +- ...etricRepositoryAutoConfigurationTests.java | 11 +- .../SecurityAutoConfigurationTests.java | 6 +- ...TraceRepositoryAutoConfigurationTests.java | 7 +- .../TraceWebFilterAutoConfigurationTest.java | 8 +- .../endpoint/AbstractEndpointTests.java | 5 +- .../actuate/endpoint/BeansEndpointTests.java | 5 +- .../actuate/endpoint/DumpEndpointTests.java | 5 +- .../endpoint/EnvironmentEndpointTests.java | 5 +- .../actuate/endpoint/HealthEndpointTests.java | 7 +- .../actuate/endpoint/InfoEndpointTests.java | 5 +- .../endpoint/MetricsEndpointTests.java | 8 +- .../endpoint/ShutdownEndpointTests.java | 7 +- .../actuate/endpoint/TraceEndpointTests.java | 11 +- .../endpoint/VanillaPublicMetricsTests.java | 7 +- .../mvc/EndpointHandlerAdapterTests.java | 5 +- .../mvc/EndpointHandlerMappingTests.java | 7 +- .../fixme/ErrorConfigurationTests.java | 2 +- .../health/VanillaHealthIndicatorTests.java | 3 +- .../metrics/DefaultCounterServiceTests.java | 3 +- .../metrics/DefaultGaugeServiceTests.java | 3 +- .../InMemoryMetricRepositoryTests.java | 3 +- .../properties/SecurityPropertiesTests.java | 6 +- .../AuthenticationAuditListenerTests.java | 3 +- .../AuthorizationAuditListenerTests.java | 3 +- .../trace/InMemoryTraceRepositoryTests.java | 4 +- .../trace/WebRequestTraceFilterTests.java | 4 +- .../autoconfigure/AutoConfigurationUtils.java | 2 +- .../MessageSourceAutoConfiguration.java | 6 +- .../PropertyPlaceholderAutoConfiguration.java | 6 +- .../batch/BatchAutoConfiguration.java | 14 +- .../batch/BatchDatabaseInitializer.java | 2 +- .../batch/JobExecutionEvent.java | 2 +- .../batch/JobExecutionExitCodeGenerator.java | 4 +- .../batch/JobLauncherCommandLineRunner.java | 4 +- .../JpaRepositoriesAutoConfiguration.java | 8 +- ...JpaRepositoriesAutoConfigureRegistrar.java | 4 +- .../jdbc/AbstractDataSourceConfiguration.java | 2 +- .../jdbc/BasicDataSourceConfiguration.java | 2 +- .../jdbc/DataSourceAutoConfiguration.java | 10 +- ...ceTransactionManagerAutoConfiguration.java | 10 +- .../jdbc/EmbeddedDatabaseConfiguration.java | 4 +- .../jdbc/TomcatDataSourceConfiguration.java | 2 +- .../jpa/HibernateJpaAutoConfiguration.java | 6 +- .../orm/jpa/JpaAutoConfiguration.java | 12 +- .../thymeleaf/ThymeleafAutoConfiguration.java | 14 +- ...ddedServletContainerAutoConfiguration.java | 20 +- .../web/MultipartAutoConfiguration.java | 10 +- .../ServerPropertiesAutoConfiguration.java | 20 +- .../web/WebMvcAutoConfiguration.java | 16 +- .../annotation/AutoConfigurationSorter.java | 2 +- .../annotation/AutoConfigureAfter.java | 2 +- .../annotation/ComponentScanDetector.java | 4 +- .../annotation/EnableAutoConfiguration.java | 9 +- ...EnableAutoConfigurationImportSelector.java | 2 +- .../{bootstrap => zero}/main/Spring.java | 6 +- .../main/resources/META-INF/spring.factories | 26 +- .../autoconfigure/AdhocTestSuite.java | 6 +- .../MessageSourceAutoConfigurationTests.java | 4 +- .../autoconfigure/SpringJUnitTests.java | 8 +- .../batch/BatchAutoConfigurationTests.java | 8 +- .../JobExecutionExitCodeGeneratorTests.java | 4 +- ...JpaRepositoriesAutoConfigurationTests.java | 15 +- .../data/JpaWebAutoConfigurationTests.java | 13 +- .../zero/autoconfigure/data/test}/City.java | 2 +- .../data/test/CityRepository.java | 2 +- .../BasicDataSourceConfigurationTests.java | 3 +- .../DataSourceAutoConfigurationTests.java | 5 +- ...nsactionManagerAutoConfigurationTests.java | 4 +- .../EmbeddedDatabaseConfigurationTests.java | 3 +- .../TomcatDataSourceConfigurationTests.java | 6 +- .../HibernateJpaAutoConfigurationTests.java | 13 +- .../autoconfigure/orm/jpa}/test/City.java | 2 +- .../ThymeleafAutoConfigurationTests.java | 5 +- ...ervletContainerAutoConfigurationTests.java | 15 +- .../web/MultipartAutoConfigurationTests.java | 10 +- .../ServerPropertiesConfigurationTests.java | 19 +- .../web/WebMvcAutoConfigurationTests.java | 3 +- .../AutoConfigurationSorterTest.java | 4 +- .../ComponentScanDetectorConfiguration.java | 3 +- .../main/SimpleMainTests.java | 5 +- ...pleEmbeddedWebApplicationConfiguration.xml | 11 - .../bootstrap/sample-beans.xml | 9 - .../test/resources/fixme/static/css/style.css | 1 - .../bootstrap/autoconfigure/jdbc/schema.sql | 4 - .../zero}/autoconfigure/jdbc/schema.sql | 0 spring-zero-cli/pom.xml | 2 +- spring-zero-cli/samples/actuator.groovy | 2 +- spring-zero-cli/samples/template.groovy | 2 +- .../src/main/assembly/descriptor.xml | 2 +- .../{bootstrap => zero}/cli/Command.java | 2 +- .../cli/CommandFactory.java | 2 +- .../cli/NoSuchCommandException.java | 6 +- .../cli/SpringZeroCli.java} | 40 +- .../cli/SpringZeroCliException.java} | 22 +- .../cli/command/AbstractCommand.java | 4 +- .../cli/command/CleanCommand.java | 12 +- .../cli/command/CreateCommand.java | 4 +- .../cli/command/DefaultCommandFactory.java | 6 +- .../cli/command/OptionHandler.java | 2 +- .../cli/command/OptionParsingCommand.java | 4 +- .../cli/command/RunCommand.java | 24 +- .../cli/command/ScriptCommand.java | 8 +- .../command/ScriptCompilationCustomizer.java | 4 +- .../cli/command/VersionCommand.java | 4 +- .../cli/compiler/AstUtils.java | 2 +- .../compiler/CompilerAutoConfiguration.java | 2 +- .../cli/compiler/DependencyCustomizer.java | 2 +- .../compiler/ExtendedGroovyClassLoader.java | 2 +- .../cli/compiler/GroovyCompiler.java | 10 +- .../compiler/GroovyCompilerConfiguration.java | 2 +- .../SpringBatchCompilerAutoConfiguration.java | 8 +- ...gIntegrationCompilerAutoConfiguration.java | 8 +- .../SpringMvcCompilerAutoConfiguration.java | 12 +- .../SpringZeroCompilerAutoConfiguration.java} | 25 +- .../cli/runner/SpringZeroRunner.java} | 20 +- .../SpringZeroRunnerConfiguration.java} | 8 +- .../cli/template/GroovyTemplate.java | 2 +- ...ringframework.bootstrap.cli.CommandFactory | 1 - ...rap.cli.compiler.CompilerAutoConfiguration | 5 - ...rg.springframework.zero.cli.CommandFactory | 1 + ...ero.cli.compiler.CompilerAutoConfiguration | 5 + .../cli/SampleIntegrationTests.java | 6 +- .../cli/SpringZeroCliTests.java} | 23 +- .../cli/command/ScriptCommandTests.java | 4 +- .../test/resources/commands/closure.groovy | 4 +- .../test/resources/commands/command.groovy | 6 +- .../test/resources/commands/handler.groovy | 2 +- .../src/test/resources/commands/mixin.groovy | 2 +- .../test/resources/commands/runnable.groovy | 4 +- .../src/test/resources/commands/test.groovy | 2 +- .../src/test/resources/log4j.properties | 2 +- .../{bootstrap => zero}/Banner.java | 4 +- .../BeanDefinitionLoader.java | 2 +- .../CommandLineRunner.java | 2 +- .../ExitCodeGenerator.java | 2 +- .../SpringApplication.java | 4 +- .../bind/CustomPropertyConstructor.java | 2 +- .../bind/InetAddressEditor.java | 2 +- .../bind/PropertiesConfigurationFactory.java | 2 +- .../bind/PropertySourcesPropertyValues.java | 2 +- .../bind/RelaxedDataBinder.java | 2 +- .../bind/YamlConfigurationFactory.java | 2 +- .../config/JacksonJsonParser.java | 2 +- .../config/JsonParser.java | 2 +- .../config/JsonParserFactory.java | 2 +- .../config/SimpleJsonParser.java | 2 +- .../config/YamlJsonParser.java | 2 +- .../config/YamlMapFactoryBean.java | 2 +- .../config/YamlProcessor.java | 2 +- .../config/YamlPropertiesFactoryBean.java | 2 +- .../annotation/AbstractOnBeanCondition.java | 2 +- .../context/annotation/AssertMissingBean.java | 2 +- .../AssertMissingBeanCondition.java | 2 +- .../context/annotation/ConditionLogUtils.java | 2 +- .../context/annotation/ConditionalOnBean.java | 2 +- .../annotation/ConditionalOnClass.java | 2 +- .../annotation/ConditionalOnExpression.java | 2 +- .../annotation/ConditionalOnMissingBean.java | 2 +- .../annotation/ConditionalOnMissingClass.java | 2 +- .../ConditionalOnNotWebApplication.java | 2 +- .../annotation/ConditionalOnResource.java | 2 +- .../ConditionalOnWebApplication.java | 2 +- .../annotation/ConfigurationProperties.java | 2 +- ...urationPropertiesBindingConfiguration.java | 2 +- .../EnableConfigurationProperties.java | 2 +- ...ConfigurationPropertiesImportSelector.java | 2 +- .../context/annotation/OnBeanCondition.java | 2 +- .../context/annotation/OnClassCondition.java | 2 +- .../annotation/OnExpressionCondition.java | 2 +- .../annotation/OnMissingBeanCondition.java | 2 +- .../annotation/OnMissingClassCondition.java | 2 +- .../OnNotWebApplicationCondition.java | 2 +- .../annotation/OnResourceCondition.java | 2 +- .../annotation/OnWebApplicationCondition.java | 2 +- .../PropertySourcesBindingPostProcessor.java | 6 +- ...stractEmbeddedServletContainerFactory.java | 2 +- ...onConfigEmbeddedWebApplicationContext.java | 2 +- ...urableEmbeddedServletContainerFactory.java | 2 +- .../embedded/EmbeddedServletContainer.java | 2 +- .../EmbeddedServletContainerCustomizer.java | 2 +- ...tContainerCustomizerBeanPostProcessor.java | 2 +- .../EmbeddedServletContainerException.java | 2 +- .../EmbeddedServletContainerFactory.java | 6 +- .../EmbeddedWebApplicationContext.java | 2 +- .../context/embedded/ErrorPage.java | 2 +- .../embedded/FilterRegistrationBean.java | 2 +- .../context/embedded/RegistrationBean.java | 2 +- .../embedded/ServletContextInitializer.java | 2 +- .../embedded/ServletRegistrationBean.java | 2 +- ...onContextServletContextAwareProcessor.java | 2 +- .../XmlEmbeddedWebApplicationContext.java | 2 +- .../jetty/JettyEmbeddedServletContainer.java | 6 +- .../JettyEmbeddedServletContainerFactory.java | 12 +- ...ervletContextInitializerConfiguration.java | 4 +- .../context/embedded/jetty/package-info.java | 4 +- .../context/embedded/package-info.java | 6 +- ...etContextInitializerLifecycleListener.java | 4 +- .../TomcatEmbeddedServletContainer.java | 6 +- ...TomcatEmbeddedServletContainerFactory.java | 14 +- .../TomcatEmbeddedWebappClassLoader.java | 2 +- .../context/embedded/tomcat/package-info.java | 4 +- ...nfigFileApplicationContextInitializer.java | 10 +- ...ontextIdApplicationContextInitializer.java | 2 +- ...DelegateApplicationContextInitializer.java | 2 +- .../LoggingApplicationContextInitializer.java | 6 +- .../VcapApplicationContextInitializer.java | 6 +- .../logging/JavaLoggerConfigurer.java | 2 +- .../logging/LogbackConfigurer.java | 2 +- .../properties/ServerProperties.java | 4 +- .../web/SpringServletInitializer.java | 6 +- .../main/resources/META-INF/spring.factories | 10 +- .../logging/log4j.properties | 0 .../{bootstrap => zero}/logging/logback.xml | 0 .../logging/logging.properties | 0 .../BeanDefinitionLoaderTests.java | 6 +- .../SpringApplicationTests.java | 10 +- .../{bootstrap => zero}/TestUtils.java | 2 +- .../PropertiesConfigurationFactoryTests.java | 3 +- .../PropertySourcesPropertyValuesTests.java | 3 +- .../bind/RelaxedDataBinderTests.java | 3 +- .../bind/YamlConfigurationFactoryTests.java | 3 +- .../config/JacksonParserTests.java | 5 +- .../config/SimpleJsonParserTests.java | 4 +- .../config/YamlMapFactoryBeanTests.java | 5 +- .../config/YamlParserTests.java | 5 +- .../YamlPropertiesFactoryBeanTests.java | 9 +- .../EnableConfigurationPropertiesTests.java | 8 +- .../NotWebApplicationConditionTests.java | 4 +- .../annotation/OnBeanConditionTests.java | 6 +- .../annotation/OnClassConditionTests.java | 6 +- .../OnExpressionConditionTests.java | 3 +- .../OnMissingBeanConditionTests.java | 4 +- .../OnMissingClassConditionTests.java | 4 +- .../annotation/OnResourceConditionTests.java | 3 +- .../WebApplicationConditionTests.java | 4 +- ...tEmbeddedServletContainerFactoryTests.java | 8 +- ...figEmbeddedWebApplicationContextTests.java | 6 +- ...edServletContainerMvcIntegrationTests.java | 8 +- .../EmbeddedWebApplicationContextTests.java | 6 +- .../context/embedded/ExampleFilter.java | 2 +- .../context/embedded/ExampleServlet.java | 2 +- .../embedded/FilterRegistrationBeanTests.java | 6 +- .../MockEmbeddedServletContainerFactory.java | 6 +- .../context/embedded/MockFilter.java | 2 +- .../context/embedded/MockServlet.java | 2 +- .../ServletRegistrationBeanTests.java | 4 +- ...XmlEmbeddedWebApplicationContextTests.java | 4 +- ...leEmbeddedWebApplicationConfiguration.java | 10 +- ...yEmbeddedServletContainerFactoryTests.java | 8 +- ...tEmbeddedServletContainerFactoryTests.java | 8 +- ...ileApplicationContextInitializerTests.java | 4 +- ...tIdApplicationContextInitializerTests.java | 5 +- ...gateApplicationContextInitializerTest.java | 3 +- ...capApplicationContextInitializerTests.java | 5 +- .../EnableConfigurationPropertiesTests.java | 6 +- .../logging/JavaLoggerConfigurerTests.java | 3 +- .../logging/LogbackConfigurerTests.java | 4 +- .../logging/LoggingInitializerTests.java | 8 +- .../logging/TestFormatter.java | 2 +- .../properties/ServerPropertiesTests.java | 5 +- .../sampleconfig/MyComponent.java | 2 +- .../src/test/resources/logback-nondefault.xml | 2 +- .../src/test/resources/logback-test.xml | 6 +- .../bootstrap/context/annotation/foo.xml | 10 - .../context/annotation/testProperties.xml | 12 - .../context/embedded/conf.properties | 1 - .../zero}/context/annotation/foo.xml | 0 .../context/annotation/testProperties.xml | 4 +- .../zero}/context/embedded/conf.properties | 0 ...pleEmbeddedWebApplicationConfiguration.xml | 4 +- .../{bootstrap => zero}/sample-beans.xml | 2 +- spring-zero-intergration-tests/build.log | 495 ------------------ .../launcher/JarLauncher.java | 4 +- .../launcher/Launcher.java | 4 +- .../launcher/MainMethodRunner.java | 2 +- .../launcher/WarLauncher.java | 6 +- .../launcher/data/RandomAccessData.java | 2 +- .../launcher/data/RandomAccessDataFile.java | 2 +- .../launcher/data/package-info.java | 4 +- .../launcher/jar/JarEntryFilter.java | 2 +- .../jar/RandomAccessDataZipEntry.java | 4 +- .../jar/RandomAccessDataZipInputStream.java | 4 +- .../launcher/jar/RandomAccessJarFile.java | 6 +- .../launcher/jar/package-info.java | 2 +- .../launcher/package-info.java | 6 +- .../launcher/ByteArrayStartsWith.java | 2 +- .../data/RandomAccessDataFileTest.java | 6 +- .../RandomAccessDataZipInputStreamTest.java | 6 +- .../launcher/jar/RandomAccessJarFileTest.java | 6 +- .../src/it/executable-jar/verify.groovy | 2 +- .../src/it/executable-war/verify.groovy | 2 +- .../maven/AbstractExecutableArchiveMojo.java | 2 +- .../maven/ExecutableJarMojo.java | 4 +- .../maven/ExecutableWarMojo.java | 4 +- .../maven/MainClassFinder.java | 2 +- .../PropertiesMergingResourceTransformer.java | 2 +- .../maven/MainClassFinderTests.java | 7 +- ...ertiesMergingResourceTransformerTests.java | 3 +- .../{bootstrap => zero}/maven/Verify.java | 19 +- .../maven/sample/ClassWithMainMethod.java | 2 +- .../maven/sample/ClassWithoutMainMethod.java | 2 +- .../ui/SampleActuatorUiApplication.java} | 12 +- ...SampleActuatorUiApplicationPortTests.java} | 9 +- .../ui/SampleActuatorUiApplicationTests.java} | 9 +- .../src/test/resources/logging.properties | 4 +- .../sample/actuator}/HelloWorldService.java | 2 +- .../actuator/SampleActuatorApplication.java} | 12 +- .../sample/actuator}/SampleController.java | 2 +- .../sample/actuator}/ServiceProperties.java | 4 +- .../src/main/resources/logging.properties | 2 +- ...ertiesSampleActuatorApplicationTests.java} | 10 +- ...ddressSampleActuatorApplicationTests.java} | 10 +- ...gementSampleActuatorApplicationTests.java} | 10 +- ...gementSampleActuatorApplicationTests.java} | 10 +- .../SampleActuatorApplicationTests.java} | 10 +- ...utdownSampleActuatorApplicationTests.java} | 10 +- ...secureSampleActuatorApplicationTests.java} | 10 +- .../spring-zero-sample-actuator/start.groovy | 6 +- .../sample/batch/SampleBatchApplication.java} | 10 +- .../batch/SampleBatchApplicationTests.java} | 9 +- .../data/jpa/SampleDataJpaApplication.java} | 10 +- .../zero/sample/data/jpa/domain}/City.java | 2 +- .../sample/data/jpa}/domain/Hotel.java | 2 +- .../sample/data/jpa}/domain/HotelSummary.java | 2 +- .../sample/data/jpa}/domain/Rating.java | 2 +- .../sample/data/jpa}/domain/RatingCount.java | 2 +- .../sample/data/jpa}/domain/Review.java | 2 +- .../data/jpa}/domain/ReviewDetails.java | 2 +- .../sample/data/jpa}/domain/TripType.java | 2 +- .../domain/repository/CityRepository.java | 4 +- .../domain/repository/HotelRepository.java | 6 +- .../repository/HotelSummaryRepository.java | 10 +- .../domain/repository/ReviewRepository.java | 6 +- .../data/jpa}/service/CitySearchCriteria.java | 2 +- .../sample/data/jpa}/service/CityService.java | 6 +- .../data/jpa}/service/HotelService.java | 10 +- .../data/jpa}/service/ReviewsSummary.java | 4 +- .../jpa}/service/impl/CityServiceImpl.java | 14 +- .../jpa}/service/impl/HotelServiceImpl.java | 24 +- .../data/jpa}/web/SampleController.java | 4 +- .../jpa/SampleDataJpaApplicationTests.java} | 9 +- .../integration}/HelloWorldService.java | 2 +- .../sample/integration}/SampleEndpoint.java | 2 +- .../SampleIntegrationApplication.java} | 12 +- .../integration}/ServiceProperties.java | 4 +- .../SampleIntegrationApplicationTests.java} | 11 +- .../producer/ProducerApplication.java | 20 +- .../sample/jetty/SampleJettyApplication.java} | 10 +- .../jetty/service/HelloWorldService.java | 2 +- .../sample/jetty/web/SampleController.java | 4 +- .../jetty/SampleJettyApplicationTests.java} | 9 +- .../profile/SampleProfileApplication.java} | 14 +- .../profile}/service/GoodbyeWorldService.java | 2 +- .../profile}/service/HelloWorldService.java | 2 +- .../profile}/service/MessageService.java | 2 +- .../SampleProfileApplicationTests.java} | 11 +- .../simple/SampleSimpleApplication.java} | 14 +- .../simple}/service/HelloWorldService.java | 2 +- .../simple/SampleSimpleApplicationTests.java} | 16 +- .../tomcat/SampleTomcatApplication.java} | 10 +- .../tomcat}/service/HelloWorldService.java | 2 +- .../sample/tomcat/web/SampleController.java | 4 +- ...gurationSampleTomcatApplicationTests.java} | 24 +- .../tomcat/SampleTomcatApplicationTests.java} | 9 +- .../SampleTraditionalApplication.java} | 10 +- .../sample/traditional}/config/WebConfig.java | 2 +- .../SampleTraditionalApplicationTests.java} | 9 +- .../web}/ui/InMemoryMessageRespository.java | 2 +- .../sample/web}/ui/Message.java | 2 +- .../sample/web}/ui/MessageRepository.java | 2 +- .../web/ui/SampleWebUiApplication.java} | 10 +- .../sample/web}/ui/mvc/MessageController.java | 6 +- .../web/ui/SampleWebUiApplicationTests.java} | 9 +- .../src/test/resources/logging.properties | 2 +- .../xml/SampleSpringXmlApplication.java} | 12 +- .../xml}/service/HelloWorldService.java | 2 +- .../META-INF/application-context.xml | 4 +- .../xml/SampleSpringXmlApplicationTests.java} | 7 +- 443 files changed, 1361 insertions(+), 1774 deletions(-) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/audit/AuditEvent.java (98%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/audit/AuditEventRepository.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/audit/InMemoryAuditEventRepository.java (97%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/audit/listener/AuditApplicationEvent.java (94%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/audit/listener/AuditListener.java (87%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/AuditAutoConfiguration.java (71%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/EndpointAutoConfiguration.java (76%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java (83%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java (81%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/ErrorMvcAutoConfiguration.java (68%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java (64%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/MetricFilterAutoConfiguration.java (88%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java (66%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/SecurityAutoConfiguration.java (91%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java (74%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java (78%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/AbstractEndpoint.java (96%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/ActionEndpoint.java (93%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/BeansEndpoint.java (93%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/DumpEndpoint.java (90%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/Endpoint.java (96%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/EnvironmentEndpoint.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/HealthEndpoint.java (86%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/InfoEndpoint.java (91%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/MetricsEndpoint.java (88%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/PublicMetrics.java (88%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/ShutdownEndpoint.java (91%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/TraceEndpoint.java (83%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/VanillaPublicMetrics.java (89%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/mvc/EndpointHandlerAdapter.java (98%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/endpoint/mvc/EndpointHandlerMapping.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/fixme/ManagementServerConfiguration.java (82%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/health/HealthIndicator.java (94%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/health/VanillaHealthIndicator.java (94%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/CounterService.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/DefaultCounterService.java (96%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/DefaultGaugeService.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/GaugeService.java (94%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/InMemoryMetricRepository.java (97%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/Measurement.java (97%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/Metric.java (98%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/metrics/MetricRepository.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/properties/ManagementServerProperties.java (90%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/properties/SecurityProperties.java (94%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/security/AuthenticationAuditListener.java (94%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/security/AuthorizationAuditListener.java (93%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/trace/InMemoryTraceRepository.java (96%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/trace/Trace.java (96%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/trace/TraceRepository.java (95%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/trace/WebRequestTraceFilter.java (98%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/web/BasicErrorController.java (96%) rename spring-zero-actuator/src/main/java/org/springframework/{bootstrap => zero}/actuate/web/ErrorController.java (94%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/TestUtils.java (96%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/audit/AuditEventTests.java (93%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/audit/InMemoryAuditEventRepositoryTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/audit/listener/AuditListenerTests.java (78%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/AuditAutoConfigurationTests.java (83%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/EndpointAutoConfigurationTests.java (79%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java (89%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java (91%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java (83%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/SecurityAutoConfigurationTests.java (90%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java (87%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java (76%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/AbstractEndpointTests.java (95%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/BeansEndpointTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/DumpEndpointTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/EnvironmentEndpointTests.java (87%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/HealthEndpointTests.java (85%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/InfoEndpointTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/MetricsEndpointTests.java (84%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/ShutdownEndpointTests.java (87%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/TraceEndpointTests.java (80%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/VanillaPublicMetricsTests.java (85%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java (86%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/endpoint/mvc/EndpointHandlerMappingTests.java (93%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/fixme/ErrorConfigurationTests.java (96%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/health/VanillaHealthIndicatorTests.java (89%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/metrics/DefaultCounterServiceTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/metrics/DefaultGaugeServiceTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/metrics/InMemoryMetricRepositoryTests.java (88%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/properties/SecurityPropertiesTests.java (90%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/security/AuthenticationAuditListenerTests.java (87%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/security/AuthorizationAuditListenerTests.java (87%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/trace/InMemoryTraceRepositoryTests.java (89%) rename spring-zero-actuator/src/test/java/org/springframework/{bootstrap => zero}/actuate/trace/WebRequestTraceFilterTests.java (88%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/AutoConfigurationUtils.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/MessageSourceAutoConfiguration.java (87%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/PropertyPlaceholderAutoConfiguration.java (87%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/BatchAutoConfiguration.java (76%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/BatchDatabaseInitializer.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/JobExecutionEvent.java (95%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/JobExecutionExitCodeGenerator.java (92%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/JobLauncherCommandLineRunner.java (96%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/data/JpaRepositoriesAutoConfiguration.java (81%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/AbstractDataSourceConfiguration.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/BasicDataSourceConfiguration.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/DataSourceAutoConfiguration.java (96%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java (82%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java (95%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/TomcatDataSourceConfiguration.java (96%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java (93%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/orm/jpa/JpaAutoConfiguration.java (89%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java (89%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java (78%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/web/MultipartAutoConfiguration.java (80%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/web/ServerPropertiesAutoConfiguration.java (79%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/autoconfigure/web/WebMvcAutoConfiguration.java (91%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/AutoConfigurationSorter.java (98%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/AutoConfigureAfter.java (94%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ComponentScanDetector.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/EnableAutoConfiguration.java (85%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/EnableAutoConfigurationImportSelector.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/{bootstrap => zero}/main/Spring.java (93%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/AdhocTestSuite.java (82%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/MessageSourceAutoConfigurationTests.java (90%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/SpringJUnitTests.java (84%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/BatchAutoConfigurationTests.java (89%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java (88%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java (75%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/data/JpaWebAutoConfigurationTests.java (79%) rename {spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/bootstrap/sample/data/domain => spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test}/City.java (96%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/data/test/CityRepository.java (94%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java (90%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java (94%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java (88%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java (90%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java (90%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java (79%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap/autoconfigure/data => zero/autoconfigure/orm/jpa}/test/City.java (96%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java (93%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java (84%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/web/MultipartAutoConfigurationTests.java (92%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/web/ServerPropertiesConfigurationTests.java (79%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/autoconfigure/web/WebMvcAutoConfigurationTests.java (86%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/AutoConfigurationSorterTest.java (93%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/ComponentScanDetectorConfiguration.java (87%) rename spring-zero-autoconfigure/src/test/java/org/springframework/{bootstrap => zero}/main/SimpleMainTests.java (92%) delete mode 100644 spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml delete mode 100644 spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap/sample-beans.xml delete mode 100644 spring-zero-autoconfigure/src/test/resources/fixme/static/css/style.css delete mode 100644 spring-zero-autoconfigure/src/test/resources/org/springframework/bootstrap/autoconfigure/jdbc/schema.sql rename spring-zero-autoconfigure/src/test/resources/{fixme/org/springframework/bootstrap => org/springframework/zero}/autoconfigure/jdbc/schema.sql (100%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/Command.java (97%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/CommandFactory.java (95%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/NoSuchCommandException.java (86%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap/cli/SpringBootstrapCli.java => zero/cli/SpringZeroCli.java} (84%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap/cli/BootstrapCliException.java => zero/cli/SpringZeroCliException.java} (74%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/AbstractCommand.java (93%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/CleanCommand.java (93%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/CreateCommand.java (93%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/DefaultCommandFactory.java (87%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/OptionHandler.java (97%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/OptionParsingCommand.java (92%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/RunCommand.java (87%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/ScriptCommand.java (96%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/ScriptCompilationCustomizer.java (98%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/command/VersionCommand.java (90%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/AstUtils.java (96%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/CompilerAutoConfiguration.java (98%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/DependencyCustomizer.java (99%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/ExtendedGroovyClassLoader.java (98%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/GroovyCompiler.java (97%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/GroovyCompilerConfiguration.java (94%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java (90%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java (91%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java (85%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap/cli/compiler/autoconfigure/SpringBootstrapCompilerAutoConfiguration.java => zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java} (82%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap/cli/runner/BootstrapRunner.java => zero/cli/runner/SpringZeroRunner.java} (90%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap/cli/runner/BootstrapRunnerConfiguration.java => zero/cli/runner/SpringZeroRunnerConfiguration.java} (79%) rename spring-zero-cli/src/main/java/org/springframework/{bootstrap => zero}/cli/template/GroovyTemplate.java (97%) delete mode 100644 spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.CommandFactory delete mode 100644 spring-zero-cli/src/main/resources/META-INF/services/org.springframework.bootstrap.cli.compiler.CompilerAutoConfiguration create mode 100644 spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory create mode 100644 spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration rename spring-zero-cli/src/test/java/org/springframework/{bootstrap => zero}/cli/SampleIntegrationTests.java (97%) rename spring-zero-cli/src/test/java/org/springframework/{bootstrap/cli/SpringBootstrapCliTests.java => zero/cli/SpringZeroCliTests.java} (86%) rename spring-zero-cli/src/test/java/org/springframework/{bootstrap => zero}/cli/command/ScriptCommandTests.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/Banner.java (94%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/BeanDefinitionLoader.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/CommandLineRunner.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/ExitCodeGenerator.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/SpringApplication.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/bind/CustomPropertyConstructor.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/bind/InetAddressEditor.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/bind/PropertiesConfigurationFactory.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/bind/PropertySourcesPropertyValues.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/bind/RelaxedDataBinder.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/bind/YamlConfigurationFactory.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/JacksonJsonParser.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/JsonParser.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/JsonParserFactory.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/SimpleJsonParser.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/YamlJsonParser.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/YamlMapFactoryBean.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/YamlProcessor.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/config/YamlPropertiesFactoryBean.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/AbstractOnBeanCondition.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/AssertMissingBean.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/AssertMissingBeanCondition.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionLogUtils.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnBean.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnClass.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnExpression.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnMissingBean.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnMissingClass.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnNotWebApplication.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnResource.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConditionalOnWebApplication.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConfigurationProperties.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/ConfigurationPropertiesBindingConfiguration.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/EnableConfigurationProperties.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/EnableConfigurationPropertiesImportSelector.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnBeanCondition.java (94%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnClassCondition.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnExpressionCondition.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnMissingBeanCondition.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnMissingClassCondition.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnNotWebApplicationCondition.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnResourceCondition.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/OnWebApplicationCondition.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/annotation/PropertySourcesBindingPostProcessor.java (94%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/AbstractEmbeddedServletContainerFactory.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/ConfigurableEmbeddedServletContainerFactory.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedServletContainer.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedServletContainerCustomizer.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedServletContainerException.java (94%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedServletContainerFactory.java (85%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedWebApplicationContext.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/ErrorPage.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/FilterRegistrationBean.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/RegistrationBean.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/ServletContextInitializer.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/ServletRegistrationBean.java (99%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/WebApplicationContextServletContextAwareProcessor.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/XmlEmbeddedWebApplicationContext.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/jetty/JettyEmbeddedServletContainer.java (89%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/jetty/ServletContextInitializerConfiguration.java (94%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/jetty/package-info.java (76%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/package-info.java (74%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java (93%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/tomcat/TomcatEmbeddedServletContainer.java (91%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java (95%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/embedded/tomcat/package-info.java (76%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/initializer/ConfigFileApplicationContextInitializer.java (96%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/initializer/ContextIdApplicationContextInitializer.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/initializer/EnvironmentDelegateApplicationContextInitializer.java (98%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/initializer/LoggingApplicationContextInitializer.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/context/initializer/VcapApplicationContextInitializer.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/logging/JavaLoggerConfigurer.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/logging/LogbackConfigurer.java (97%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/properties/ServerProperties.java (94%) rename spring-zero-core/src/main/java/org/springframework/{bootstrap => zero}/web/SpringServletInitializer.java (93%) rename spring-zero-core/src/main/resources/org/springframework/{bootstrap => zero}/logging/log4j.properties (100%) rename spring-zero-core/src/main/resources/org/springframework/{bootstrap => zero}/logging/logback.xml (100%) rename spring-zero-core/src/main/resources/org/springframework/{bootstrap => zero}/logging/logging.properties (100%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/BeanDefinitionLoaderTests.java (95%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/SpringApplicationTests.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/TestUtils.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/bind/PropertiesConfigurationFactoryTests.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/bind/PropertySourcesPropertyValuesTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/bind/RelaxedDataBinderTests.java (99%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/bind/YamlConfigurationFactoryTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/config/JacksonParserTests.java (84%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/config/SimpleJsonParserTests.java (92%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/config/YamlMapFactoryBeanTests.java (94%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/config/YamlParserTests.java (84%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/config/YamlPropertiesFactoryBeanTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/EnableConfigurationPropertiesTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/NotWebApplicationConditionTests.java (89%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/OnBeanConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/OnClassConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/OnExpressionConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/OnMissingBeanConditionTests.java (95%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/OnMissingClassConditionTests.java (92%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/OnResourceConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/annotation/WebApplicationConditionTests.java (90%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java (94%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/EmbeddedWebApplicationContextTests.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/ExampleFilter.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/ExampleServlet.java (95%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/FilterRegistrationBeanTests.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/MockEmbeddedServletContainerFactory.java (94%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/MockFilter.java (95%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/MockServlet.java (94%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/ServletRegistrationBeanTests.java (98%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/XmlEmbeddedWebApplicationContextTests.java (94%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java (73%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java (84%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java (84%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/initializer/ConfigFileApplicationContextInitializerTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/initializer/ContextIdApplicationContextInitializerTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/initializer/VcapApplicationContextInitializerTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/context/test/EnableConfigurationPropertiesTests.java (94%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/logging/JavaLoggerConfigurerTests.java (95%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/logging/LogbackConfigurerTests.java (97%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/logging/LoggingInitializerTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/logging/TestFormatter.java (95%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/properties/ServerPropertiesTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/{bootstrap => zero}/sampleconfig/MyComponent.java (93%) delete mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/foo.xml delete mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/annotation/testProperties.xml delete mode 100644 spring-zero-core/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties rename {spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap => spring-zero-core/src/test/resources/org/springframework/zero}/context/annotation/foo.xml (100%) rename {spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap => spring-zero-core/src/test/resources/org/springframework/zero}/context/annotation/testProperties.xml (61%) rename {spring-zero-autoconfigure/src/test/resources/fixme/org/springframework/bootstrap => spring-zero-core/src/test/resources/org/springframework/zero}/context/embedded/conf.properties (100%) rename spring-zero-core/src/test/resources/org/springframework/{bootstrap => zero}/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml (63%) rename spring-zero-core/src/test/resources/org/springframework/{bootstrap => zero}/sample-beans.xml (83%) delete mode 100644 spring-zero-intergration-tests/build.log rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/JarLauncher.java (91%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/Launcher.java (98%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/MainMethodRunner.java (97%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/WarLauncher.java (92%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/data/RandomAccessData.java (96%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/data/RandomAccessDataFile.java (99%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/data/package-info.java (85%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/jar/JarEntryFilter.java (95%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/jar/RandomAccessDataZipEntry.java (91%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/jar/RandomAccessDataZipInputStream.java (96%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/jar/RandomAccessJarFile.java (98%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/jar/package-info.java (92%) rename spring-zero-launcher/src/main/java/org/springframework/{bootstrap => zero}/launcher/package-info.java (85%) rename spring-zero-launcher/src/test/java/org/springframework/{bootstrap => zero}/launcher/ByteArrayStartsWith.java (96%) rename spring-zero-launcher/src/test/java/org/springframework/{bootstrap => zero}/launcher/data/RandomAccessDataFileTest.java (97%) rename spring-zero-launcher/src/test/java/org/springframework/{bootstrap => zero}/launcher/jar/RandomAccessDataZipInputStreamTest.java (90%) rename spring-zero-launcher/src/test/java/org/springframework/{bootstrap => zero}/launcher/jar/RandomAccessJarFileTest.java (98%) rename spring-zero-maven-plugin/src/main/java/org/springframework/{bootstrap => zero}/maven/AbstractExecutableArchiveMojo.java (99%) rename spring-zero-maven-plugin/src/main/java/org/springframework/{bootstrap => zero}/maven/ExecutableJarMojo.java (94%) rename spring-zero-maven-plugin/src/main/java/org/springframework/{bootstrap => zero}/maven/ExecutableWarMojo.java (96%) rename spring-zero-maven-plugin/src/main/java/org/springframework/{bootstrap => zero}/maven/MainClassFinder.java (98%) rename spring-zero-maven-plugin/src/main/java/org/springframework/{bootstrap => zero}/maven/PropertiesMergingResourceTransformer.java (98%) rename spring-zero-maven-plugin/src/test/java/org/springframework/{bootstrap => zero}/maven/MainClassFinderTests.java (92%) rename spring-zero-maven-plugin/src/test/java/org/springframework/{bootstrap => zero}/maven/PropertiesMergingResourceTransformerTests.java (94%) rename spring-zero-maven-plugin/src/test/java/org/springframework/{bootstrap => zero}/maven/Verify.java (88%) rename spring-zero-maven-plugin/src/test/java/org/springframework/{bootstrap => zero}/maven/sample/ClassWithMainMethod.java (93%) rename spring-zero-maven-plugin/src/test/java/org/springframework/{bootstrap => zero}/maven/sample/ClassWithoutMainMethod.java (93%) rename spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/{bootstrap/sample/ui/ActuatorUiBootstrapApplication.java => zero/sample/actuator/ui/SampleActuatorUiApplication.java} (67%) rename spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/{bootstrap/sample/ui/ManagementServiceBootstrapApplicationTests.java => zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java} (90%) rename spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/{bootstrap/sample/ui/ActuatorUiBootstrapApplicationTests.java => zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java} (94%) rename spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/{bootstrap/sample/service => zero/sample/actuator}/HelloWorldService.java (94%) rename spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/{bootstrap/sample/service/ServiceBootstrapApplication.java => zero/sample/actuator/SampleActuatorApplication.java} (69%) rename spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/{bootstrap/sample/service => zero/sample/actuator}/SampleController.java (96%) rename spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/{bootstrap/sample/service => zero/sample/actuator}/ServiceProperties.java (87%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/EndpointsPropertiesServiceBootstrapApplicationTests.java => zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java} (91%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/ManagementAddressServiceBootstrapApplicationTests.java => zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java} (93%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/ManagementServiceBootstrapApplicationTests.java => zero/sample/actuator/ManagementSampleActuatorApplicationTests.java} (88%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/NoManagementServiceBootstrapApplicationTests.java => zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java} (92%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/ServiceBootstrapApplicationTests.java => zero/sample/actuator/SampleActuatorApplicationTests.java} (95%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/ShutdownServiceBootstrapApplicationTests.java => zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java} (92%) rename spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/{bootstrap/sample/test/UnsecureServiceBootstrapApplicationTests.java => zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java} (88%) rename spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/{bootstrap/sample/batch/BatchBootstrapApplication.java => zero/sample/batch/SampleBatchApplication.java} (89%) rename spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/{bootstrap/sample/batch/BatchBootstrapApplicationTests.java => zero/sample/batch/SampleBatchApplicationTests.java} (85%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data/DataBootstrapApplication.java => zero/sample/data/jpa/SampleDataJpaApplication.java} (74%) rename {spring-zero-autoconfigure/src/test/java/org/springframework/bootstrap/autoconfigure/orm/jpa/test => spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/domain}/City.java (95%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/Hotel.java (96%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/HotelSummary.java (96%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/Rating.java (92%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/RatingCount.java (94%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/Review.java (98%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/ReviewDetails.java (96%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/TripType.java (92%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/repository/CityRepository.java (89%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/repository/HotelRepository.java (80%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/repository/HotelSummaryRepository.java (91%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/domain/repository/ReviewRepository.java (83%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/service/CitySearchCriteria.java (94%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/service/CityService.java (82%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/service/HotelService.java (75%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/service/ReviewsSummary.java (85%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/service/impl/CityServiceImpl.java (83%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/service/impl/HotelServiceImpl.java (78%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/{bootstrap/sample/data => zero/sample/data/jpa}/web/SampleController.java (89%) rename spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/{bootstrap/sample/data/DataBootstrapApplicationTests.java => zero/sample/data/jpa/SampleDataJpaApplicationTests.java} (87%) rename spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/{bootstrap/sample/consumer => zero/sample/integration}/HelloWorldService.java (94%) rename spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/{bootstrap/sample/consumer => zero/sample/integration}/SampleEndpoint.java (95%) rename spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/{bootstrap/sample/consumer/IntegrationBootstrapApplication.java => zero/sample/integration/SampleIntegrationApplication.java} (72%) rename spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/{bootstrap/sample/consumer => zero/sample/integration}/ServiceProperties.java (86%) rename spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/{bootstrap/sample/consumer/IntegrationBootstrapApplicationTests.java => zero/sample/integration/consumer/SampleIntegrationApplicationTests.java} (83%) rename spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/{bootstrap/sample => zero/sample/integration}/producer/ProducerApplication.java (51%) rename spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/{bootstrap/sample/jetty/JettyBootstrapApplication.java => zero/sample/jetty/SampleJettyApplication.java} (74%) rename spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/{bootstrap => zero}/sample/jetty/service/HelloWorldService.java (93%) rename spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/{bootstrap => zero}/sample/jetty/web/SampleController.java (89%) rename spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/{bootstrap/sample/jetty/JettyBootstrapApplicationTests.java => zero/sample/jetty/SampleJettyApplicationTests.java} (90%) rename spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/{bootstrap/sample/simple/ProfileBootstrapApplication.java => zero/sample/profile/SampleProfileApplication.java} (74%) rename spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/{bootstrap/sample/simple => zero/sample/profile}/service/GoodbyeWorldService.java (94%) rename spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/{bootstrap/sample/simple => zero/sample/profile}/service/HelloWorldService.java (94%) rename spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/{bootstrap/sample/simple => zero/sample/profile}/service/MessageService.java (92%) rename spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/{bootstrap/sample/simple/ProfileBootstrapApplicationTests.java => zero/sample/profile/SampleProfileApplicationTests.java} (84%) rename spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/{bootstrap/sample/simple/SimpleBootstrapApplication.java => zero/sample/simple/SampleSimpleApplication.java} (74%) rename spring-zero-samples/{spring-zero-sample-xml/src/main/java/org/springframework/bootstrap/sample/xml => spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple}/service/HelloWorldService.java (93%) rename spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/{bootstrap/sample/simple/SimpleBootstrapApplicationTests.java => zero/sample/simple/SampleSimpleApplicationTests.java} (78%) rename spring-zero-samples/{spring-zero-sample-traditional/src/main/java/org/springframework/bootstrap/sample/trad/TradBootstrapApplication.java => spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java} (74%) rename spring-zero-samples/{spring-zero-sample-simple/src/main/java/org/springframework/bootstrap/sample/simple => spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat}/service/HelloWorldService.java (93%) rename spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/{bootstrap => zero}/sample/tomcat/web/SampleController.java (88%) rename spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/{bootstrap/sample/tomcat/NonAutoConfigurationBootstrapApplicationTests.java => zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java} (74%) rename spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/{bootstrap/sample/tomcat/TomcatBootstrapApplicationTests.java => zero/sample/tomcat/SampleTomcatApplicationTests.java} (89%) rename spring-zero-samples/{spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat/TomcatBootstrapApplication.java => spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java} (74%) rename spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/{bootstrap/sample/trad => zero/sample/traditional}/config/WebConfig.java (97%) rename spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/{bootstrap/sample/trad/TradBootstrapApplicationTests.java => zero/sample/traditional/SampleTraditionalApplicationTests.java} (89%) rename spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/{bootstrap/sample => zero/sample/web}/ui/InMemoryMessageRespository.java (96%) rename spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/{bootstrap/sample => zero/sample/web}/ui/Message.java (96%) rename spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/{bootstrap/sample => zero/sample/web}/ui/MessageRepository.java (94%) rename spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/{bootstrap/sample/ui/UiBootstrapApplication.java => zero/sample/web/ui/SampleWebUiApplication.java} (82%) rename spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/{bootstrap/sample => zero/sample/web}/ui/mvc/MessageController.java (93%) rename spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/{bootstrap/sample/ui/UiBootstrapApplicationTests.java => zero/sample/web/ui/SampleWebUiApplicationTests.java} (93%) rename spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/{bootstrap/sample/xml/XmlBootstrapApplication.java => zero/sample/xml/SampleSpringXmlApplication.java} (72%) rename spring-zero-samples/{spring-zero-sample-tomcat/src/main/java/org/springframework/bootstrap/sample/tomcat => spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml}/service/HelloWorldService.java (93%) rename spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/{bootstrap/sample/xml/XmlBootstrapApplicationTests.java => zero/sample/xml/SampleSpringXmlApplicationTests.java} (78%) 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")); } From d91e80213913df5243d7558f8044dcf2c37f6b58 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 5 Jul 2013 20:06:09 -0700 Subject: [PATCH 04/15] Polish Javadoc --- .../springframework/zero/web/SpringServletInitializer.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java index 19c8e3e7aa..68f35fff2a 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java @@ -14,21 +14,17 @@ import org.springframework.zero.SpringApplication; import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; /** - *

      * A handy opinionated {@link WebApplicationInitializer} for applications that only have * one Spring servlet, and no more than a single filter (which itself is only enabled when * Spring Security is detected). If your application is more complicated consider using * one of the other WebApplicationInitializers. - *

      * - *

      + *

      * Note that a WebApplicationInitializer is only needed if you are building a war file and * deploying it. If you prefer to run an embedded container (we do) then you won't need * this at all. - *

      * * @author Dave Syer - * */ public abstract class SpringServletInitializer implements WebApplicationInitializer { From a6341dc0af8fccb98c084d84efa12fc12586365d Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 6 Jul 2013 10:51:16 -0700 Subject: [PATCH 05/15] Move @AssertMissingBean to tests Use @AssertMissingBean only for tests. --- spring-zero-actuator/docs/Features.md | 5 -- ...rverPropertiesAutoConfigurationTests.java} | 52 +++++++++++++++---- .../context/annotation/AssertMissingBean.java | 1 + .../AssertMissingBeanCondition.java | 1 + 4 files changed, 44 insertions(+), 15 deletions(-) rename spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/{ServerPropertiesConfigurationTests.java => ServerPropertiesAutoConfigurationTests.java} (67%) rename spring-zero-core/src/{main => test}/java/org/springframework/zero/context/annotation/AssertMissingBean.java (96%) rename spring-zero-core/src/{main => test}/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java (95%) diff --git a/spring-zero-actuator/docs/Features.md b/spring-zero-actuator/docs/Features.md index f889d0253c..e2aa542a01 100644 --- a/spring-zero-actuator/docs/Features.md +++ b/spring-zero-actuator/docs/Features.md @@ -177,7 +177,6 @@ to change the default values imperatively in Java, so get more control over the process. You can do this by declaring a bean of the same type in your application context, e.g. for the server properties: - @AssertMissingBean(ServerProperties.class) @Bean public ServerProperties serverProperties() { ServerProperties server = new ServerProperties(); @@ -185,10 +184,6 @@ type in your application context, e.g. for the server properties: return server; } -Note the use of `@AssertMissingBean` to guard against any mistakes -where the bean is already defined (and therefore might already have -been bound). - ## Server Configuration The `ServerProperties` are bound to application properties, and diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java similarity index 67% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesConfigurationTests.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java index 713fc168c6..16747a30c8 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java @@ -18,15 +18,18 @@ package org.springframework.zero.autoconfigure.web; import java.io.File; +import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.springframework.beans.factory.NoUniqueBeanDefinitionException; 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; @@ -42,16 +45,19 @@ import static org.junit.Assert.assertNotNull; * * @author Dave Syer */ -public class ServerPropertiesConfigurationTests { +public class ServerPropertiesAutoConfigurationTests { private static ConfigurableEmbeddedServletContainerFactory containerFactory; + @Rule + public ExpectedException thrown = ExpectedException.none(); + private AnnotationConfigEmbeddedWebApplicationContext context; @Before public void init() { - containerFactory = Mockito - .mock(ConfigurableEmbeddedServletContainerFactory.class); + containerFactory = + Mockito.mock(ConfigurableEmbeddedServletContainerFactory.class); } @After @@ -64,8 +70,8 @@ public class ServerPropertiesConfigurationTests { @Test public void createFromConfigClass() throws Exception { this.context = new AnnotationConfigEmbeddedWebApplicationContext(); - this.context.register(Config.class, ServerPropertiesAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class); + this.context + .register(Config.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); TestUtils.addEnviroment(this.context, "server.port:9000"); this.context.refresh(); ServerProperties server = this.context.getBean(ServerProperties.class); @@ -78,8 +84,8 @@ public class ServerPropertiesConfigurationTests { public void tomcatProperties() throws Exception { containerFactory = Mockito.mock(TomcatEmbeddedServletContainerFactory.class); this.context = new AnnotationConfigEmbeddedWebApplicationContext(); - this.context.register(Config.class, ServerPropertiesAutoConfiguration.class, - PropertyPlaceholderAutoConfiguration.class); + this.context + .register(Config.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); TestUtils.addEnviroment(this.context, "server.tomcat.basedir:target/foo"); this.context.refresh(); ServerProperties server = this.context.getBean(ServerProperties.class); @@ -88,19 +94,45 @@ public class ServerPropertiesConfigurationTests { Mockito.verify(containerFactory).setPort(8080); } + @Test + public void testAccidentalMultipleServerPropertiesBeans() throws Exception { + this.context = new AnnotationConfigEmbeddedWebApplicationContext(); + this.context + .register(Config.class, MutiServerPropertiesBeanConfig.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); + this.thrown.expectCause(Matchers + . instanceOf(NoUniqueBeanDefinitionException.class)); + this.context.refresh(); + } + @Configuration protected static class Config { @Bean public EmbeddedServletContainerFactory containerFactory() { - return ServerPropertiesConfigurationTests.containerFactory; + return ServerPropertiesAutoConfigurationTests.containerFactory; } @Bean - public EmbeddedServletContainerCustomizerBeanPostProcessor embeddedServletContainerCustomizerBeanPostProcessor() { + public EmbeddedServletContainerCustomizerBeanPostProcessor + embeddedServletContainerCustomizerBeanPostProcessor() { return new EmbeddedServletContainerCustomizerBeanPostProcessor(); } } + @Configuration + protected static class MutiServerPropertiesBeanConfig { + + @Bean + public ServerProperties serverPropertiesOne() { + return new ServerProperties(); + } + + @Bean + public ServerProperties serverPropertiesTwo() { + return new ServerProperties(); + } + + } + } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBean.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBean.java index c101c3d900..33bba730f8 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBean.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBean.java @@ -25,6 +25,7 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Conditional; +import org.springframework.zero.context.annotation.ConditionalOnMissingBean; /** * {@link Conditional} that only matches when the specified bean classes and/or names are diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java index 69e4e7b96b..699f74271f 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; +import org.springframework.zero.context.annotation.OnMissingBeanCondition; /** * {@link Condition} that checks that specific beans are missing. From 764a0a9af8a4d2bff8af84d163605de7880c080e Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 6 Jul 2013 14:21:20 -0700 Subject: [PATCH 06/15] Minor change to code formatting --- eclipse/org.eclipse.jdt.core.prefs | 8 ++--- .../zero/actuate/audit/AuditEvent.java | 3 +- .../EndpointWebMvcAutoConfiguration.java | 6 ++-- ...mentServerPropertiesAutoConfiguration.java | 2 +- .../MetricFilterAutoConfiguration.java | 9 +++-- .../SecurityAutoConfiguration.java | 6 ++-- .../actuate/endpoint/ShutdownEndpoint.java | 3 +- .../endpoint/mvc/EndpointHandlerAdapter.java | 6 ++-- .../metrics/DefaultCounterService.java | 3 +- .../actuate/metrics/DefaultGaugeService.java | 3 +- .../metrics/InMemoryMetricRepository.java | 6 ++-- .../security/AuthenticationAuditListener.java | 6 ++-- .../security/AuthorizationAuditListener.java | 3 +- .../actuate/trace/WebRequestTraceFilter.java | 6 ++-- .../actuate/web/BasicErrorController.java | 9 +++-- .../EndpointWebMvcAutoConfigurationTests.java | 9 +++-- .../autoconfigure/AutoConfigurationUtils.java | 6 ++-- .../jdbc/BasicDataSourceConfiguration.java | 3 +- .../orm/jpa/JpaAutoConfiguration.java | 6 ++-- .../thymeleaf/ThymeleafAutoConfiguration.java | 3 +- .../web/WebMvcAutoConfiguration.java | 2 +- .../annotation/AutoConfigurationSorter.java | 3 +- .../annotation/ComponentScanDetector.java | 6 ++-- ...EnableAutoConfigurationImportSelector.java | 3 +- .../org/springframework/zero/main/Spring.java | 9 +++-- ...erverPropertiesAutoConfigurationTests.java | 20 +++++------ .../zero/cli/SpringZeroCli.java | 19 ++++++----- .../zero/cli/SpringZeroCliException.java | 3 +- .../zero/cli/command/CleanCommand.java | 11 ++++--- .../zero/cli/command/OptionHandler.java | 3 +- .../zero/cli/command/ScriptCommand.java | 33 ++++++++++++------- .../cli/compiler/DependencyCustomizer.java | 12 ++++--- .../zero/cli/compiler/GroovyCompiler.java | 9 ++--- .../SpringMvcCompilerAutoConfiguration.java | 6 ++-- .../SpringZeroCompilerAutoConfiguration.java | 3 +- .../zero/cli/runner/SpringZeroRunner.java | 24 +++++++++----- .../zero/cli/template/GroovyTemplate.java | 6 ++-- .../zero/BeanDefinitionLoader.java | 3 +- .../zero/SpringApplication.java | 24 +++++++++----- .../zero/bind/CustomPropertyConstructor.java | 3 +- .../zero/bind/InetAddressEditor.java | 3 +- .../bind/PropertiesConfigurationFactory.java | 12 ++++--- .../bind/PropertySourcesPropertyValues.java | 3 +- .../zero/bind/RelaxedDataBinder.java | 6 ++-- .../zero/bind/YamlConfigurationFactory.java | 3 +- .../zero/config/JacksonJsonParser.java | 6 ++-- .../zero/config/SimpleJsonParser.java | 12 ++++--- .../zero/config/YamlMapFactoryBean.java | 3 +- .../zero/config/YamlProcessor.java | 24 +++++++++----- .../annotation/AbstractOnBeanCondition.java | 9 +++-- ...urationPropertiesBindingConfiguration.java | 9 +++-- .../PropertySourcesBindingPostProcessor.java | 6 ++-- ...stractEmbeddedServletContainerFactory.java | 3 +- .../EmbeddedWebApplicationContext.java | 15 ++++++--- .../embedded/FilterRegistrationBean.java | 3 +- .../jetty/JettyEmbeddedServletContainer.java | 9 +++-- .../JettyEmbeddedServletContainerFactory.java | 9 +++-- ...etContextInitializerLifecycleListener.java | 3 +- .../TomcatEmbeddedServletContainer.java | 9 +++-- ...TomcatEmbeddedServletContainerFactory.java | 6 ++-- ...nfigFileApplicationContextInitializer.java | 9 +++-- ...ontextIdApplicationContextInitializer.java | 3 +- ...DelegateApplicationContextInitializer.java | 3 +- .../LoggingApplicationContextInitializer.java | 6 ++-- .../VcapApplicationContextInitializer.java | 15 ++++++--- .../zero/logging/JavaLoggerConfigurer.java | 9 +++-- .../zero/logging/LogbackConfigurer.java | 3 +- .../zero/web/SpringServletInitializer.java | 3 +- .../zero/SpringApplicationTests.java | 3 +- ...tEmbeddedServletContainerFactoryTests.java | 9 +++-- ...edServletContainerMvcIntegrationTests.java | 6 ++-- .../MockEmbeddedServletContainerFactory.java | 3 +- .../zero/launcher/Launcher.java | 3 +- .../zero/launcher/MainMethodRunner.java | 3 +- .../zero/launcher/WarLauncher.java | 3 +- .../launcher/data/RandomAccessDataFile.java | 15 ++++++--- .../launcher/jar/RandomAccessJarFile.java | 12 ++++--- .../RandomAccessDataZipInputStreamTest.java | 6 ++-- .../launcher/jar/RandomAccessJarFileTest.java | 3 +- .../maven/AbstractExecutableArchiveMojo.java | 12 ++++--- .../zero/maven/MainClassFinder.java | 6 ++-- .../zero/maven/MainClassFinderTests.java | 3 +- .../SampleProfileApplicationTests.java | 3 +- .../simple/SampleSimpleApplicationTests.java | 3 +- 84 files changed, 391 insertions(+), 214 deletions(-) diff --git a/eclipse/org.eclipse.jdt.core.prefs b/eclipse/org.eclipse.jdt.core.prefs index f544b17104..3301c45fec 100644 --- a/eclipse/org.eclipse.jdt.core.prefs +++ b/eclipse/org.eclipse.jdt.core.prefs @@ -193,11 +193,11 @@ org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java index 69fea7e24f..61561a753b 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java @@ -93,7 +93,8 @@ public class AuditEvent implements Serializable { if (entry.contains("=")) { int index = entry.indexOf("="); result.put(entry.substring(0, index), entry.substring(index + 1)); - } else { + } + else { result.put(entry, null); } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index f6535f3c4f..e2c93c3780 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -140,7 +140,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, ServerProperties serverProperties; try { serverProperties = beanFactory.getBean(ServerProperties.class); - } catch (NoSuchBeanDefinitionException ex) { + } + catch (NoSuchBeanDefinitionException ex) { serverProperties = new ServerProperties(); } @@ -148,7 +149,8 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, try { managementServerProperties = beanFactory .getBean(ManagementServerProperties.class); - } catch (NoSuchBeanDefinitionException ex) { + } + catch (NoSuchBeanDefinitionException ex) { managementServerProperties = new ManagementServerProperties(); } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 903abcc8bc..8c69dd23d9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.zero.context.annotation.EnableConfigurationProperties /** * {@link EnableAutoConfiguration Auto-configuration} for the * {@link ManagementServerPropertiesAutoConfiguration} bean. - * + * * @author Dave Syer */ @Configuration diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 0cb300d548..915683bc27 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -83,7 +83,8 @@ public class MetricFilterAutoConfiguration { && (response instanceof HttpServletResponse)) { doFilter((HttpServletRequest) request, (HttpServletResponse) response, chain); - } else { + } + else { chain.doFilter(request, response); } } @@ -96,7 +97,8 @@ public class MetricFilterAutoConfiguration { stopWatch.start(); try { chain.doFilter(request, response); - } finally { + } + finally { stopWatch.stop(); String gaugeKey = getKey("response" + suffix); MetricFilterAutoConfiguration.this.gaugeService.set(gaugeKey, @@ -109,7 +111,8 @@ public class MetricFilterAutoConfiguration { private int getStatus(HttpServletResponse response) { try { return response.getStatus(); - } catch (Exception e) { + } + catch (Exception e) { return UNDEFINED_HTTP_STATUS; } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java index 8ffe02d6cb..0b4943065f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -58,12 +58,12 @@ import org.springframework.zero.context.annotation.EnableConfigurationProperties * 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.zero.context.annotation.EnableConfigurationProperties *
      • Add form login for user facing resources: add a * {@link WebSecurityConfigurerAdapter} and use {@link HttpSecurity#formLogin()}
        • *
      - * + * * @author Dave Syer */ @Configuration diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java index 05428e2159..832c81a8eb 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java @@ -61,7 +61,8 @@ public class ShutdownEndpoint extends AbstractEndpoint> impl public void run() { try { Thread.sleep(500L); - } catch (InterruptedException e) { + } + catch (InterruptedException e) { } ShutdownEndpoint.this.context.close(); } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java index 19b7468b4a..3c36e5d2ee 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java @@ -112,7 +112,8 @@ public class EndpointHandlerAdapter implements HandlerAdapter { } } throw new HttpMediaTypeNotAcceptableException(this.allSupportedMediaTypes); - } finally { + } + finally { outputMessage.close(); } } @@ -179,7 +180,8 @@ public class EndpointHandlerAdapter implements HandlerAdapter { if (mediaType.isConcrete()) { selectedMediaType = mediaType; break; - } else if (mediaType.equals(MediaType.ALL) + } + else if (mediaType.equals(MediaType.ALL) || mediaType.equals(MEDIA_TYPE_APPLICATION)) { selectedMediaType = MediaType.APPLICATION_OCTET_STREAM; break; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java index 763801457f..bdb9110aa9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java @@ -54,7 +54,8 @@ public class DefaultCounterService implements CounterService { private String wrap(String metricName) { if (metricName.startsWith("counter")) { return metricName; - } else { + } + else { return "counter." + metricName; } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java index b262f0cec3..1b47d4d63a 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java @@ -43,7 +43,8 @@ public class DefaultGaugeService implements GaugeService { private String wrap(String metricName) { if (metricName.startsWith("gauge")) { return metricName; - } else { + } + else { return "gauge." + metricName; } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java index d16614aa51..3c11311a4c 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java @@ -37,7 +37,8 @@ public class InMemoryMetricRepository implements MetricRepository { Metric metric = current.getMetric(); this.metrics.replace(metricName, current, new Measurement(timestamp, metric.increment(amount))); - } else { + } + else { this.metrics.putIfAbsent(metricName, new Measurement(timestamp, new Metric( metricName, amount))); } @@ -50,7 +51,8 @@ public class InMemoryMetricRepository implements MetricRepository { Metric metric = current.getMetric(); this.metrics.replace(metricName, current, new Measurement(timestamp, metric.set(value))); - } else { + } + else { this.metrics.putIfAbsent(metricName, new Measurement(timestamp, new Metric( metricName, value))); } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java index a33dd40f17..57b45583cd 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java @@ -48,9 +48,11 @@ public class AuthenticationAuditListener implements public void onApplicationEvent(AbstractAuthenticationEvent event) { if (event instanceof AbstractAuthenticationFailureEvent) { onAuthenticationFailureEvent((AbstractAuthenticationFailureEvent) event); - } else if (event instanceof AuthenticationSwitchUserEvent) { + } + else if (event instanceof AuthenticationSwitchUserEvent) { onAuthenticationSwitchUserEvent((AuthenticationSwitchUserEvent) event); - } else { + } + else { onAuthenticationEvent(event); } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java index d11d03a329..5723a5e5df 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java @@ -48,7 +48,8 @@ public class AuthorizationAuditListener implements public void onApplicationEvent(AbstractAuthorizationEvent event) { if (event instanceof AuthenticationCredentialsNotFoundEvent) { onAuthenticationCredentialsNotFoundEvent((AuthenticationCredentialsNotFoundEvent) event); - } else if (event instanceof AuthorizationFailureEvent) { + } + else if (event instanceof AuthorizationFailureEvent) { onAuthorizationFailureEvent((AuthorizationFailureEvent) event); } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java index 9ce56289ea..fd87256609 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java @@ -101,7 +101,8 @@ public class WebRequestTraceFilter implements Filter, Ordered { .get("headers"); this.logger.trace("Headers: " + this.objectMapper.writeValueAsString(headers)); - } catch (JsonProcessingException e) { + } + catch (JsonProcessingException e) { throw new IllegalStateException("Cannot create JSON", e); } } @@ -121,7 +122,8 @@ public class WebRequestTraceFilter implements Filter, Ordered { Object value = values; if (values.size() == 1) { value = values.get(0); - } else if (values.isEmpty()) { + } + else if (values.isEmpty()) { value = ""; } map.put(name, value); diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java index 206407180b..ec1d61cd27 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java @@ -76,7 +76,8 @@ public class BasicErrorController implements ErrorController { if (obj != null) { status = (Integer) obj; map.put("error", HttpStatus.valueOf(status).getReasonPhrase()); - } else { + } + else { map.put("error", "None"); } map.put("status", status); @@ -94,12 +95,14 @@ public class BasicErrorController implements ErrorController { map.put("trace", stackTrace.toString()); } this.logger.error(error); - } else { + } + else { Object message = request.getAttribute("javax.servlet.error.message"); map.put("message", message == null ? "No message available" : message); } return map; - } catch (Exception e) { + } + catch (Exception e) { map.put("error", e.getClass().getName()); map.put("message", e.getMessage()); this.logger.error(e); diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index c47a1e603e..6724007ec6 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -61,7 +61,8 @@ public class EndpointWebMvcAutoConfigurationTests { public void close() { try { this.applicationContext.close(); - } catch (Exception ex) { + } + catch (Exception ex) { } } @@ -168,10 +169,12 @@ public class EndpointWebMvcAutoConfigurationTests { String actual = StreamUtils.copyToString(response.getBody(), Charset.forName("UTF-8")); assertThat(actual, equalTo(expected)); - } finally { + } + finally { response.close(); } - } catch (Exception ex) { + } + catch (Exception ex) { if (expected == null) { if (SocketException.class.isInstance(ex) || FileNotFoundException.class.isInstance(ex)) { diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java index 1eb5e34f82..a82fd13e7b 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java @@ -40,7 +40,8 @@ public abstract class AutoConfigurationUtils { public static List getBasePackages(BeanFactory beanFactory) { try { return beanFactory.getBean(BASE_PACKAGES_BEAN, List.class); - } catch (NoSuchBeanDefinitionException e) { + } + catch (NoSuchBeanDefinitionException e) { return Collections.emptyList(); } } @@ -50,7 +51,8 @@ public abstract class AutoConfigurationUtils { if (!beanFactory.containsBean(BASE_PACKAGES_BEAN)) { beanFactory.registerSingleton(BASE_PACKAGES_BEAN, new ArrayList( basePackages)); - } else { + } + else { List packages = getBasePackages(beanFactory); for (String pkg : basePackages) { if (packages.contains(pkg)) { diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java index fb7f497d7d..e72c92d105 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java @@ -58,7 +58,8 @@ public class BasicDataSourceConfiguration extends AbstractDataSourceConfiguratio if (this.pool != null) { try { this.pool.close(); - } catch (SQLException e) { + } + catch (SQLException e) { throw new DataAccessResourceFailureException( "Could not close data source", e); } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java index f94aac2fc0..3b8d1e0a11 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -78,7 +78,8 @@ public abstract class JpaAutoConfiguration implements BeanFactoryAware { .getBeanDefinition("dataSource"); return EmbeddedDatabaseConfiguration.class.getName().equals( beanDefinition.getFactoryBeanName()); - } catch (NoSuchBeanDefinitionException e) { + } + catch (NoSuchBeanDefinitionException e) { return false; } } @@ -89,7 +90,8 @@ public abstract class JpaAutoConfiguration implements BeanFactoryAware { protected DataSource getDataSource() { try { return this.beanFactory.getBean("dataSource", DataSource.class); - } catch (RuntimeException e) { + } + catch (RuntimeException e) { return this.beanFactory.getBean(DataSource.class); } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 7ced0ad9a0..c476e8d3df 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -84,7 +84,8 @@ public class ThymeleafAutoConfiguration { try { return DefaultTemplateResolverConfiguration.this.resourceLoader .getResource(resourceName).getInputStream(); - } catch (IOException e) { + } + catch (IOException e) { return null; } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java index 0b9cdec01a..3c9995eefe 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java @@ -56,7 +56,7 @@ import org.springframework.zero.context.annotation.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link EnableWebMvc Web MVC}. - * + * * @author Phillip Webb * @author Dave Syer */ diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java index d119823f60..dc1d31d1aa 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java @@ -143,7 +143,8 @@ class AutoConfigurationSorter { if (this.after == null) { if (this.afterAnnotation == null) { this.after = Collections.emptyList(); - } else { + } + else { this.after = new ArrayList(); for (String afterClass : (String[]) this.afterAnnotation.get("value")) { this.after.add(new AutoConfigurationClass(afterClass)); diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java index f8f4509953..e6ce10fa44 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java @@ -70,7 +70,8 @@ class ComponentScanDetector implements ImportBeanDefinitionRegistrar, BeanFactor private void storeComponentScanBasePackages() { if (this.beanFactory instanceof ConfigurableListableBeanFactory) { storeComponentScanBasePackages((ConfigurableListableBeanFactory) this.beanFactory); - } else { + } + else { if (this.logger.isWarnEnabled()) { this.logger .warn("Unable to read @ComponentScan annotations for auto-configure"); @@ -109,7 +110,8 @@ class ComponentScanDetector implements ImportBeanDefinitionRegistrar, BeanFactor MetadataReader metadataReader = this.metadataReaderFactory .getMetadataReader(className); return metadataReader.getAnnotationMetadata(); - } catch (IOException ex) { + } + catch (IOException ex) { if (this.logger.isDebugEnabled()) { this.logger.debug( "Could not find class file for introspecting @ComponentScan classes: " diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java index 45ad64e0db..c49e33449d 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java @@ -69,7 +69,8 @@ class EnableAutoConfigurationImportSelector implements DeferredImportSelector, factories.add(0, ComponentScanDetector.class.getName()); return factories.toArray(new String[factories.size()]); - } catch (IOException ex) { + } + catch (IOException ex) { throw new IllegalStateException(ex); } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java index 37b7374463..7695a544ab 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java @@ -70,11 +70,14 @@ public class Spring { for (String arg : args) { if (ClassUtils.isPresent(arg, null)) { sources.add(ClassUtils.forName(arg, null)); - } else if (arg.endsWith(".xml")) { + } + else if (arg.endsWith(".xml")) { sources.add(arg); - } else if (!scanner.findCandidateComponents(arg).isEmpty()) { + } + else if (!scanner.findCandidateComponents(arg).isEmpty()) { sources.add(arg); - } else { + } + else { strings.add(arg); } } diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java index 16747a30c8..6fe70f501f 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java @@ -56,8 +56,8 @@ public class ServerPropertiesAutoConfigurationTests { @Before public void init() { - containerFactory = - Mockito.mock(ConfigurableEmbeddedServletContainerFactory.class); + containerFactory = Mockito + .mock(ConfigurableEmbeddedServletContainerFactory.class); } @After @@ -70,8 +70,8 @@ public class ServerPropertiesAutoConfigurationTests { @Test public void createFromConfigClass() throws Exception { this.context = new AnnotationConfigEmbeddedWebApplicationContext(); - this.context - .register(Config.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); + this.context.register(Config.class, ServerPropertiesAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class); TestUtils.addEnviroment(this.context, "server.port:9000"); this.context.refresh(); ServerProperties server = this.context.getBean(ServerProperties.class); @@ -84,8 +84,8 @@ public class ServerPropertiesAutoConfigurationTests { public void tomcatProperties() throws Exception { containerFactory = Mockito.mock(TomcatEmbeddedServletContainerFactory.class); this.context = new AnnotationConfigEmbeddedWebApplicationContext(); - this.context - .register(Config.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); + this.context.register(Config.class, ServerPropertiesAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class); TestUtils.addEnviroment(this.context, "server.tomcat.basedir:target/foo"); this.context.refresh(); ServerProperties server = this.context.getBean(ServerProperties.class); @@ -97,8 +97,9 @@ public class ServerPropertiesAutoConfigurationTests { @Test public void testAccidentalMultipleServerPropertiesBeans() throws Exception { this.context = new AnnotationConfigEmbeddedWebApplicationContext(); - this.context - .register(Config.class, MutiServerPropertiesBeanConfig.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); + this.context.register(Config.class, MutiServerPropertiesBeanConfig.class, + ServerPropertiesAutoConfiguration.class, + PropertyPlaceholderAutoConfiguration.class); this.thrown.expectCause(Matchers . instanceOf(NoUniqueBeanDefinitionException.class)); this.context.refresh(); @@ -113,8 +114,7 @@ public class ServerPropertiesAutoConfigurationTests { } @Bean - public EmbeddedServletContainerCustomizerBeanPostProcessor - embeddedServletContainerCustomizerBeanPostProcessor() { + public EmbeddedServletContainerCustomizerBeanPostProcessor embeddedServletContainerCustomizerBeanPostProcessor() { return new EmbeddedServletContainerCustomizerBeanPostProcessor(); } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java index a2002c313d..ec73d328fb 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java @@ -24,14 +24,14 @@ import java.util.ServiceLoader; import java.util.Set; /** - * Spring Zero Command Line Interface. This is the main entry-point for the Spring - * Zero command line application. This class will parse input arguments and delegate - * to a suitable {@link Command} implementation based on the first argument. - * + * Spring 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 SpringZeroCliException @@ -47,8 +47,7 @@ public class SpringZeroCli { private List commands; /** - * Create a new {@link SpringZeroCli} implementation with the default set of - * commands. + * Create a new {@link SpringZeroCli} implementation with the default set of commands. */ public SpringZeroCli() { setCommands(ServiceLoader.load(CommandFactory.class, getClass().getClassLoader())); @@ -87,10 +86,12 @@ public class SpringZeroCli { try { run(argsWithoutDebugFlags); return 0; - } catch (NoArgumentsException ex) { + } + catch (NoArgumentsException ex) { showUsage(); return 1; - } catch (Exception ex) { + } + catch (Exception ex) { Set options = NO_EXCEPTION_OPTIONS; if (ex instanceof SpringZeroCliException) { options = ((SpringZeroCliException) ex).getOptions(); diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java index 3a53ef7a97..346eb21325 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java @@ -70,8 +70,7 @@ public class SpringZeroCliException extends RuntimeException { } /** - * Returns options a set of options that are understood by the - * {@link SpringZeroCli}. + * Returns options a set of options that are understood by the {@link SpringZeroCli}. */ public Set

    • {@link CompilerAutoConfiguration} strategies will be read from * 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 */ @@ -88,7 +88,8 @@ public class GroovyCompiler { for (File file : files) { if (file.getName().endsWith(".groovy") || file.getName().endsWith(".java")) { compilables.add(file); - } else { + } + else { others.add(file); } } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index b7e0b8ff74..6355e058fc 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java @@ -24,7 +24,7 @@ import org.springframework.zero.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring MVC. - * + * * @author Dave Syer * @author Phillip Webb */ @@ -58,8 +58,8 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio imports.addStarImports("org.springframework.web.bind.annotation", "org.springframework.web.servlet.config.annotation", "org.springframework.http"); - imports.addStaticImport( - "org.springframework.zero.cli.template.GroovyTemplate", "template"); + imports.addStaticImport("org.springframework.zero.cli.template.GroovyTemplate", + "template"); } } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java index 875078768d..35d7020312 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java @@ -100,7 +100,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati AnnotationNode annotationNode = new AnnotationNode(new ClassNode( annotationClass)); classNode.addAnnotation(annotationNode); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { throw new IllegalStateException(e); } } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java index 5f6b3be7a0..584fd1a242 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java @@ -92,10 +92,12 @@ public class SpringZeroRunner { this.fileWatchThread.start(); } - } catch (Exception ex) { + } + catch (Exception ex) { if (this.fileWatchThread == null) { throw ex; - } else { + } + else { ex.printStackTrace(); } } @@ -132,7 +134,8 @@ public class SpringZeroRunner { String[].class); this.applicationContext = method.invoke(null, this.sources, SpringZeroRunner.this.args); - } catch (Exception ex) { + } + catch (Exception ex) { ex.printStackTrace(); } } @@ -145,11 +148,14 @@ public class SpringZeroRunner { try { Method method = this.applicationContext.getClass().getMethod("close"); method.invoke(this.applicationContext); - } catch (NoSuchMethodException ex) { + } + catch (NoSuchMethodException ex) { // Not an application context that we can close - } catch (Exception ex) { + } + catch (Exception ex) { ex.printStackTrace(); - } finally { + } + finally { this.applicationContext = null; } } @@ -186,9 +192,11 @@ public class SpringZeroRunner { compileAndRun(); } } - } catch (InterruptedException ex) { + } + catch (InterruptedException ex) { Thread.currentThread().interrupt(); - } catch (Exception ex) { + } + catch (Exception ex) { // Swallow, will be reported by compileAndRun } } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java index 936e6a7b66..0494b36ce5 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java @@ -48,10 +48,12 @@ public class GroovyTemplate { Template template; if (file.exists()) { template = engine.createTemplate(file); - } else { + } + else { if (resource != null) { template = engine.createTemplate(resource); - } else { + } + else { template = engine.createTemplate(name); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java b/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java index 8c0944abb1..c4b02b652f 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java @@ -138,7 +138,8 @@ class BeanDefinitionLoader { if (source instanceof CharSequence) { try { return load(Class.forName(source.toString())); - } catch (ClassNotFoundException e) { + } + catch (ClassNotFoundException e) { } Resource loadedResource = (this.resourceLoader != null ? this.resourceLoader diff --git a/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java index b653a3133f..e5114a2ff3 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java @@ -270,7 +270,8 @@ public class SpringApplication { contextClass = Class .forName(this.webEnvironment ? DEFAULT_WEB_CONTEXT_CLASS : DEFAULT_CONTEXT_CLASS); - } catch (ClassNotFoundException ex) { + } + catch (ClassNotFoundException ex) { throw new IllegalStateException( "Unable create a default ApplicationContext, " + "please specify an ApplicationContextClass", ex); @@ -344,14 +345,16 @@ public class SpringApplication { for (String arg : defaults) { if (isOptionArg(arg)) { addOptionArg(options, arg); - } else { + } + else { nonopts.add(arg); } } for (String arg : args) { if (isOptionArg(arg)) { addOptionArg(options, arg); - } else if (!nonopts.contains(arg)) { + } + else if (!nonopts.contains(arg)) { nonopts.add(arg); } } @@ -376,7 +379,8 @@ public class SpringApplication { optionName = optionText.substring(0, optionText.indexOf("=")); optionValue = optionText.substring(optionText.indexOf("=") + 1, optionText.length()); - } else { + } + else { optionName = optionText; } if (optionName.isEmpty()) { @@ -434,7 +438,8 @@ public class SpringApplication { for (CommandLineRunner runner : runners) { try { runner.run(args); - } catch (Exception e) { + } + catch (Exception e) { throw new IllegalStateException("Failed to execute CommandLineRunner", e); } } @@ -606,11 +611,13 @@ public class SpringApplication { generators.addAll(context.getBeansOfType(ExitCodeGenerator.class) .values()); exitCode = getExitCode(generators); - } finally { + } + finally { close(context); } - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); exitCode = (exitCode == 0 ? 1 : exitCode); } @@ -625,7 +632,8 @@ public class SpringApplication { if (value > 0 && value > exitCode || value < 0 && value < exitCode) { exitCode = value; } - } catch (Exception e) { + } + catch (Exception e) { exitCode = (exitCode == 0 ? 1 : exitCode); e.printStackTrace(); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java index afa626ccde..a0f2d05f19 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java @@ -74,7 +74,8 @@ public class CustomPropertyConstructor extends Constructor { try { typeMap.put(alias, this.propertyUtils.getProperty(type, name)); - } catch (IntrospectionException e) { + } + catch (IntrospectionException e) { throw new RuntimeException(e); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java index 12dce4d552..f294c12844 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java @@ -37,7 +37,8 @@ public class InetAddressEditor extends PropertyEditorSupport implements Property public void setAsText(String text) throws IllegalArgumentException { try { setValue(InetAddress.getByName(text)); - } catch (UnknownHostException e) { + } + catch (UnknownHostException e) { throw new IllegalArgumentException("Cannot locate host", e); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java index 6020613eda..3eef9aa712 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java @@ -172,7 +172,8 @@ public class PropertiesConfigurationFactory implements FactoryBean, try { if (this.properties != null) { logger.trace("Properties:\n" + this.properties); - } else { + } + else { logger.trace("Property Sources: " + this.propertySources); } this.initialized = true; @@ -180,7 +181,8 @@ public class PropertiesConfigurationFactory implements FactoryBean, RelaxedDataBinder dataBinder; if (this.targetName != null) { dataBinder = new RelaxedDataBinder(this.configuration, this.targetName); - } else { + } + else { dataBinder = new RelaxedDataBinder(this.configuration); } if (this.validator != null) { @@ -195,7 +197,8 @@ public class PropertiesConfigurationFactory implements FactoryBean, PropertyValues pvs; if (this.properties != null) { pvs = new MutablePropertyValues(this.properties); - } else { + } + else { pvs = new PropertySourcesPropertyValues(this.propertySources); } dataBinder.bind(pvs); @@ -219,7 +222,8 @@ public class PropertiesConfigurationFactory implements FactoryBean, } } } - } catch (BindException e) { + } + catch (BindException e) { if (this.exceptionIfInvalid) { throw e; } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java index 89868b610f..671af9ce01 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java @@ -98,7 +98,8 @@ public class PropertySourcesPropertyValues implements PropertyValues { PropertyValue pvOld = old.getPropertyValue(newPv.getName()); if (pvOld == null) { changes.addPropertyValue(newPv); - } else if (!pvOld.equals(newPv)) { + } + else if (!pvOld.equals(newPv)) { // it's changed changes.addPropertyValue(newPv); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java index b1e980a6d4..430fbfd4bc 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java @@ -157,7 +157,8 @@ public class RelaxedDataBinder extends DataBinder { Map existing = (Map) target .getPropertyValue(base); nested = existing; - } else { + } + else { target.setPropertyValue(base, nested); } modifyPopertiesForMap(nested, propertyValues, index, base); @@ -196,7 +197,8 @@ public class RelaxedDataBinder extends DataBinder { if (target.getPropertyType(prefix + candidate) != null) { return candidate; } - } catch (InvalidPropertyException ex) { + } + catch (InvalidPropertyException ex) { } } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java index dbe8a41f14..4e86bebf6b 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java @@ -158,7 +158,8 @@ public class YamlConfigurationFactory implements FactoryBean, MessageSourc } } } - } catch (YAMLException e) { + } + catch (YAMLException e) { if (this.exceptionIfInvalid) { throw e; } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java index 71a5dc6666..be4780c83c 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java @@ -34,7 +34,8 @@ public class JacksonJsonParser implements JsonParser { @SuppressWarnings("unchecked") Map map = new ObjectMapper().readValue(json, Map.class); return map; - } catch (Exception e) { + } + catch (Exception e) { throw new IllegalArgumentException("Cannot parse JSON", e); } } @@ -45,7 +46,8 @@ public class JacksonJsonParser implements JsonParser { @SuppressWarnings("unchecked") List list = new ObjectMapper().readValue(json, List.class); return list; - } catch (Exception e) { + } + catch (Exception e) { throw new IllegalArgumentException("Cannot parse JSON", e); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java index dd37558a41..742d82b3f0 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java @@ -39,7 +39,8 @@ public class SimpleJsonParser implements JsonParser { public Map parseMap(String json) { if (json.startsWith("{")) { return parseMapInternal(json); - } else if (json.trim().equals("")) { + } + else if (json.trim().equals("")) { return new HashMap(); } return null; @@ -49,7 +50,8 @@ public class SimpleJsonParser implements JsonParser { public List parseList(String json) { if (json.startsWith("[")) { return parseListInternal(json); - } else if (json.trim().equals("")) { + } + else if (json.trim().equals("")) { return new ArrayList(); } return null; @@ -104,7 +106,8 @@ public class SimpleJsonParser implements JsonParser { trimTrailingCharacter(values[1], '"'), '"'); if (string.startsWith("{") && string.endsWith("}")) { value = parseInternal(string); - } else { + } + else { value = string; } } @@ -129,7 +132,8 @@ public class SimpleJsonParser implements JsonParser { if (current == ',' && inObject == 0) { list.add(build.toString()); build.setLength(0); - } else { + } + else { build.append(current); } index++; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java index c2fc5131ee..fa87770770 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java @@ -99,7 +99,8 @@ public class YamlMapFactoryBean extends YamlProcessor implements (Map) existing); merge(result, (Map) value); output.put(key, result); - } else { + } + else { output.put(key, value); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java index d9a93c1d61..14764108b5 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java @@ -179,14 +179,16 @@ public class YamlProcessor { // No need to load any more resources break; } - } catch (IOException e) { + } + catch (IOException e) { if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND || this.resolutionMethod == ResolutionMethod.OVERRIDE_AND_IGNORE) { if (logger.isWarnEnabled()) { logger.warn("Could not load map from " + resource + ": " + e.getMessage()); } - } else { + } + else { throw new IllegalStateException(e); } } @@ -199,7 +201,8 @@ public class YamlProcessor { if (this.documentMatchers.isEmpty()) { logger.debug("Merging document (no matchers set)" + map); callback.process(properties, map); - } else { + } + else { boolean valueFound = false; MatchStatus result = MatchStatus.ABSTAIN; for (DocumentMatcher matcher : this.documentMatchers) { @@ -216,7 +219,8 @@ public class YamlProcessor { if (result == MatchStatus.ABSTAIN && this.matchDefault) { logger.debug("Matched document with default matcher: " + map); callback.process(properties, map); - } else if (!valueFound) { + } + else if (!valueFound) { logger.debug("Unmatched document"); return false; } @@ -231,19 +235,22 @@ public class YamlProcessor { if (StringUtils.hasText(path)) { if (key.startsWith("[")) { key = path + key; - } else { + } + else { key = path + "." + key; } } Object value = entry.getValue(); if (value instanceof String) { properties.put(key, value); - } else if (value instanceof Map) { + } + else if (value instanceof Map) { // Need a compound key @SuppressWarnings("unchecked") Map map = (Map) value; assignProperties(properties, map, key); - } else if (value instanceof Collection) { + } + else if (value instanceof Collection) { // Need a compound key @SuppressWarnings("unchecked") Collection collection = (Collection) value; @@ -254,7 +261,8 @@ public class YamlProcessor { assignProperties(properties, Collections.singletonMap("[" + (count++) + "]", object), key); } - } else { + } + else { properties.put(key, value == null ? "" : value); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java index 474dfaab03..995ce9d72d 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java @@ -78,7 +78,8 @@ abstract class AbstractOnBeanCondition implements ConfigurationCondition { } } }); - } catch (Exception e) { + } + catch (Exception e) { } } } @@ -116,7 +117,8 @@ abstract class AbstractOnBeanCondition implements ConfigurationCondition { if (beans.length != 0) { beanClassesFound.add(beanClass); } - } catch (ClassNotFoundException ex) { + } + catch (ClassNotFoundException ex) { } } for (String beanName : beanNames) { @@ -142,7 +144,8 @@ abstract class AbstractOnBeanCondition implements ConfigurationCondition { + candidates); if (found.isEmpty()) { this.logger.debug(prefix + "Found no beans"); - } else { + } + else { this.logger.debug(prefix + "Found beans with " + type + ": " + found); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java index a45657131e..d55e12e20d 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java @@ -77,10 +77,12 @@ public class ConfigurationPropertiesBindingConfiguration { if (this.configurer != null) { propertySources = extractPropertySources(this.configurer); - } else if (this.environment instanceof ConfigurableEnvironment) { + } + else if (this.environment instanceof ConfigurableEnvironment) { propertySources = flattenPropertySources(((ConfigurableEnvironment) this.environment) .getPropertySources()); - } else { + } + else { // empty, so not very useful, but fulfils the contract propertySources = new MutablePropertySources(); } @@ -121,7 +123,8 @@ public class ConfigurationPropertiesBindingConfiguration { for (PropertySource childSource : environment.getPropertySources()) { flattenPropertySources(childSource, result); } - } else { + } + else { result.addLast(propertySource); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java index 8dc449aabc..557dd2b3c6 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java @@ -113,9 +113,11 @@ public class PropertySourcesBindingPostProcessor implements BeanPostProcessor, factory.setTargetName(targetName); try { target = factory.getObject(); // throwaway - } catch (BeansException e) { + } + catch (BeansException e) { throw e; - } catch (Exception e) { + } + catch (Exception e) { throw new BeanCreationException(beanName, "Could not bind", e); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java index bfd8ffc37b..663e6f0214 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -378,7 +378,8 @@ public abstract class AbstractEmbeddedServletContainerFactory implements path = path.substring(0, path.indexOf("!/")); } return new File(path); - } catch (IOException e) { + } + catch (IOException e) { return null; } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java index d6c2a701b6..d3030fe970 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java @@ -131,10 +131,12 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext EmbeddedServletContainerFactory containerFactory = getEmbeddedServletContainerFactory(); this.embeddedServletContainer = containerFactory .getEmbeddedServletContainer(getSelfInitializer()); - } else if (getServletContext() != null) { + } + else if (getServletContext() != null) { try { getSelfInitializer().onStartup(getServletContext()); - } catch (ServletException e) { + } + catch (ServletException e) { throw new ApplicationContextException( "Cannot initialize servlet context", e); } @@ -280,12 +282,14 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext logger.info("Root WebApplicationContext: initialization completed in " + elapsedTime + " ms"); } - } catch (RuntimeException ex) { + } + catch (RuntimeException ex) { logger.error("Context initialization failed", ex); servletContext.setAttribute( WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, ex); throw ex; - } catch (Error err) { + } + catch (Error err) { logger.error("Context initialization failed", err); servletContext.setAttribute( WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE, err); @@ -312,7 +316,8 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext try { this.embeddedServletContainer.stop(); this.embeddedServletContainer = null; - } catch (Exception ex) { + } + catch (Exception ex) { throw new IllegalStateException(ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java index 88acba859a..e2699dd282 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java @@ -244,7 +244,8 @@ public class FilterRegistrationBean extends RegistrationBean { if (servletNames.isEmpty() && this.urlPatterns.isEmpty()) { registration.addMappingForUrlPatterns(dispatcherTypes, this.matchAfter, DEFAULT_URL_MAPPINGS); - } else { + } + else { if (servletNames.size() > 0) { registration.addMappingForServletNames(dispatcherTypes, this.matchAfter, servletNames.toArray(new String[servletNames.size()])); diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java index 080a0af573..052c7e27d2 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java @@ -46,7 +46,8 @@ public class JettyEmbeddedServletContainer implements EmbeddedServletContainer { private synchronized void start() { try { this.server.start(); - } catch (Exception ex) { + } + catch (Exception ex) { throw new EmbeddedServletContainerException( "Unable to start embedded Jetty servlet container", ex); } @@ -56,10 +57,12 @@ public class JettyEmbeddedServletContainer implements EmbeddedServletContainer { public synchronized void stop() { try { this.server.stop(); - } catch (InterruptedException ex) { + } + catch (InterruptedException ex) { Thread.currentThread().interrupt(); // No drama - } catch (Exception ex) { + } + catch (Exception ex) { throw new EmbeddedServletContainerException( "Unable to stop embedded Jetty servlet container", ex); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 9e6e016a0d..50ebb61aed 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -132,7 +132,8 @@ public class JettyEmbeddedServletContainerFactory extends if (root != null) { try { handler.setBaseResource(Resource.newResource(root)); - } catch (Exception ex) { + } + catch (Exception ex) { throw new IllegalStateException(ex); } } @@ -270,11 +271,13 @@ public class JettyEmbeddedServletContainerFactory extends if (errorPage.isGlobal()) { handler.addErrorPage(ErrorPageErrorHandler.GLOBAL_ERROR_PAGE, errorPage.getPath()); - } else { + } + else { if (errorPage.getExceptionName() != null) { handler.addErrorPage(errorPage.getExceptionName(), errorPage.getPath()); - } else { + } + else { handler.addErrorPage(errorPage.getStatusCode(), errorPage.getPath()); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java index a52d40fbe8..d5f4a869a3 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java @@ -52,7 +52,8 @@ public class ServletContextInitializerLifecycleListener implements LifecycleList for (ServletContextInitializer initializer : this.initializers) { try { initializer.onStartup(standardContext.getServletContext()); - } catch (ServletException ex) { + } + catch (ServletException ex) { throw new IllegalStateException(ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index 908c2129a3..9caf560d92 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -57,7 +57,8 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer }; awaitThread.setDaemon(false); awaitThread.start(); - } catch (Exception ex) { + } + catch (Exception ex) { throw new EmbeddedServletContainerException( "Unable to start embdedded Tomcat", ex); } @@ -68,10 +69,12 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer try { try { this.tomcat.stop(); - } catch (LifecycleException e) { + } + catch (LifecycleException e) { } this.tomcat.destroy(); - } catch (Exception ex) { + } + catch (Exception ex) { throw new EmbeddedServletContainerException( "Unable to stop embdedded Tomcat", ex); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index f40ce43d41..18857f4865 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -118,7 +118,8 @@ public class TomcatEmbeddedServletContainerFactory extends this.connector.setPort(getPort()); this.tomcat.getService().addConnector(this.connector); this.tomcat.setConnector(this.connector); - } else { + } + else { Connector connector = new Connector( "org.apache.coyote.http11.Http11NioProtocol"); customizeConnector(connector); @@ -246,7 +247,8 @@ public class TomcatEmbeddedServletContainerFactory extends tempFolder.mkdir(); tempFolder.deleteOnExit(); return tempFolder; - } catch (IOException ex) { + } + catch (IOException ex) { throw new EmbeddedServletContainerException( "Unable to create Tomcat tempdir", ex); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java index 32a71287ec..1c4c4eef33 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java @@ -194,11 +194,13 @@ public class ConfigFileApplicationContextInitializer implements new PropertiesPropertySource(resource.getDescription(), properties)); - } else { + } + else { propertySources.addFirst(new PropertiesPropertySource(resource .getDescription(), properties)); } - } catch (IOException e) { + } + catch (IOException e) { throw new IllegalStateException("Could not load properties file from " + resource, e); } @@ -252,7 +254,8 @@ public class ConfigFileApplicationContextInitializer implements } // matches default profile return MatchStatus.FOUND; - } else { + } + else { return MatchStatus.NOT_FOUND; } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java index 28309fa639..454d939bc7 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java @@ -77,7 +77,8 @@ public class ContextIdApplicationContextInitializer implements index = environment.getProperty("spring.application.index", Integer.class, index); if (index >= 0) { name = name + ":" + index; - } else { + } + else { // FIXME do we want this String profiles = StringUtils.arrayToCommaDelimitedString(environment .getActiveProfiles()); diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java index 29f7253ba0..839af13ad1 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java @@ -95,7 +95,8 @@ public class EnvironmentDelegateApplicationContextInitializer implements "class [" + className + "] must implement ApplicationContextInitializer"); classes.add((Class>) clazz); - } catch (ClassNotFoundException ex) { + } + catch (ClassNotFoundException ex) { throw new ApplicationContextException( "Failed to load context initializer class [" + className + "]", ex); diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java index 1533f726b1..0809d0475b 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java @@ -170,9 +170,11 @@ public class LoggingApplicationContextInitializer implements String configLocation = getConfigLocation(applicationContext); try { doInit(applicationContext, configLocation); - } catch (RuntimeException ex) { + } + catch (RuntimeException ex) { throw ex; - } catch (Exception ex) { + } + catch (Exception ex) { throw new IllegalStateException("Cannot initialize logging from " + configLocation, ex); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java index 0b04861471..a981cb6a6e 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java @@ -121,7 +121,8 @@ public class VcapApplicationContextInitializer implements CommandLinePropertySource.COMMAND_LINE_PROPERTY_SOURCE_NAME, new PropertiesPropertySource("vcap", properties)); - } else { + } + else { propertySources.addFirst(new PropertiesPropertySource("vcap", properties)); } @@ -168,19 +169,22 @@ public class VcapApplicationContextInitializer implements if (StringUtils.hasText(path)) { if (key.startsWith("[")) { key = path + key; - } else { + } + else { key = path + "." + key; } } Object value = entry.getValue(); if (value instanceof String) { properties.put(key, value); - } else if (value instanceof Map) { + } + else if (value instanceof Map) { // Need a compound key @SuppressWarnings("unchecked") Map map = (Map) value; flatten(properties, map, key); - } else if (value instanceof Collection) { + } + else if (value instanceof Collection) { // Need a compound key @SuppressWarnings("unchecked") Collection collection = (Collection) value; @@ -191,7 +195,8 @@ public class VcapApplicationContextInitializer implements flatten(properties, Collections.singletonMap("[" + (count++) + "]", object), key); } - } else { + } + else { properties.put(key, value == null ? "" : value); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java b/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java index 56f723a392..4213bf5636 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java @@ -40,11 +40,14 @@ public abstract class JavaLoggerConfigurer { try { LogManager.getLogManager().readConfiguration( ResourceUtils.getURL(resolvedLocation).openStream()); - } catch (FileNotFoundException e) { + } + catch (FileNotFoundException e) { throw e; - } catch (RuntimeException e) { + } + catch (RuntimeException e) { throw e; - } catch (Exception e) { + } + catch (Exception e) { throw new IllegalArgumentException("Could not initialize logging from " + location, e); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java b/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java index 94bb113e4d..63da7cf340 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java @@ -47,7 +47,8 @@ public abstract class LogbackConfigurer { context.stop(); try { new ContextInitializer(context).configureByResource(url); - } catch (JoranException e) { + } + catch (JoranException e) { throw new IllegalArgumentException("Could not initialize logging from " + location, e); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java index 68f35fff2a..2b2d22297e 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java @@ -42,7 +42,8 @@ public abstract class SpringServletInitializer implements WebApplicationInitiali // no-op because the application context is already initialized } }); - } else { + } + else { this.logger .debug("No ContextLoaderListener registered, as " + "createRootApplicationContext() did not return an application context"); diff --git a/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java b/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java index f6655ee8f7..44ba0a90a4 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java @@ -361,7 +361,8 @@ public class SpringApplicationTests { this.sources = sources; if (this.useMockLoader) { this.loader = mock(BeanDefinitionLoader.class); - } else { + } + else { this.loader = spy(super.createBeanDefinitionLoader(registry, sources)); } return this.loader; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index f3809ff084..ee17be4f4d 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -79,7 +79,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { if (this.container != null) { try { this.container.stop(); - } catch (Exception e) { + } + catch (Exception e) { } } } @@ -156,7 +157,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { try { Thread.sleep(500); date[0] = new Date(); - } catch (InterruptedException ex) { + } + catch (InterruptedException ex) { throw new ServletException(ex); } } @@ -249,7 +251,8 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { ClientHttpResponse response = request.execute(); try { return StreamUtils.copyToString(response.getBody(), Charset.forName("UTF-8")); - } finally { + } + finally { response.close(); } } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index 19d21b0ec3..dc50a6248b 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -55,7 +55,8 @@ public class EmbeddedServletContainerMvcIntegrationTests { public void closeContext() { try { this.context.close(); - } catch (Exception ex) { + } + catch (Exception ex) { } } @@ -90,7 +91,8 @@ public class EmbeddedServletContainerMvcIntegrationTests { String actual = StreamUtils.copyToString(response.getBody(), Charset.forName("UTF-8")); assertThat(actual, equalTo("Hello World")); - } finally { + } + finally { response.close(); } } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java index 7d1c229b61..e14ac2228e 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java @@ -132,7 +132,8 @@ public class MockEmbeddedServletContainerFactory extends for (ServletContextInitializer initializer : this.initializers) { initializer.onStartup(this.servletContext); } - } catch (ServletException ex) { + } + catch (ServletException ex) { throw new RuntimeException(ex); } } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java index 679ab701d8..fd80577b29 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java @@ -55,7 +55,8 @@ public abstract class Launcher { public void launch(String[] args) { try { launch(args, getClass().getProtectionDomain()); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); System.exit(1); } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java index 7980348878..e09a68e849 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java @@ -51,7 +51,8 @@ public class MainMethodRunner implements Runnable { + " does not have a main method"); } mainMethod.invoke(null, new Object[] { args }); - } catch (Exception e) { + } + catch (Exception e) { e.printStackTrace(); System.exit(1); } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java index c1f8682349..9d43172a8e 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java @@ -36,7 +36,8 @@ public class WarLauncher extends Launcher { protected boolean isNestedJarFile(JarEntry jarEntry) { if (jarEntry.isDirectory()) { return jarEntry.getName().equals("WEB-INF/classes/"); - } else { + } + else { return jarEntry.getName().startsWith("WEB-INF/lib/") || jarEntry.getName().startsWith("WEB-INF/lib-provided/"); } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java index 91a9c4e95e..01e6897133 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java @@ -163,10 +163,12 @@ public class RandomAccessDataFile implements RandomAccessData { int rtn = file.read(); moveOn(rtn == -1 ? 0 : 1); return rtn; - } else { + } + else { return (int) moveOn(file.read(b, off, (int) cap(len))); } - } finally { + } + finally { RandomAccessDataFile.this.filePool.release(file); } } @@ -222,7 +224,8 @@ public class RandomAccessDataFile implements RandomAccessData { RandomAccessFile file = this.files.poll(); return (file == null ? new RandomAccessFile( RandomAccessDataFile.this.file, "r") : file); - } catch (InterruptedException e) { + } + catch (InterruptedException e) { throw new IOException(e); } } @@ -241,10 +244,12 @@ public class RandomAccessDataFile implements RandomAccessData { file.close(); file = files.poll(); } - } finally { + } + finally { this.available.release(size); } - } catch (InterruptedException e) { + } + catch (InterruptedException e) { throw new IOException(e); } } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java index 8b47cbf14c..dc499e3bf5 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java @@ -127,7 +127,8 @@ public class RandomAccessJarFile extends JarFile { ((Entry) containedEntry).configure(this.manifest); } } - } finally { + } + finally { inputStream.close(); } } @@ -220,7 +221,8 @@ public class RandomAccessJarFile extends JarFile { return new RandomAccessJarFile(this.rootJarFile, getName() + "!/" + directoryName.substring(0, directoryName.length() - 1), this.data, filtersToUse); - } else { + } + else { if (ze.getMethod() != ZipEntry.STORED) { throw new IllegalStateException("Unable to open nested compressed entry " + ze.getName()); @@ -411,7 +413,8 @@ public class RandomAccessJarFile extends JarFile { connect(); return (int) (this.jarEntry == null ? this.jarFile.size() : this.jarEntry .getSize()); - } catch (IOException e) { + } + catch (IOException e) { return -1; } } @@ -453,7 +456,8 @@ public class RandomAccessJarFile extends JarFile { protected void fill() throws IOException { try { super.fill(); - } catch (EOFException ex) { + } + catch (EOFException ex) { if (this.extraBytesWritten) { throw ex; } diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java index 49f6be1c9c..596f8e9dbd 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java +++ b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java @@ -54,7 +54,8 @@ public class RandomAccessDataZipInputStreamTest { try { writeDataEntry(zipOutputStream, "a", new byte[10]); writeDataEntry(zipOutputStream, "b", new byte[20]); - } finally { + } + finally { zipOutputStream.close(); } } @@ -85,7 +86,8 @@ public class RandomAccessDataZipInputStreamTest { assertThat(entry2.getName(), equalTo("b")); assertThat(entry2.getData().getSize(), equalTo(20L)); assertThat(z.getNextEntry(), nullValue()); - } finally { + } + finally { z.close(); } } diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java index 051c6ab04c..2ad071c4d9 100644 --- a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java +++ b/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java @@ -93,7 +93,8 @@ public class RandomAccessJarFileTest { jarOutputStream.putNextEntry(nestedEntry); jarOutputStream.write(nestedJarData); jarOutputStream.closeEntry(); - } finally { + } + finally { jarOutputStream.close(); } this.jarFile = new RandomAccessJarFile(this.rootJarFile); diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java index bd68107bdf..01f36e0bfa 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java @@ -187,7 +187,8 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo { File archiveFile = createArchive(); if (this.classifier == null || this.classifier.isEmpty()) { this.project.getArtifact().setFile(archiveFile); - } else { + } + else { this.projectHelper.attachArtifact(this.project, getType(), this.classifier, archiveFile); } @@ -209,10 +210,12 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo { try { archiver.createArchive(this.session, this.project, this.archive); return archiveFile; - } finally { + } + finally { zipFile.close(); } - } catch (Exception ex) { + } + catch (Exception ex) { throw new MojoExecutionException("Error assembling archive", ex); } } @@ -306,7 +309,8 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo { throw new MojoExecutionException("Unable to resolve launcher classes"); } return addLauncherClasses(archiver, artifactResult.getArtifact().getFile()); - } catch (Exception ex) { + } + catch (Exception ex) { if (ex instanceof MojoExecutionException) { throw (MojoExecutionException) ex; } diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java index 03a1e81e72..630a664815 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java @@ -101,10 +101,12 @@ class MainClassFinder { MainMethodFinder mainMethodFinder = new MainMethodFinder(); classReader.accept(mainMethodFinder, ClassReader.SKIP_CODE); return mainMethodFinder.isFound(); - } finally { + } + finally { inputStream.close(); } - } catch (IOException ex) { + } + catch (IOException ex) { return false; } } diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java index 5b785f7e93..3dbbf70eee 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java @@ -87,7 +87,8 @@ public class MainClassFinderTests { OutputStream outputStream = new FileOutputStream(file); try { IOUtil.copy(inputStream, outputStream); - } finally { + } + finally { outputStream.close(); } return file; diff --git a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java index 45bb0d2b22..08095a6e88 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java @@ -34,7 +34,8 @@ public class SampleProfileApplicationTests { public void after() { if (this.profiles != null) { System.setProperty("spring.profiles.active", this.profiles); - } else { + } + else { System.clearProperty("spring.profiles.active"); } } diff --git a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java index a99ed5d3dc..a4bb5d3264 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java @@ -35,7 +35,8 @@ public class SampleSimpleApplicationTests { public void after() { if (this.profiles != null) { System.setProperty("spring.profiles.active", this.profiles); - } else { + } + else { System.clearProperty("spring.profiles.active"); } System.setOut(this.savedOutput); From 2c05e9f1500377becc4f71698a3d8da38851382f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sat, 6 Jul 2013 18:38:30 -0700 Subject: [PATCH 07/15] Restructure packages --- .../autoconfigure/AuditAutoConfiguration.java | 4 +- .../EndpointAutoConfiguration.java | 2 +- .../EndpointWebMvcAutoConfiguration.java | 6 +- ...dpointWebMvcChildContextConfiguration.java | 4 +- .../ErrorMvcAutoConfiguration.java | 4 +- ...mentServerPropertiesAutoConfiguration.java | 4 +- .../MetricFilterAutoConfiguration.java | 4 +- .../MetricRepositoryAutoConfiguration.java | 2 +- .../SecurityAutoConfiguration.java | 6 +- .../TraceRepositoryAutoConfiguration.java | 2 +- .../TraceWebFilterAutoConfiguration.java | 2 +- .../zero/actuate/endpoint/BeansEndpoint.java | 2 +- .../zero/actuate/endpoint/DumpEndpoint.java | 2 +- .../actuate/endpoint/EnvironmentEndpoint.java | 2 +- .../zero/actuate/endpoint/HealthEndpoint.java | 2 +- .../zero/actuate/endpoint/InfoEndpoint.java | 2 +- .../actuate/endpoint/MetricsEndpoint.java | 2 +- .../actuate/endpoint/ShutdownEndpoint.java | 2 +- .../zero/actuate/endpoint/TraceEndpoint.java | 2 +- .../fixme/ManagementServerConfiguration.java | 4 +- .../ManagementServerProperties.java | 4 +- .../properties/SecurityProperties.java | 2 +- .../actuate/endpoint/BeansEndpointTests.java | 2 +- .../actuate/endpoint/DumpEndpointTests.java | 2 +- .../endpoint/EnvironmentEndpointTests.java | 2 +- .../actuate/endpoint/HealthEndpointTests.java | 2 +- .../actuate/endpoint/InfoEndpointTests.java | 2 +- .../endpoint/MetricsEndpointTests.java | 2 +- .../endpoint/ShutdownEndpointTests.java | 2 +- .../actuate/endpoint/TraceEndpointTests.java | 2 +- .../MessageSourceAutoConfiguration.java | 2 +- .../PropertyPlaceholderAutoConfiguration.java | 2 +- .../batch/BatchAutoConfiguration.java | 6 +- .../JpaRepositoriesAutoConfiguration.java | 4 +- .../jdbc/DataSourceAutoConfiguration.java | 6 +- ...ceTransactionManagerAutoConfiguration.java | 6 +- .../jpa/HibernateJpaAutoConfiguration.java | 2 +- .../orm/jpa/JpaAutoConfiguration.java | 4 +- .../thymeleaf/ThymeleafAutoConfiguration.java | 6 +- ...ddedServletContainerAutoConfiguration.java | 4 +- .../web/MultipartAutoConfiguration.java | 4 +- .../ServerPropertiesAutoConfiguration.java | 61 ++++--------------- .../web/WebMvcAutoConfiguration.java | 6 +- .../annotation/EnableAutoConfiguration.java | 6 +- ...ervletContainerAutoConfigurationTests.java | 2 +- ...erverPropertiesAutoConfigurationTests.java | 9 ++- .../AbstractOnBeanCondition.java | 2 +- .../ConditionLogUtils.java | 2 +- .../ConditionalOnBean.java | 2 +- .../ConditionalOnClass.java | 2 +- .../ConditionalOnExpression.java | 2 +- .../ConditionalOnMissingBean.java | 2 +- .../ConditionalOnMissingClass.java | 2 +- .../ConditionalOnNotWebApplication.java | 2 +- .../ConditionalOnResource.java | 2 +- .../ConditionalOnWebApplication.java | 2 +- .../OnBeanCondition.java | 2 +- .../OnClassCondition.java | 2 +- .../OnExpressionCondition.java | 2 +- .../OnMissingBeanCondition.java | 2 +- .../OnMissingClassCondition.java | 2 +- .../OnNotWebApplicationCondition.java | 2 +- .../OnResourceCondition.java | 2 +- .../OnWebApplicationCondition.java | 2 +- .../embedded}/ServerProperties.java | 48 +++++++++++++-- ...TomcatEmbeddedServletContainerFactory.java | 2 + .../ConfigurationProperties.java | 4 +- ...urationPropertiesBindingConfiguration.java | 8 ++- ...rationPropertiesBindingPostProcessor.java} | 6 +- .../EnableConfigurationProperties.java | 2 +- ...ConfigurationPropertiesImportSelector.java | 4 +- .../AssertMissingBean.java | 4 +- .../AssertMissingBeanCondition.java | 4 +- .../NotWebApplicationConditionTests.java | 6 +- .../OnBeanConditionTests.java | 3 +- .../OnClassConditionTests.java | 6 +- .../OnExpressionConditionTests.java | 4 +- .../OnMissingBeanConditionTests.java | 6 +- .../OnMissingClassConditionTests.java | 4 +- .../OnResourceConditionTests.java | 4 +- .../WebApplicationConditionTests.java | 6 +- .../embedded}/ServerPropertiesTests.java | 7 ++- .../EnableConfigurationPropertiesTests.java | 9 ++- .../EnableConfigurationPropertiesTests.java | 4 +- .../zero/context/{annotation => }/foo.xml | 0 .../testProperties.xml | 4 +- .../actuator/SampleActuatorApplication.java | 2 +- .../sample/actuator/ServiceProperties.java | 2 +- .../SampleIntegrationApplication.java | 2 +- .../sample/integration/ServiceProperties.java | 2 +- 90 files changed, 205 insertions(+), 196 deletions(-) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/AbstractOnBeanCondition.java (99%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionLogUtils.java (96%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnBean.java (97%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnClass.java (96%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnExpression.java (95%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnMissingBean.java (97%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnMissingClass.java (96%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnNotWebApplication.java (95%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnResource.java (96%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/ConditionalOnWebApplication.java (95%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnBeanCondition.java (94%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnClassCondition.java (98%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnExpressionCondition.java (98%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnMissingBeanCondition.java (95%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnMissingClassCondition.java (98%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnNotWebApplicationCondition.java (97%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnResourceCondition.java (98%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => condition}/OnWebApplicationCondition.java (97%) rename spring-zero-core/src/main/java/org/springframework/zero/{properties => context/embedded}/ServerProperties.java (56%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => properties}/ConfigurationProperties.java (95%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => properties}/ConfigurationPropertiesBindingConfiguration.java (93%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation/PropertySourcesBindingPostProcessor.java => properties/ConfigurationPropertiesBindingPostProcessor.java} (95%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => properties}/EnableConfigurationProperties.java (96%) rename spring-zero-core/src/main/java/org/springframework/zero/context/{annotation => properties}/EnableConfigurationPropertiesImportSelector.java (96%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/AssertMissingBean.java (93%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/AssertMissingBeanCondition.java (92%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/NotWebApplicationConditionTests.java (89%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/OnBeanConditionTests.java (96%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/OnClassConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/OnExpressionConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/OnMissingBeanConditionTests.java (95%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/OnMissingClassConditionTests.java (92%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/OnResourceConditionTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => condition}/WebApplicationConditionTests.java (90%) rename spring-zero-core/src/test/java/org/springframework/zero/{properties => context/embedded}/ServerPropertiesTests.java (93%) rename spring-zero-core/src/test/java/org/springframework/zero/context/{annotation => properties}/EnableConfigurationPropertiesTests.java (96%) rename spring-zero-core/src/test/resources/org/springframework/zero/context/{annotation => }/foo.xml (100%) rename spring-zero-core/src/test/resources/org/springframework/zero/context/{annotation => properties}/testProperties.xml (76%) diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java index 684c59fa10..9f116f61d8 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java @@ -25,9 +25,9 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java index 83c6f531f7..0a6eb7f392 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -45,8 +45,8 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for common management diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index e2c93c3780..10a6e439b1 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -39,11 +39,11 @@ import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfigurati 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.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.properties.ServerProperties; +import org.springframework.zero.context.embedded.ServerProperties; /** * {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index 4f65cc2d65..067f94c6b2 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -29,8 +29,8 @@ 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.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainer; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index ff9a434384..4e58c8f91f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java @@ -23,9 +23,9 @@ 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.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.zero.context.embedded.ErrorPage; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 8c69dd23d9..6276e1fce3 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -20,9 +20,9 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; +import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} for the diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 915683bc27..ffac0ce773 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -38,9 +38,9 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index be5764a8de..198a5c2d96 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -24,8 +24,8 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for metrics services. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java index 0b4943065f..0adf656542 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -41,10 +41,10 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; +import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index d391aef36b..c3df801e05 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java @@ -20,8 +20,8 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index d826886aae..d11b986fe0 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -25,8 +25,8 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java index 8669b4074c..c23bd42cff 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java @@ -22,7 +22,7 @@ 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; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * Exposes JSON view of Spring beans. If the {@link Environment} contains a key setting diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java index 72c0265f98..d7a809513a 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java @@ -21,7 +21,7 @@ import java.lang.management.ThreadInfo; import java.util.Arrays; import java.util.List; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose thread info. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java index 4c9eb08f0d..5dd0f88a71 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java @@ -25,7 +25,7 @@ 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; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java index 62d25899ea..17cb85ca32 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java @@ -18,7 +18,7 @@ package org.springframework.zero.actuate.endpoint; import org.springframework.util.Assert; import org.springframework.zero.actuate.health.HealthIndicator; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose application health. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java index 958c64a2dd..4545b89341 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java @@ -21,7 +21,7 @@ import java.util.LinkedHashMap; import java.util.Map; import org.springframework.util.Assert; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose arbitrary application information. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java index 91431e8185..799222f350 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java @@ -21,7 +21,7 @@ import java.util.Map; import org.springframework.util.Assert; import org.springframework.zero.actuate.metrics.Metric; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose {@link PublicMetrics}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java index 832c81a8eb..b7816fac96 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java @@ -25,7 +25,7 @@ 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; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link ActionEndpoint} to shutdown the {@link ApplicationContext}. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java index 8321d4ea0d..a471f2eb9c 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java @@ -21,7 +21,7 @@ import java.util.List; 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; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose {@link Trace} information. diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java index 3827688050..777af6fe6f 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java @@ -38,8 +38,8 @@ 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.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java index 896d79f9d3..8bc21dcc3a 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java @@ -20,8 +20,8 @@ import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.zero.context.annotation.ConfigurationProperties; -import org.springframework.zero.properties.ServerProperties; +import org.springframework.zero.context.embedded.ServerProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * Properties for the management server (e.g. port and path settings). diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java index ad397021d0..d2ec43191d 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java @@ -17,7 +17,7 @@ package org.springframework.zero.actuate.properties; import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; /** * Properties for the security aspects of an application. diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java index 39b85d54cb..e921cc3c0a 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java @@ -21,7 +21,7 @@ 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java index 64a5c8811a..a48fe34f97 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java @@ -23,7 +23,7 @@ import org.junit.Test; 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java index 577e34920c..bd88a88a86 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java @@ -20,7 +20,7 @@ import org.junit.Test; 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java index bff7beb136..cc7f70b7c2 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java @@ -21,7 +21,7 @@ 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java index 9268691078..eb6a131933 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java @@ -22,7 +22,7 @@ import org.junit.Test; 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java index e23cc76d69..a9c5aa4f4c 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java @@ -25,7 +25,7 @@ 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java index af005cf1e4..e97d2285bd 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java @@ -21,7 +21,7 @@ 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java index 69e88c0315..e8691659c2 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java @@ -25,7 +25,7 @@ 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 org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java index a065538661..9b12d31318 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java @@ -23,8 +23,8 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java index b766ab7273..f30992d2f0 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java @@ -22,8 +22,8 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java index e103fe828b..6619df74a3 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java @@ -21,10 +21,10 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Batch. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index cc676d0b3c..bd0c79b354 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java @@ -21,9 +21,9 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JPA Repositories. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java index fde6f45943..7ff79f7010 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -46,10 +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; +import org.springframework.zero.context.condition.ConditionLogUtils; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link DataSource}. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index 3d45e73d02..0db0698806 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -25,10 +25,10 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index db15240e52..a6fb34e73c 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -30,8 +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; +import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} for Hibernate JPA. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java index 3b8d1e0a11..4047e8201b 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -36,9 +36,9 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; /** * Base {@link EnableAutoConfiguration Auto-configuration} for JPA. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index c476e8d3df..15263e4518 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -33,10 +33,10 @@ 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.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; +import org.springframework.zero.context.condition.ConditionalOnMissingClass; import org.thymeleaf.TemplateProcessingParameters; import org.thymeleaf.resourceresolver.IResourceResolver; import org.thymeleaf.spring3.SpringTemplateEngine; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java index 06de4d1a13..2ff99895f0 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java @@ -26,9 +26,9 @@ 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.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java index 416ded3432..56b955d5d7 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java @@ -22,9 +22,9 @@ import javax.servlet.Servlet; 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.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.embedded.EmbeddedWebApplicationContext; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java index d3a2a344ac..1a0e7c3c42 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java @@ -16,22 +16,19 @@ 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.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.zero.context.annotation.ConditionalOnMissingBean; import org.springframework.zero.context.annotation.EnableAutoConfiguration; -import org.springframework.zero.context.annotation.EnableConfigurationProperties; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.zero.properties.ServerProperties; -import org.springframework.zero.properties.ServerProperties.Tomcat; +import org.springframework.zero.context.embedded.ServerProperties; +import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} that configures the @@ -42,8 +39,8 @@ import org.springframework.zero.properties.ServerProperties.Tomcat; */ @Configuration @EnableConfigurationProperties -public class ServerPropertiesAutoConfiguration implements - EmbeddedServletContainerCustomizer, ApplicationContextAware { +public class ServerPropertiesAutoConfiguration implements ApplicationContextAware, + EmbeddedServletContainerCustomizer { private ApplicationContext applicationContext; @@ -61,46 +58,12 @@ public class ServerPropertiesAutoConfiguration implements @Override public void customize(ConfigurableEmbeddedServletContainerFactory factory) { - - // Need to do a look up here to make it lazy - ServerProperties server = this.applicationContext.getBean(ServerProperties.class); - - factory.setPort(server.getPort()); - factory.setAddress(server.getAddress()); - factory.setContextPath(server.getContextPath()); - - if (factory instanceof TomcatEmbeddedServletContainerFactory) { - configureTomcat((TomcatEmbeddedServletContainerFactory) factory, server); - } - - } - - private void configureTomcat(TomcatEmbeddedServletContainerFactory tomcatFactory, - ServerProperties configuration) { - - Tomcat tomcat = configuration.getTomcat(); - if (tomcat.getBasedir() != null) { - tomcatFactory.setBaseDirectory(tomcat.getBasedir()); - } - - String remoteIpHeader = tomcat.getRemoteIpHeader(); - String protocolHeader = tomcat.getProtocolHeader(); - - if (StringUtils.hasText(remoteIpHeader) || StringUtils.hasText(protocolHeader)) { - RemoteIpValve valve = new RemoteIpValve(); - valve.setRemoteIpHeader(remoteIpHeader); - valve.setProtocolHeader(protocolHeader); - tomcatFactory.addContextValves(valve); - } - - String pattern = tomcat.getAccessLogPattern(); - if (pattern != null) { - AccessLogValve valve = new AccessLogValve(); - valve.setPattern(pattern); - valve.setSuffix(".log"); - tomcatFactory.addContextValves(valve); - } - + String[] serverPropertiesBeans = this.applicationContext + .getBeanNamesForType(ServerProperties.class); + Assert.state( + serverPropertiesBeans.length == 1, + "Multiple ServerProperties beans registered " + + StringUtils.arrayToCommaDelimitedString(serverPropertiesBeans)); } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java index 3c9995eefe..388fe7793f 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java @@ -49,10 +49,10 @@ 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; +import org.springframework.zero.context.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link EnableWebMvc Web MVC}. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java index d747f1f85e..297d108857 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java @@ -26,9 +26,9 @@ 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.condition.ConditionalOnBean; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java index 472ebdf9bf..61a8208c62 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -25,7 +25,7 @@ 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.condition.ConditionalOnExpression; import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java index 6fe70f501f..387372a89d 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java @@ -18,14 +18,13 @@ package org.springframework.zero.autoconfigure.web; import java.io.File; -import org.hamcrest.Matchers; import org.junit.After; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; -import org.springframework.beans.factory.NoUniqueBeanDefinitionException; +import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.zero.TestUtils; @@ -34,8 +33,8 @@ import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebAppl 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.ServerProperties; 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; @@ -100,8 +99,8 @@ public class ServerPropertiesAutoConfigurationTests { this.context.register(Config.class, MutiServerPropertiesBeanConfig.class, ServerPropertiesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); - this.thrown.expectCause(Matchers - . instanceOf(NoUniqueBeanDefinitionException.class)); + this.thrown.expect(BeanCreationException.class); + this.thrown.expectMessage("Multiple ServerProperties"); this.context.refresh(); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java similarity index 99% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java index 995ce9d72d..0698a9772b 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/AbstractOnBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java index 7d2ce8d32d..9fda8cf106 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionLogUtils.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.apache.commons.logging.Log; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java index d490628521..ab10b3d6e6 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java index 7660f7fb0a..c8e50cce82 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnClass.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java index 67858c0300..5646716191 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnExpression.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java index a266dcb46f..d77074b636 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java index ed1c0c9e2e..e1014526a1 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnMissingClass.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java index 9207692647..fef457de67 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnNotWebApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java index 4c804fb1bf..aae6b17f79 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnResource.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java index 35d7d933a2..a13ae08b9a 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConditionalOnWebApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java similarity index 94% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java index d56a404317..7da41e8f6a 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.springframework.context.annotation.Condition; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java index 38b3afb26f..c3b16c0228 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnClassCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java index 4426eec742..90d81e7753 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnExpressionCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java index 71a49f540b..51480c35f6 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java index 224fe06abd..f5e4062f68 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnMissingClassCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java index 0f814f576e..92d9cb8472 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnNotWebApplicationCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java similarity index 98% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java index d80d442f3f..81124c8002 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnResourceCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java similarity index 97% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java index 1d4b642c42..5b7f738b18 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/OnWebApplicationCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServerProperties.java similarity index 56% rename from spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServerProperties.java index 93d9406401..c7b1fd7a4f 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/properties/ServerProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServerProperties.java @@ -14,22 +14,28 @@ * limitations under the License. */ -package org.springframework.zero.properties; +package org.springframework.zero.context.embedded; import java.io.File; import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.apache.catalina.valves.AccessLogValve; +import org.apache.catalina.valves.RemoteIpValve; +import org.springframework.util.StringUtils; +import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.zero.context.properties.ConfigurationProperties; /** - * Properties for the web server (e.g. port and path settings). + * {@link ConfigurationProperties properties} for a web server (e.g. port and path + * settings). Will be used to customize an {@link EmbeddedServletContainerFactory} when an + * {@link EmbeddedServletContainerCustomizerBeanPostProcessor} is active. * * @author Dave Syer */ @ConfigurationProperties(name = "server", ignoreUnknownFields = false) -public class ServerProperties { +public class ServerProperties implements EmbeddedServletContainerCustomizer { private int port = 8080; @@ -68,8 +74,14 @@ public class ServerProperties { this.address = address; } - public void setLoader(String value) { - // no op + @Override + public void customize(ConfigurableEmbeddedServletContainerFactory factory) { + factory.setPort(getPort()); + factory.setAddress(getAddress()); + factory.setContextPath(getContextPath()); + if (factory instanceof TomcatEmbeddedServletContainerFactory) { + getTomcat().customizeTomcat((TomcatEmbeddedServletContainerFactory) factory); + } } public static class Tomcat { @@ -114,6 +126,30 @@ public class ServerProperties { this.remoteIpHeader = remoteIpHeader; } + void customizeTomcat(TomcatEmbeddedServletContainerFactory factory) { + if (getBasedir() != null) { + factory.setBaseDirectory(getBasedir()); + } + + String remoteIpHeader = getRemoteIpHeader(); + String protocolHeader = getProtocolHeader(); + if (StringUtils.hasText(remoteIpHeader) + || StringUtils.hasText(protocolHeader)) { + RemoteIpValve valve = new RemoteIpValve(); + valve.setRemoteIpHeader(remoteIpHeader); + valve.setProtocolHeader(protocolHeader); + factory.addContextValves(valve); + } + + String accessLogPattern = getAccessLogPattern(); + if (accessLogPattern != null) { + AccessLogValve valve = new AccessLogValve(); + valve.setPattern(accessLogPattern); + valve.setSuffix(".log"); + factory.addContextValves(valve); + } + } + } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 18857f4865..7ecf598340 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -338,6 +338,8 @@ public class TomcatEmbeddedServletContainerFactory extends this.contextLifecycleListeners.addAll(Arrays.asList(contextLifecycleListeners)); } + // FIXME JavaDoc + // FIXME Is this still needed? public TomcatEmbeddedServletContainerFactory getChildContextFactory(final String name) { final Server server = this.tomcat.getServer(); diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java index 2176767ba7..e1e4fa2c96 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -26,7 +26,7 @@ import java.lang.annotation.Target; * Annotation for externalized configuration. Add this to a class definition if you want * to bind and validate some external Properties (e.g. from a .properties file). * - * @see PropertySourcesBindingPostProcessor + * @see ConfigurationPropertiesBindingPostProcessor * * @author Dave Syer */ diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java similarity index 93% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java index d55e12e20d..b47f15c2d1 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/ConfigurationPropertiesBindingConfiguration.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.properties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; @@ -30,6 +30,8 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySources; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; +import org.springframework.zero.context.condition.ConditionalOnClass; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * Configuration for binding externalized application properties to @@ -72,7 +74,7 @@ public class ConfigurationPropertiesBindingConfiguration { * @return a bean post processor to bind application properties */ @Bean - public PropertySourcesBindingPostProcessor propertySourcesBinder() { + public ConfigurationPropertiesBindingPostProcessor propertySourcesBinder() { PropertySources propertySources; if (this.configurer != null) { @@ -87,7 +89,7 @@ public class ConfigurationPropertiesBindingConfiguration { propertySources = new MutablePropertySources(); } - PropertySourcesBindingPostProcessor processor = new PropertySourcesBindingPostProcessor(); + ConfigurationPropertiesBindingPostProcessor processor = new ConfigurationPropertiesBindingPostProcessor(); processor.setValidator(this.validator); processor.setConversionService(this.conversionService); processor.setPropertySources(propertySources); diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java similarity index 95% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java index 557dd2b3c6..ac66c68fca 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/PropertySourcesBindingPostProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.properties; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanCreationException; @@ -29,7 +29,7 @@ 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; +import org.springframework.zero.context.properties.EnableConfigurationPropertiesImportSelector.ConfigurationPropertiesHolder; /** * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with @@ -37,7 +37,7 @@ import org.springframework.zero.context.annotation.EnableConfigurationProperties * * @author Dave Syer */ -public class PropertySourcesBindingPostProcessor implements BeanPostProcessor, +public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProcessor, BeanFactoryAware { private PropertySources propertySources; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java index 47824a6abb..d7c8402592 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java similarity index 96% rename from spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java index 9564c62e5a..18be19e0c7 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesImportSelector.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.properties; import java.util.ArrayList; import java.util.List; @@ -39,7 +39,7 @@ import org.springframework.util.MultiValueMap; * * @author Dave Syer */ -public class EnableConfigurationPropertiesImportSelector implements ImportSelector { +class EnableConfigurationPropertiesImportSelector implements ImportSelector { @Override public String[] selectImports(AnnotationMetadata metadata) { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBean.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBean.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java index 33bba730f8..b3ee08e0fd 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBean.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -25,7 +25,7 @@ import java.lang.annotation.Target; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Conditional; -import org.springframework.zero.context.annotation.ConditionalOnMissingBean; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link Conditional} that only matches when the specified bean classes and/or names are diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java similarity index 92% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java index 699f74271f..2286809315 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/AssertMissingBeanCondition.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import java.util.List; @@ -22,7 +22,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -import org.springframework.zero.context.annotation.OnMissingBeanCondition; +import org.springframework.zero.context.condition.OnMissingBeanCondition; /** * {@link Condition} that checks that specific beans are missing. diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/NotWebApplicationConditionTests.java similarity index 89% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/NotWebApplicationConditionTests.java index fcdc446b46..7f8fc6f186 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/NotWebApplicationConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/NotWebApplicationConditionTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; 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 org.springframework.zero.context.condition.ConditionalOnNotWebApplication; +import org.springframework.zero.context.condition.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java index b990226d62..724e396666 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnBeanConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.junit.Ignore; import org.junit.Test; @@ -23,6 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; +import org.springframework.zero.context.condition.ConditionalOnBean; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java index d992a73541..e7f97ce9ee 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnClassConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -93,13 +93,13 @@ public class OnClassConditionTests { } @Configuration - @ImportResource("org/springframework/zero/context/annotation/foo.xml") + @ImportResource("org/springframework/zero/context/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(BasicConfiguration.class) - @ImportResource("org/springframework/zero/context/annotation/foo.xml") + @ImportResource("org/springframework/zero/context/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java index 60dd82ca6a..a9e5eae562 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnExpressionConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; 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 org.springframework.zero.context.condition.ConditionalOnExpression; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingBeanConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingBeanConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java index d253fb4fd8..ce88856359 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingBeanConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; 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 org.springframework.zero.context.condition.ConditionalOnMissingBean; +import org.springframework.zero.context.condition.OnMissingBeanCondition; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java similarity index 92% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingClassConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java index a23d530a20..9b1622e660 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnMissingClassConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -49,7 +49,7 @@ public class OnMissingClassConditionTests { } @Configuration - @ConditionalOnMissingClass("org.springframework.zero.context.annotation.OnMissingClassConditionTests") + @ConditionalOnMissingClass("org.springframework.zero.context.condition.OnMissingClassConditionTests") protected static class BasicConfiguration { @Bean public String bar() { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnResourceConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnResourceConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java index 6c168c93ee..d83a15fa7f 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/OnResourceConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; 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 org.springframework.zero.context.condition.ConditionalOnResource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/WebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/WebApplicationConditionTests.java similarity index 90% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/WebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/WebApplicationConditionTests.java index c6bfa800ce..4ac8d68774 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/WebApplicationConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/WebApplicationConditionTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.context.condition; 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 org.springframework.zero.context.condition.ConditionalOnNotWebApplication; +import org.springframework.zero.context.condition.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-core/src/test/java/org/springframework/zero/properties/ServerPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServerPropertiesTests.java similarity index 93% rename from spring-zero-core/src/test/java/org/springframework/zero/properties/ServerPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServerPropertiesTests.java index cf63d1afcf..1e975c9189 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/properties/ServerPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.properties; +package org.springframework.zero.context.embedded; import java.net.InetAddress; import java.util.Collections; @@ -24,13 +24,12 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; import org.springframework.zero.bind.RelaxedDataBinder; -import org.springframework.zero.properties.ServerProperties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; /** - * Externalized configuration for server properties + * Tests for {@link ServerProperties}. * * @author Dave Syer */ @@ -69,4 +68,6 @@ public class ServerPropertiesTests { .getProtocolHeader()); } + // FIXME test customize + } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java similarity index 96% rename from spring-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java index ce94e2b162..f4bb2e2379 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/annotation/EnableConfigurationPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java @@ -13,7 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.zero.context.annotation; + +package org.springframework.zero.context.properties; import java.util.Arrays; @@ -28,11 +29,15 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.stereotype.Component; import org.springframework.zero.TestUtils; +import org.springframework.zero.context.condition.AssertMissingBean; +import org.springframework.zero.context.condition.ConditionalOnMissingBean; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; /** + * Tests for {@link EnableConfigurationProperties}. + * * @author Dave Syer */ public class EnableConfigurationPropertiesTests { @@ -168,7 +173,7 @@ public class EnableConfigurationPropertiesTests { } @Configuration - @ImportResource("org/springframework/zero/context/annotation/testProperties.xml") + @ImportResource("org/springframework/zero/context/properties/testProperties.xml") protected static class DefaultXmlConfiguration { } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java index 0bb5ff9b3d..52232c9307 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java @@ -27,8 +27,8 @@ 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 org.springframework.zero.context.properties.ConfigurationProperties; +import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/foo.xml b/spring-zero-core/src/test/resources/org/springframework/zero/context/foo.xml similarity index 100% rename from spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/foo.xml rename to spring-zero-core/src/test/resources/org/springframework/zero/context/foo.xml diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/testProperties.xml b/spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml similarity index 76% rename from spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/testProperties.xml rename to spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml index 20e28fe928..6784fc206b 100644 --- a/spring-zero-core/src/test/resources/org/springframework/zero/context/annotation/testProperties.xml +++ b/spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + id="org.springframework.zero.context.properties.EnableConfigurationPropertiesTests$TestProperties" + class="org.springframework.zero.context.properties.EnableConfigurationPropertiesTests$TestProperties"> diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java index 92ef72bf02..6fcebb6e6e 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java @@ -20,7 +20,7 @@ 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; +import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java index ec8782bf18..7c2c18b292 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java @@ -17,7 +17,7 @@ package org.springframework.zero.sample.actuator; import org.springframework.stereotype.Component; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) @Component diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java index 9886939734..5b4cb80d4a 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java @@ -21,7 +21,7 @@ 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; +import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java index c703c3f122..570d15d2dc 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java @@ -16,7 +16,7 @@ package org.springframework.zero.sample.integration; -import org.springframework.zero.context.annotation.ConfigurationProperties; +import org.springframework.zero.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) public class ServiceProperties { From b838dc5422205170d7b1f547db06a10c5acd93f4 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jul 2013 00:08:18 -0700 Subject: [PATCH 08/15] Remove tangles from core + minor polish --- .../EndpointWebMvcAutoConfiguration.java | 2 +- .../ManagementServerProperties.java | 2 +- .../ServerPropertiesAutoConfiguration.java | 2 +- ...erverPropertiesAutoConfigurationTests.java | 2 +- .../bind/PropertiesConfigurationFactory.java | 161 +++++++++--------- .../{ => properties}/ServerProperties.java | 6 +- ...urationPropertiesBindingPostProcessor.java | 65 ++++--- .../ConfigurationPropertiesHolder.java | 37 ++++ ...ConfigurationPropertiesImportSelector.java | 38 ++--- .../ServerPropertiesTests.java | 3 +- 10 files changed, 177 insertions(+), 141 deletions(-) rename spring-zero-core/src/main/java/org/springframework/zero/context/embedded/{ => properties}/ServerProperties.java (90%) create mode 100644 spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java rename spring-zero-core/src/test/java/org/springframework/zero/context/embedded/{ => properties}/ServerPropertiesTests.java (94%) diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 10a6e439b1..2f7e2b91ee 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -43,7 +43,7 @@ import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.ServerProperties; +import org.springframework.zero.context.embedded.properties.ServerProperties; /** * {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java index 8bc21dcc3a..cc0bd0e0f4 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java @@ -20,7 +20,7 @@ import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.zero.context.embedded.ServerProperties; +import org.springframework.zero.context.embedded.properties.ServerProperties; import org.springframework.zero.context.properties.ConfigurationProperties; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java index 1a0e7c3c42..50d62ad19d 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java @@ -27,7 +27,7 @@ import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.ServerProperties; +import org.springframework.zero.context.embedded.properties.ServerProperties; import org.springframework.zero.context.properties.EnableConfigurationProperties; /** diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java index 387372a89d..d543131c2c 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java @@ -33,7 +33,7 @@ import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebAppl 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.ServerProperties; +import org.springframework.zero.context.embedded.properties.ServerProperties; import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java index 3eef9aa712..d22a8d8c48 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java @@ -59,13 +59,13 @@ public class PropertiesConfigurationFactory implements FactoryBean, private PropertySources propertySources; - private T configuration; + private T target; private Validator validator; private MessageSource messageSource; - private boolean initialized = false; + private boolean hasBeenBound = false; private String targetName; @@ -77,7 +77,7 @@ public class PropertiesConfigurationFactory implements FactoryBean, */ public PropertiesConfigurationFactory(T target) { Assert.notNull(target); - this.configuration = target; + this.target = target; } /** @@ -88,7 +88,7 @@ public class PropertiesConfigurationFactory implements FactoryBean, @SuppressWarnings("unchecked") public PropertiesConfigurationFactory(Class type) { Assert.notNull(type); - this.configuration = (T) BeanUtils.instantiate(type); + this.target = (T) BeanUtils.instantiate(type); } /** @@ -165,86 +165,15 @@ public class PropertiesConfigurationFactory implements FactoryBean, @Override public void afterPropertiesSet() throws Exception { - - Assert.state(this.properties != null || this.propertySources != null, - "Properties or propertySources should not be null"); - - try { - if (this.properties != null) { - logger.trace("Properties:\n" + this.properties); - } - else { - logger.trace("Property Sources: " + this.propertySources); - } - this.initialized = true; - - RelaxedDataBinder dataBinder; - if (this.targetName != null) { - dataBinder = new RelaxedDataBinder(this.configuration, this.targetName); - } - else { - dataBinder = new RelaxedDataBinder(this.configuration); - } - if (this.validator != null) { - dataBinder.setValidator(this.validator); - } - if (this.conversionService != null) { - dataBinder.setConversionService(this.conversionService); - } - dataBinder.setIgnoreInvalidFields(this.ignoreInvalidFields); - dataBinder.setIgnoreUnknownFields(this.ignoreUnknownFields); - customizeBinder(dataBinder); - PropertyValues pvs; - if (this.properties != null) { - pvs = new MutablePropertyValues(this.properties); - } - else { - pvs = new PropertySourcesPropertyValues(this.propertySources); - } - dataBinder.bind(pvs); - - if (this.validator != null) { - dataBinder.validate(); - BindingResult errors = dataBinder.getBindingResult(); - - if (errors.hasErrors()) { - logger.error("Properties configuration failed validation"); - for (ObjectError error : errors.getAllErrors()) { - logger.error(this.messageSource != null ? this.messageSource - .getMessage(error, Locale.getDefault()) - + " (" - + error - + ")" : error); - } - if (this.exceptionIfInvalid) { - BindException summary = new BindException(errors); - throw summary; - } - } - } - } - catch (BindException e) { - if (this.exceptionIfInvalid) { - throw e; - } - logger.error( - "Failed to load Properties validation bean. Your Properties may be invalid.", - e); - } - } - - /** - * @param dataBinder the data binder that will be used to bind and validate - */ - protected void customizeBinder(DataBinder dataBinder) { + bindPropertiesToTarget(); } @Override public Class getObjectType() { - if (this.configuration == null) { + if (this.target == null) { return Object.class; } - return this.configuration.getClass(); + return this.target.getClass(); } @Override @@ -254,10 +183,80 @@ public class PropertiesConfigurationFactory implements FactoryBean, @Override public T getObject() throws Exception { - if (!this.initialized) { - afterPropertiesSet(); + if (!this.hasBeenBound) { + bindPropertiesToTarget(); } - return this.configuration; + return this.target; + } + + public void bindPropertiesToTarget() throws BindException { + Assert.state(this.properties != null || this.propertySources != null, + "Properties or propertySources should not be null"); + try { + if (logger.isTraceEnabled()) { + if (this.properties != null) { + logger.trace("Properties:\n" + this.properties); + } + else { + logger.trace("Property Sources: " + this.propertySources); + } + } + this.hasBeenBound = true; + doBindPropertiesToTarget(); + } + catch (BindException e) { + if (this.exceptionIfInvalid) { + throw e; + } + logger.error("Failed to load Properties validation bean. " + + "Your Properties may be invalid.", e); + } + } + + private void doBindPropertiesToTarget() throws BindException { + + RelaxedDataBinder dataBinder = (this.targetName != null ? new RelaxedDataBinder( + this.target, this.targetName) : new RelaxedDataBinder(this.target)); + if (this.validator != null) { + dataBinder.setValidator(this.validator); + } + if (this.conversionService != null) { + dataBinder.setConversionService(this.conversionService); + } + dataBinder.setIgnoreInvalidFields(this.ignoreInvalidFields); + dataBinder.setIgnoreUnknownFields(this.ignoreUnknownFields); + customizeBinder(dataBinder); + + PropertyValues propertyValues = (this.properties != null ? new MutablePropertyValues( + this.properties) + : new PropertySourcesPropertyValues(this.propertySources)); + dataBinder.bind(propertyValues); + + if (this.validator != null) { + validate(dataBinder); + } + } + + private void validate(RelaxedDataBinder dataBinder) throws BindException { + dataBinder.validate(); + BindingResult errors = dataBinder.getBindingResult(); + if (errors.hasErrors()) { + logger.error("Properties configuration failed validation"); + for (ObjectError error : errors.getAllErrors()) { + logger.error(this.messageSource != null ? this.messageSource.getMessage( + error, Locale.getDefault()) + " (" + error + ")" : error); + } + if (this.exceptionIfInvalid) { + BindException summary = new BindException(errors); + throw summary; + } + } + } + + /** + * @param dataBinder the data binder that will be used to bind and validate + */ + protected void customizeBinder(DataBinder dataBinder) { } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServerProperties.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java similarity index 90% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServerProperties.java rename to spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java index c7b1fd7a4f..4d65c39c4d 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServerProperties.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.zero.context.embedded.properties; import java.io.File; import java.net.InetAddress; @@ -24,6 +24,10 @@ import javax.validation.constraints.NotNull; import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.valves.RemoteIpValve; import org.springframework.util.StringUtils; +import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.zero.context.properties.ConfigurationProperties; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java index ac66c68fca..1ef09fbb79 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java @@ -27,9 +27,9 @@ 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.util.StringUtils; import org.springframework.validation.Validator; import org.springframework.zero.bind.PropertiesConfigurationFactory; -import org.springframework.zero.context.properties.EnableConfigurationPropertiesImportSelector.ConfigurationPropertiesHolder; /** * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with @@ -89,44 +89,41 @@ public class ConfigurationPropertiesBindingPostProcessor implements BeanPostProc throws BeansException { ConfigurationProperties annotation = AnnotationUtils.findAnnotation( bean.getClass(), ConfigurationProperties.class); - Object target = bean; if (annotation != null || bean instanceof ConfigurationPropertiesHolder) { - if (bean instanceof ConfigurationPropertiesHolder) { - target = ((ConfigurationPropertiesHolder) bean).getTarget(); - } - PropertiesConfigurationFactory factory = new PropertiesConfigurationFactory( - target); - factory.setPropertySources(this.propertySources); - factory.setValidator(this.validator); - // If no explicit conversion service is provided we add one so that (at least) - // comma-separated arrays of convertibles can be bound automatically - factory.setConversionService(this.conversionService == null ? getDefaultConversionService() - : this.conversionService); - String targetName = null; - if (annotation != null) { - factory.setIgnoreInvalidFields(annotation.ignoreInvalidFields()); - factory.setIgnoreUnknownFields(annotation.ignoreUnknownFields()); - targetName = "".equals(annotation.value()) ? ("" - .equals(annotation.name()) ? null : annotation.name()) - : annotation.value(); - } - factory.setTargetName(targetName); - try { - target = factory.getObject(); // throwaway - } - catch (BeansException e) { - throw e; - } - catch (Exception e) { - throw new BeanCreationException(beanName, "Could not bind", e); - } + postProcessAfterInitialization(bean, beanName, annotation); } return bean; } - /** - * @return - */ + private void postProcessAfterInitialization(Object bean, String beanName, + ConfigurationProperties annotation) { + Object target = (bean instanceof ConfigurationPropertiesHolder ? ((ConfigurationPropertiesHolder) bean) + .getTarget() : bean); + PropertiesConfigurationFactory factory = new PropertiesConfigurationFactory( + target); + factory.setPropertySources(this.propertySources); + factory.setValidator(this.validator); + // If no explicit conversion service is provided we add one so that (at least) + // comma-separated arrays of convertibles can be bound automatically + factory.setConversionService(this.conversionService == null ? getDefaultConversionService() + : this.conversionService); + if (annotation != null) { + factory.setIgnoreInvalidFields(annotation.ignoreInvalidFields()); + factory.setIgnoreUnknownFields(annotation.ignoreUnknownFields()); + String targetName = (StringUtils.hasLength(annotation.value()) ? annotation + .value() : annotation.name()); + if (StringUtils.hasLength(targetName)) { + factory.setTargetName(targetName); + } + } + try { + factory.bindPropertiesToTarget(); + } + catch (Exception ex) { + throw new BeanCreationException(beanName, "Could not bind properties", ex); + } + } + private ConversionService getDefaultConversionService() { if (!this.initialized && this.beanFactory instanceof ListableBeanFactory) { for (Converter converter : ((ListableBeanFactory) this.beanFactory) diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java new file mode 100644 index 0000000000..8ee28ecfb0 --- /dev/null +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java @@ -0,0 +1,37 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.zero.context.properties; + +/** + * Properties holder registered by {@link EnableConfigurationPropertiesImportSelector} to + * be picked up by {@link ConfigurationPropertiesBindingPostProcessor}. + * + * @author Dave Syer + */ +class ConfigurationPropertiesHolder { + + private Object target; + + public ConfigurationPropertiesHolder(Object target) { + this.target = target; + } + + public Object getTarget() { + return this.target; + } + +} \ No newline at end of file diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java index 18be19e0c7..097f21fa95 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java @@ -19,6 +19,7 @@ package org.springframework.zero.context.properties; import java.util.ArrayList; import java.util.List; +import org.springframework.beans.factory.support.AbstractBeanDefinition; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; @@ -67,17 +68,7 @@ class EnableConfigurationPropertiesImportSelector implements ImportSelector { for (Class type : types) { String name = type.getName(); if (!registry.containsBeanDefinition(name)) { - registry.registerBeanDefinition(name, BeanDefinitionBuilder - .genericBeanDefinition(type).getBeanDefinition()); - ConfigurationProperties properties = AnnotationUtils.findAnnotation( - type, ConfigurationProperties.class); - if (properties == null) { - BeanDefinitionBuilder builder = BeanDefinitionBuilder - .genericBeanDefinition(ConfigurationPropertiesHolder.class); - builder.addConstructorArgReference(name); - registry.registerBeanDefinition(name + ".HOLDER", - builder.getBeanDefinition()); - } + registerBeanDefinition(registry, type, name); } } } @@ -94,18 +85,25 @@ class EnableConfigurationPropertiesImportSelector implements ImportSelector { return result; } - } + private void registerBeanDefinition(BeanDefinitionRegistry registry, + Class type, String name) { + BeanDefinitionBuilder builder = BeanDefinitionBuilder + .genericBeanDefinition(type); + AbstractBeanDefinition beanDefinition = builder.getBeanDefinition(); + registry.registerBeanDefinition(name, beanDefinition); - public static class ConfigurationPropertiesHolder { - - private Object target; - - public ConfigurationPropertiesHolder(Object target) { - this.target = target; + ConfigurationProperties properties = AnnotationUtils.findAnnotation(type, + ConfigurationProperties.class); + if (properties == null) { + registerPropertiesHolder(registry, name); + } } - public Object getTarget() { - return this.target; + private void registerPropertiesHolder(BeanDefinitionRegistry registry, String name) { + BeanDefinitionBuilder builder = BeanDefinitionBuilder + .genericBeanDefinition(ConfigurationPropertiesHolder.class); + builder.addConstructorArgReference(name); + registry.registerBeanDefinition(name + ".HOLDER", builder.getBeanDefinition()); } } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServerPropertiesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java similarity index 94% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServerPropertiesTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java index 1e975c9189..f73888b433 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServerPropertiesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.zero.context.embedded.properties; import java.net.InetAddress; import java.util.Collections; @@ -24,6 +24,7 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; import org.springframework.zero.bind.RelaxedDataBinder; +import org.springframework.zero.context.embedded.properties.ServerProperties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; From beef5ab177b618986696ae4622dc3040d5ecded7 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jul 2013 01:03:58 -0700 Subject: [PATCH 09/15] Restructure autoconfigure project --- .../zero/actuate/autoconfigure/AuditAutoConfiguration.java | 2 +- .../actuate/autoconfigure/EndpointAutoConfiguration.java | 2 +- .../autoconfigure/EndpointWebMvcAutoConfiguration.java | 4 ++-- .../actuate/autoconfigure/ErrorMvcAutoConfiguration.java | 2 +- .../ManagementServerPropertiesAutoConfiguration.java | 4 ++-- .../autoconfigure/MetricFilterAutoConfiguration.java | 4 ++-- .../autoconfigure/MetricRepositoryAutoConfiguration.java | 2 +- .../actuate/autoconfigure/SecurityAutoConfiguration.java | 2 +- .../autoconfigure/TraceRepositoryAutoConfiguration.java | 2 +- .../autoconfigure/TraceWebFilterAutoConfiguration.java | 4 ++-- .../src/main/resources/META-INF/spring.factories | 2 +- .../AutoConfigurationSorter.java | 2 +- .../annotation => autoconfigure}/AutoConfigureAfter.java | 2 +- .../annotation => autoconfigure}/ComponentScanDetector.java | 3 +-- .../EnableAutoConfiguration.java | 2 +- .../EnableAutoConfigurationImportSelector.java | 2 +- .../zero/autoconfigure/MessageSourceAutoConfiguration.java | 1 - .../autoconfigure/PropertyPlaceholderAutoConfiguration.java | 1 - .../zero/autoconfigure/batch/BatchAutoConfiguration.java | 2 +- .../data/JpaRepositoriesAutoConfiguration.java | 2 +- .../autoconfigure/jdbc/DataSourceAutoConfiguration.java | 2 +- .../jdbc/DataSourceTransactionManagerAutoConfiguration.java | 2 +- .../autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java | 2 +- .../orm/jpa/HibernateJpaAutoConfiguration.java | 2 +- .../zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java | 2 +- .../autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java | 4 ++-- .../web/EmbeddedServletContainerAutoConfiguration.java | 2 +- .../zero/autoconfigure/web/MultipartAutoConfiguration.java | 2 +- .../web/ServerPropertiesAutoConfiguration.java | 2 +- .../zero/autoconfigure/web/WebMvcAutoConfiguration.java | 4 ++-- .../src/main/java/org/springframework/zero/main/Spring.java | 2 +- .../src/main/resources/META-INF/spring.factories | 2 +- .../AutoConfigurationSorterTest.java | 6 +++--- .../ComponentScanDetectorConfiguration.java | 4 ++-- .../data/JpaRepositoriesAutoConfigurationTests.java | 2 +- .../orm/jpa/HibernateJpaAutoConfigurationTests.java | 2 +- .../sample/actuator/ui/SampleActuatorUiApplication.java | 2 +- .../zero/sample/actuator/SampleActuatorApplication.java | 2 +- .../zero/sample/batch/SampleBatchApplication.java | 2 +- .../zero/sample/data/jpa/SampleDataJpaApplication.java | 2 +- .../sample/integration/SampleIntegrationApplication.java | 2 +- .../zero/sample/jetty/SampleJettyApplication.java | 2 +- .../zero/sample/profile/SampleProfileApplication.java | 2 +- .../zero/sample/simple/SampleSimpleApplication.java | 2 +- .../zero/sample/tomcat/SampleTomcatApplication.java | 2 +- .../sample/traditional/SampleTraditionalApplication.java | 2 +- .../zero/sample/web/ui/SampleWebUiApplication.java | 2 +- 47 files changed, 54 insertions(+), 57 deletions(-) rename spring-zero-autoconfigure/src/main/java/org/springframework/zero/{context/annotation => autoconfigure}/AutoConfigurationSorter.java (99%) rename spring-zero-autoconfigure/src/main/java/org/springframework/zero/{context/annotation => autoconfigure}/AutoConfigureAfter.java (95%) rename spring-zero-autoconfigure/src/main/java/org/springframework/zero/{context/annotation => autoconfigure}/ComponentScanDetector.java (97%) rename spring-zero-autoconfigure/src/main/java/org/springframework/zero/{context/annotation => autoconfigure}/EnableAutoConfiguration.java (98%) rename spring-zero-autoconfigure/src/main/java/org/springframework/zero/{context/annotation => autoconfigure}/EnableAutoConfigurationImportSelector.java (98%) rename spring-zero-autoconfigure/src/test/java/org/springframework/zero/{context/annotation => autoconfigure}/AutoConfigurationSorterTest.java (93%) rename spring-zero-autoconfigure/src/test/java/org/springframework/zero/{context/annotation => autoconfigure}/ComponentScanDetectorConfiguration.java (87%) diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java index 9f116f61d8..a502a954e8 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java @@ -25,7 +25,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java index 0a6eb7f392..f6562cb879 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -44,8 +44,8 @@ import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; import org.springframework.zero.actuate.metrics.MetricRepository; import org.springframework.zero.actuate.trace.InMemoryTraceRepository; import org.springframework.zero.actuate.trace.TraceRepository; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.bind.PropertiesConfigurationFactory; -import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 2f7e2b91ee..44a61686f0 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -35,11 +35,11 @@ import org.springframework.zero.actuate.endpoint.Endpoint; import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping; import org.springframework.zero.actuate.properties.ManagementServerProperties; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.zero.context.annotation.AutoConfigureAfter; -import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index 4e58c8f91f..6fc8c40d37 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java @@ -23,7 +23,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index 6276e1fce3..cfed5aa9c9 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -18,9 +18,9 @@ package org.springframework.zero.actuate.autoconfigure; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.zero.actuate.properties.ManagementServerProperties; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration; -import org.springframework.zero.context.annotation.AutoConfigureAfter; -import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.properties.EnableConfigurationProperties; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java index ffac0ce773..91c73d9dca 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -37,8 +37,8 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnBean; import org.springframework.zero.context.condition.ConditionalOnClass; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index 198a5c2d96..ec3b14cc81 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -24,7 +24,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java index 0adf656542..27f7350fe6 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -41,7 +41,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.properties.EnableConfigurationProperties; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index c3df801e05..ecdc89e308 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java @@ -20,7 +20,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index d11b986fe0..b4f8165783 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -24,8 +24,8 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; /** 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 61e36f9039..0448f3aa7b 100644 --- a/spring-zero-actuator/src/main/resources/META-INF/spring.factories +++ b/spring-zero-actuator/src/main/resources/META-INF/spring.factories @@ -1,4 +1,4 @@ -org.springframework.zero.context.annotation.EnableAutoConfiguration=\ +org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\ org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\ org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java similarity index 99% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java index dc1d31d1aa..78c328b760 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigurationSorter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java similarity index 95% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java index 74d636f8d9..ba145a7f39 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/AutoConfigureAfter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java similarity index 97% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java index e6ce10fa44..5dcbe71f22 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/ComponentScanDetector.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import java.io.IOException; import java.util.ArrayList; @@ -42,7 +42,6 @@ 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/zero/context/annotation/EnableAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java similarity index 98% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java index 297d108857..7c98ac9016 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java similarity index 98% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java rename to spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java index c49e33449d..19ba4860ab 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/context/annotation/EnableAutoConfigurationImportSelector.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java index 9b12d31318..5752c7f528 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java @@ -23,7 +23,6 @@ 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.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java index f30992d2f0..ba8f356fca 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java @@ -22,7 +22,6 @@ 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.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java index 6619df74a3..23e4c7a9b8 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java @@ -21,7 +21,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnBean; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index bd0c79b354..6993c5c6a1 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java @@ -21,7 +21,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 7ff79f7010..11688f071b 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -46,7 +46,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionLogUtils; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index 0db0698806..ef0c1b2045 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -25,7 +25,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnBean; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java index a1208565f4..1882c7eb36 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java @@ -28,7 +28,7 @@ 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; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for embedded databases. diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index a6fb34e73c..57a5476a57 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -30,7 +30,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; /** diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java index 4047e8201b..1f04e3936a 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -35,8 +35,8 @@ import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.util.Assert; import org.springframework.zero.autoconfigure.AutoConfigurationUtils; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnBean; import org.springframework.zero.context.condition.ConditionalOnClass; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index 15263e4518..ff4b7a46c5 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -31,9 +31,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.zero.context.annotation.AutoConfigureAfter; -import org.springframework.zero.context.annotation.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.condition.ConditionalOnMissingClass; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java index 2ff99895f0..f392c99eb0 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java @@ -26,7 +26,7 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java index 56b955d5d7..618ce17e10 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java @@ -22,7 +22,7 @@ import javax.servlet.Servlet; 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnBean; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.embedded.EmbeddedWebApplicationContext; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java index 50d62ad19d..cbdc3f4d92 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.zero.context.annotation.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnMissingBean; import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java index 388fe7793f..7ab425327d 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java @@ -48,8 +48,8 @@ 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.EnableAutoConfiguration; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.condition.ConditionalOnBean; import org.springframework.zero.context.condition.ConditionalOnClass; import org.springframework.zero.context.condition.ConditionalOnMissingBean; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java index 7695a544ab..ab6776e616 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java @@ -27,7 +27,7 @@ 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; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; /** * Very simple main class that can be used to launch an application from sources (class, diff --git a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories index aed5273ce0..5e294a113e 100644 --- a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,5 +1,5 @@ # Auto Configure -org.springframework.zero.context.annotation.EnableAutoConfiguration=\ +org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ org.springframework.zero.autoconfigure.MessageSourceAutoConfiguration,\ org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration,\ org.springframework.zero.autoconfigure.batch.BatchAutoConfiguration,\ diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java similarity index 93% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java index 855927731a..b606b3d403 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/AutoConfigurationSorterTest.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import java.util.Arrays; import java.util.List; @@ -25,8 +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 org.springframework.zero.autoconfigure.AutoConfigurationSorter; +import org.springframework.zero.autoconfigure.AutoConfigureAfter; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java similarity index 87% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java rename to spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java index e35802a9bc..d906288817 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/context/annotation/ComponentScanDetectorConfiguration.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.context.annotation; +package org.springframework.zero.autoconfigure; import org.springframework.context.annotation.Import; -import org.springframework.zero.context.annotation.ComponentScanDetector; +import org.springframework.zero.autoconfigure.ComponentScanDetector; /** * Simple configuration to import {@link ComponentScanDetector} for tests. diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index 75ec5efb88..d4cdb555f7 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java @@ -23,13 +23,13 @@ import org.springframework.context.annotation.AnnotationConfigApplicationContext import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; +import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.zero.autoconfigure.data.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/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index 8d2460f637..fd7100294e 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -22,12 +22,12 @@ import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.zero.autoconfigure.orm.jpa.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-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java index a06fd2b1d9..ae7c95711b 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java @@ -9,7 +9,7 @@ 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; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @EnableAutoConfiguration @ComponentScan diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java index 6fcebb6e6e..53d75618c9 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java @@ -19,7 +19,7 @@ package org.springframework.zero.sample.actuator; 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.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java index e0f11cb4e9..5c6113c7c8 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java @@ -30,7 +30,7 @@ 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; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java index e24cfd367f..595a5d56c6 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java @@ -19,7 +19,7 @@ package org.springframework.zero.sample.data.jpa; 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.autoconfigure.EnableAutoConfiguration; @Configuration @ComponentScan diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java index 5b4cb80d4a..b1fab4e9eb 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java @@ -20,7 +20,7 @@ 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.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java index fdce7ca4e1..2921133652 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java @@ -19,7 +19,7 @@ package org.springframework.zero.sample.jetty; 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.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java index 25eeacaddf..9846ac5f64 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java @@ -21,7 +21,7 @@ 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.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.sample.profile.service.MessageService; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java index 2381784c17..0119ea60cb 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java @@ -21,7 +21,7 @@ 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.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.sample.simple.service.HelloWorldService; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java index 9de6c7b92d..66abcd2445 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java @@ -19,7 +19,7 @@ package org.springframework.zero.sample.tomcat; 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.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java index bf42dcb910..a36d7c6bee 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java @@ -19,7 +19,7 @@ package org.springframework.zero.sample.traditional; 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.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java index 64c2957e6e..18c9bd4f2e 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java @@ -21,7 +21,7 @@ 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; +import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration From 4e15d705aafc1568d4288320287811ba4fe3f124 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jul 2013 01:42:43 -0700 Subject: [PATCH 10/15] Remove servet/filter class tangle Remove class tangle between ServletRegistrationBean and FilterRegistrationBean. --- .../EmbeddedWebApplicationContext.java | 3 - .../embedded/ServletRegistrationBean.java | 35 ------------ .../EmbeddedWebApplicationContextTests.java | 5 -- .../ServletRegistrationBeanTests.java | 57 +++++-------------- 4 files changed, 14 insertions(+), 86 deletions(-) diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java index d3030fe970..b319ab9691 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java @@ -206,9 +206,6 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext if (initializer instanceof RegistrationBean) { targets.add(((RegistrationBean) initializer).getRegistrationTarget()); } - if (initializer instanceof ServletRegistrationBean) { - targets.addAll(((ServletRegistrationBean) initializer).getFilters()); - } initializers.add(initializer); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java index 53bc37433d..0756ba0185 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.LinkedHashSet; import java.util.Set; -import javax.servlet.Filter; import javax.servlet.MultipartConfigElement; import javax.servlet.Servlet; import javax.servlet.ServletContext; @@ -55,8 +54,6 @@ public class ServletRegistrationBean extends RegistrationBean { private int loadOnStartup = 1; - private Set filters = new LinkedHashSet(); - private MultipartConfigElement multipartConfig; /** @@ -121,32 +118,6 @@ public class ServletRegistrationBean extends RegistrationBean { this.loadOnStartup = loadOnStartup; } - /** - * Sets any Filters that should be registered to this servlet. Any previously - * specified Filters will be replaced. - * @param filters the Filters to set - */ - public void setFilters(Collection filters) { - Assert.notNull(filters, "Filters must not be null"); - this.filters = new LinkedHashSet(filters); - } - - /** - * Returns a mutable collection of the Filters being registered with this servlet. - */ - public Collection getFilters() { - return this.filters; - } - - /** - * Add Filters that will be registered with this servlet. - * @param filters the Filters to add - */ - public void addFilters(Filter... filters) { - Assert.notNull(filters, "Filters must not be null"); - this.filters.addAll(Arrays.asList(filters)); - } - /** * Set the the {@link MultipartConfigElement multi-part configuration}. * @param multipartConfig the muti-part configuration to set or {@code null} @@ -179,12 +150,6 @@ public class ServletRegistrationBean extends RegistrationBean { public void onStartup(ServletContext servletContext) throws ServletException { Assert.notNull(this.servlet, "Servlet must not be null"); configure(servletContext.addServlet(getServletName(), this.servlet)); - for (Filter filter : this.filters) { - FilterRegistrationBean filterRegistration = new FilterRegistrationBean( - filter, this); - filterRegistration.setAsyncSupported(isAsyncSupported()); - filterRegistration.onStartup(servletContext); - } } /** diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java index b2e00e6b91..adc48e3a4e 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java @@ -40,10 +40,6 @@ 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; @@ -310,7 +306,6 @@ public class EmbeddedWebApplicationContextTests { Servlet servlet = mock(Servlet.class); Filter filter = mock(Filter.class); ServletRegistrationBean initializer = new ServletRegistrationBean(servlet, "/foo"); - initializer.addFilters(filter); this.context.registerBeanDefinition("initializerBean", beanDefinition(initializer)); this.context.registerBeanDefinition("servletBean", beanDefinition(servlet)); diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java index 18f0008ded..cfaa3a374c 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java @@ -18,12 +18,10 @@ package org.springframework.zero.context.embedded; import java.util.Arrays; import java.util.Collections; -import java.util.EnumSet; import java.util.HashMap; import java.util.LinkedHashSet; import java.util.Map; -import javax.servlet.DispatcherType; import javax.servlet.Filter; import javax.servlet.FilterRegistration; import javax.servlet.Servlet; @@ -36,11 +34,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.zero.context.embedded.ServletRegistrationBean; -import static org.mockito.BDDMockito.*; -import static org.mockito.Matchers.*; -import static org.mockito.Mockito.*; +import static org.mockito.BDDMockito.given; +import static org.mockito.Matchers.anyObject; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.verify; /** * Tests for {@link ServletRegistrationBean}. @@ -123,38 +121,38 @@ public class ServletRegistrationBeanTests { @Test public void setServletMustNotBeNull() throws Exception { ServletRegistrationBean bean = new ServletRegistrationBean(); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("Servlet must not be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("Servlet must not be null"); bean.onStartup(this.servletContext); } @Test public void createServletMustNotBeNull() throws Exception { - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("Servlet must not be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("Servlet must not be null"); new ServletRegistrationBean(null); } @Test public void setMappingMustNotBeNull() throws Exception { ServletRegistrationBean bean = new ServletRegistrationBean(this.servlet); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("UrlMappings must not be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("UrlMappings must not be null"); bean.setUrlMappings(null); } @Test public void createMappingMustNotBeNull() throws Exception { - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("UrlMappings must not be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("UrlMappings must not be null"); new ServletRegistrationBean(this.servlet, (String[]) null); } @Test public void addMappingMustNotBeNull() throws Exception { ServletRegistrationBean bean = new ServletRegistrationBean(this.servlet); - thrown.expect(IllegalArgumentException.class); - thrown.expectMessage("UrlMappings must not be null"); + this.thrown.expect(IllegalArgumentException.class); + this.thrown.expectMessage("UrlMappings must not be null"); bean.addUrlMappings((String[]) null); } @@ -177,31 +175,4 @@ public class ServletRegistrationBeanTests { verify(this.registration).setInitParameters(Collections.singletonMap("a", "c")); } - @Test - public void filters() throws Exception { - ServletRegistrationBean bean = new ServletRegistrationBean(this.servlet); - Filter filter = new MockFilter(); - bean.addFilters(filter); - bean.onStartup(this.servletContext); - verify(servletContext).addFilter("mockFilter", filter); - verify(filterRegistration).setAsyncSupported(true); - verify(filterRegistration).addMappingForServletNames( - EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, - DispatcherType.INCLUDE, DispatcherType.ASYNC), false, - "mockServlet"); - } - - @Test - public void filtersNoAsync() throws Exception { - ServletRegistrationBean bean = new ServletRegistrationBean(this.servlet); - Filter filter = new MockFilter(); - bean.addFilters(filter); - bean.setAsyncSupported(false); - bean.onStartup(this.servletContext); - verify(servletContext).addFilter("mockFilter", filter); - verify(filterRegistration).setAsyncSupported(false); - verify(filterRegistration).addMappingForServletNames( - EnumSet.of(DispatcherType.REQUEST, DispatcherType.FORWARD, - DispatcherType.INCLUDE), false, "mockServlet"); - } } From f4cab8aaf7d74b1a5b7032fbfbb45805e412466b Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jul 2013 01:04:28 -0700 Subject: [PATCH 11/15] Add structure 101 project --- spring-zero.java.hsp | 236 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 236 insertions(+) create mode 100644 spring-zero.java.hsp diff --git a/spring-zero.java.hsp b/spring-zero.java.hsp new file mode 100644 index 0000000000..08f9d8e5d6 --- /dev/null +++ b/spring-zero.java.hsp @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Top-level breakout (depth=2) + + + + From 346a0bace76d810954cc4a8d53f6cfeef398daad Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jul 2013 11:45:25 -0700 Subject: [PATCH 12/15] Minor pom tweaks Fix warnings and include sonar support. --- pom.xml | 14 ++++++++++---- spring-zero-intergration-tests/pom.xml | 1 + 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index ad61ff648c..66b5adc1c2 100644 --- a/pom.xml +++ b/pom.xml @@ -72,10 +72,6 @@ maven-eclipse-plugin 2.9 - - maven-exec-plugin - 1.2.1 - maven-failsafe-plugin 2.13 @@ -124,6 +120,16 @@ maven-war-plugin 2.3 + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + org.codehaus.mojo + sonar-maven-plugin + 2.0 + org.codehaus.mojo versions-maven-plugin diff --git a/spring-zero-intergration-tests/pom.xml b/spring-zero-intergration-tests/pom.xml index f58ee26e26..99411dd398 100644 --- a/spring-zero-intergration-tests/pom.xml +++ b/spring-zero-intergration-tests/pom.xml @@ -89,6 +89,7 @@ src/it/settings.xml ${project.parent.basedir}/spring-zero-samples/ ${project.build.directory}/local-repo + ${skipTests} From 9fde0a3715d00c1a3fc968b856db036ca4a8845c Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Sun, 7 Jul 2013 16:23:32 -0700 Subject: [PATCH 13/15] Polish and fix sonar warnings --- spring-zero-actuator/pom.xml | 7 + .../EndpointAutoConfiguration.java | 1 + .../EndpointWebMvcAutoConfiguration.java | 3 - ...dpointWebMvcChildContextConfiguration.java | 1 + ...mentServerPropertiesAutoConfiguration.java | 1 + .../MetricFilterAutoConfiguration.java | 2 +- .../TraceWebFilterAutoConfiguration.java | 1 + .../actuate/endpoint/ShutdownEndpoint.java | 3 +- .../endpoint/mvc/EndpointHandlerAdapter.java | 8 +- .../endpoint/mvc/EndpointHandlerMapping.java | 1 + .../actuate/trace/WebRequestTraceFilter.java | 6 +- .../actuate/web/BasicErrorController.java | 16 ++- .../zero/actuate/TestUtils.java | 43 ------ .../audit/listener/AuditListenerTests.java | 3 +- .../EndpointAutoConfigurationTests.java | 4 +- .../EndpointWebMvcAutoConfigurationTests.java | 5 +- ...erverPropertiesAutoConfigurationTests.java | 2 +- .../endpoint/AbstractEndpointTests.java | 3 +- .../InMemoryMetricRepositoryTests.java | 2 +- .../AutoConfigurationSorter.java | 1 + .../autoconfigure/AutoConfigurationUtils.java | 8 +- .../autoconfigure/AutoConfigureAfter.java | 1 + .../jdbc/BasicDataSourceConfiguration.java | 4 +- .../jdbc/DataSourceAutoConfiguration.java | 67 +++++---- .../jpa/HibernateJpaAutoConfiguration.java | 15 +- .../orm/jpa/JpaAutoConfiguration.java | 4 +- .../thymeleaf/ThymeleafAutoConfiguration.java | 2 +- .../org/springframework/zero/main/Spring.java | 2 +- .../AutoConfigurationSorterTest.java | 3 +- .../MessageSourceAutoConfigurationTests.java | 4 +- .../zero/autoconfigure/SpringJUnitTests.java | 3 +- .../batch/BatchAutoConfigurationTests.java | 4 +- .../JobExecutionExitCodeGeneratorTests.java | 4 +- ...JpaRepositoriesAutoConfigurationTests.java | 3 +- .../data/JpaWebAutoConfigurationTests.java | 3 +- .../BasicDataSourceConfigurationTests.java | 3 +- .../DataSourceAutoConfigurationTests.java | 3 +- ...nsactionManagerAutoConfigurationTests.java | 4 +- .../EmbeddedDatabaseConfigurationTests.java | 3 +- .../TomcatDataSourceConfigurationTests.java | 4 +- .../HibernateJpaAutoConfigurationTests.java | 3 +- .../ThymeleafAutoConfigurationTests.java | 2 +- .../web/WebMvcAutoConfigurationTests.java | 3 +- .../zero/main/SimpleMainTests.java | 3 +- .../org/springframework/zero/cli/Log.java | 38 +++++ .../zero/cli/SpringZeroCli.java | 70 ++++----- .../zero/cli/command/CleanCommand.java | 93 ++++++------ .../zero/cli/command/OptionHandler.java | 2 +- .../zero/cli/command/ScriptCommand.java | 79 +++++----- .../cli/compiler/DependencyCustomizer.java | 11 +- .../SpringZeroCompilerAutoConfiguration.java | 9 +- .../zero/cli/runner/SpringZeroRunner.java | 4 +- .../zero/cli/template/GroovyTemplate.java | 2 +- .../zero/cli/SampleIntegrationTests.java | 2 + .../zero/cli/command/ScriptCommandTests.java | 6 +- .../zero/BeanDefinitionLoader.java | 65 +++++---- .../zero/SpringApplication.java | 18 +-- .../zero/bind/CustomPropertyConstructor.java | 4 +- .../zero/bind/InetAddressEditor.java | 4 +- .../bind/PropertiesConfigurationFactory.java | 24 ++-- .../zero/bind/RelaxedDataBinder.java | 1 + .../zero/bind/YamlConfigurationFactory.java | 59 ++++---- .../zero/config/JacksonJsonParser.java | 19 ++- .../zero/config/JsonParser.java | 1 + .../zero/config/JsonParserFactory.java | 2 +- .../zero/config/YamlJsonParser.java | 10 +- .../zero/config/YamlProcessor.java | 136 ++++++++---------- .../condition/AbstractOnBeanCondition.java | 6 +- .../context/condition/ConditionLogUtils.java | 2 +- .../condition/OnExpressionCondition.java | 1 + ...stractEmbeddedServletContainerFactory.java | 48 ++++--- ...onConfigEmbeddedWebApplicationContext.java | 10 +- ...tContainerCustomizerBeanPostProcessor.java | 1 + .../EmbeddedWebApplicationContext.java | 4 +- .../embedded/FilterRegistrationBean.java | 9 +- .../embedded/ServletRegistrationBean.java | 6 +- .../XmlEmbeddedWebApplicationContext.java | 16 ++- .../TomcatEmbeddedServletContainer.java | 3 +- ...nfigFileApplicationContextInitializer.java | 13 +- .../LoggingApplicationContextInitializer.java | 4 - .../zero/logging/JavaLoggerConfigurer.java | 13 +- .../zero/logging/LogbackConfigurer.java | 4 +- .../zero/web/SpringServletInitializer.java | 27 +++- .../org/springframework/zero/TestUtils.java | 4 +- .../PropertySourcesPropertyValuesTests.java | 2 +- .../bind/YamlConfigurationFactoryTests.java | 3 +- .../zero/config/JacksonParserTests.java | 6 +- .../zero/config/SimpleJsonParserTests.java | 6 +- ...serTests.java => YamlJsonParserTests.java} | 8 +- .../zero/config/YamlMapFactoryBeanTests.java | 3 +- .../YamlPropertiesFactoryBeanTests.java | 3 +- .../condition/OnClassConditionTests.java | 2 + .../condition/OnExpressionConditionTests.java | 3 +- .../OnMissingClassConditionTests.java | 2 + ...=> OnNotWebApplicationConditionTests.java} | 4 +- .../condition/OnResourceConditionTests.java | 3 +- ...va => OnWebApplicationConditionTests.java} | 4 +- ...tEmbeddedServletContainerFactoryTests.java | 2 +- ...tIdApplicationContextInitializerTests.java | 5 +- ...capApplicationContextInitializerTests.java | 5 +- .../logging/JavaLoggerConfigurerTests.java | 3 +- .../zero/logging/LogbackConfigurerTests.java | 2 + ...ngApplicationContextInitializerTests.java} | 12 +- .../zero/logging/TestFormatter.java | 2 + .../zero/launcher/Launcher.java | 4 +- .../zero/launcher/MainMethodRunner.java | 12 +- .../launcher/data/RandomAccessDataFile.java | 8 +- .../launcher/jar/RandomAccessJarFile.java | 58 ++++---- .../zero/maven/MainClassFinder.java | 2 +- .../PropertiesMergingResourceTransformer.java | 11 +- .../zero/maven/MainClassFinderTests.java | 2 +- ...ertiesMergingResourceTransformerTests.java | 5 +- .../maven/sample/ClassWithoutMainMethod.java | 1 + .../ui/SampleActuatorUiApplication.java | 16 +++ .../SampleActuatorUiApplicationPortTests.java | 22 ++- .../ui/SampleActuatorUiApplicationTests.java | 16 +++ ...pertiesSampleActuatorApplicationTests.java | 17 ++- ...AddressSampleActuatorApplicationTests.java | 21 ++- ...agementSampleActuatorApplicationTests.java | 22 ++- ...agementSampleActuatorApplicationTests.java | 18 ++- .../SampleActuatorApplicationTests.java | 18 ++- ...hutdownSampleActuatorApplicationTests.java | 18 ++- ...nsecureSampleActuatorApplicationTests.java | 16 +++ .../batch/SampleBatchApplicationTests.java | 2 +- .../src/main/resources/application.properties | 2 +- .../jpa/SampleDataJpaApplicationTests.java | 17 ++- .../SampleIntegrationApplicationTests.java | 16 +++ .../producer/ProducerApplication.java | 16 +++ .../jetty/SampleJettyApplicationTests.java | 16 +++ .../SampleProfileApplicationTests.java | 17 ++- .../simple/SampleSimpleApplicationTests.java | 16 +++ ...igurationSampleTomcatApplicationTests.java | 17 ++- .../tomcat/SampleTomcatApplicationTests.java | 16 +++ .../SampleTraditionalApplicationTests.java | 17 ++- .../xml/SampleSpringXmlApplicationTests.java | 17 ++- 135 files changed, 1023 insertions(+), 611 deletions(-) delete mode 100644 spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java create mode 100644 spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java rename spring-zero-core/src/test/java/org/springframework/zero/config/{YamlParserTests.java => YamlJsonParserTests.java} (82%) rename spring-zero-core/src/test/java/org/springframework/zero/context/condition/{NotWebApplicationConditionTests.java => OnNotWebApplicationConditionTests.java} (95%) rename spring-zero-core/src/test/java/org/springframework/zero/context/condition/{WebApplicationConditionTests.java => OnWebApplicationConditionTests.java} (95%) rename spring-zero-core/src/test/java/org/springframework/zero/logging/{LoggingInitializerTests.java => LoggingApplicationContextInitializerTests.java} (90%) diff --git a/spring-zero-actuator/pom.xml b/spring-zero-actuator/pom.xml index 528da315bd..a0e2d92625 100644 --- a/spring-zero-actuator/pom.xml +++ b/spring-zero-actuator/pom.xml @@ -67,6 +67,13 @@ true + + ${project.groupId} + spring-zero-core + ${project.version} + tests + test + org.apache.tomcat.embed tomcat-embed-logging-juli diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java index f6562cb879..daed4987a7 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; import java.util.LinkedHashMap; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 44a61686f0..7064f240c2 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -67,9 +67,6 @@ public class EndpointWebMvcAutoConfiguration implements ApplicationContextAware, private ApplicationContext applicationContext; - @Autowired(required = false) - private ServerProperties serverProperties = new ServerProperties(); - @Autowired(required = false) private ManagementServerProperties managementServerProperties = new ManagementServerProperties(); diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index 067f94c6b2..e5b4e23a7b 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Filter; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index cfed5aa9c9..a91a51e057 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; import org.springframework.context.annotation.Bean; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 91c73d9dca..5c883c2ff8 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -112,7 +112,7 @@ public class MetricFilterAutoConfiguration { try { return response.getStatus(); } - catch (Exception e) { + catch (Exception ex) { return UNDEFINED_HTTP_STATUS; } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index b4f8165783..79a25fd5fc 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; import javax.servlet.Servlet; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java index b7816fac96..ec9e8092bb 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java @@ -62,7 +62,8 @@ public class ShutdownEndpoint extends AbstractEndpoint> impl try { Thread.sleep(500L); } - catch (InterruptedException e) { + catch (InterruptedException ex) { + // Swallow exception and continue } ShutdownEndpoint.this.context.close(); } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java index 3c36e5d2ee..1691cf0686 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java @@ -50,9 +50,9 @@ import com.fasterxml.jackson.databind.SerializationFeature; * @author Phillip Webb * @see EndpointHandlerMapping */ -public class EndpointHandlerAdapter implements HandlerAdapter { +public final class EndpointHandlerAdapter implements HandlerAdapter { - private static final Log logger = LogFactory.getLog(EndpointHandlerAdapter.class); + private final Log logger = LogFactory.getLog(getClass()); private static final MediaType MEDIA_TYPE_APPLICATION = new MediaType("application"); @@ -102,8 +102,8 @@ public class EndpointHandlerAdapter implements HandlerAdapter { if (messageConverter.canWrite(resultClass, selectedMediaType)) { ((HttpMessageConverter) messageConverter).write(result, selectedMediaType, outputMessage); - if (logger.isDebugEnabled()) { - logger.debug("Written [" + result + "] as \"" + if (this.logger.isDebugEnabled()) { + this.logger.debug("Written [" + result + "] as \"" + selectedMediaType + "\" using [" + messageConverter + "]"); } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java index 14a680b926..ea2f38a1ad 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.endpoint.mvc; import java.util.ArrayList; diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java index fd87256609..19e87b8e6d 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java @@ -46,7 +46,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; */ public class WebRequestTraceFilter implements Filter, Ordered { - final Log logger = LogFactory.getLog(WebRequestTraceFilter.class); + private final Log logger = LogFactory.getLog(WebRequestTraceFilter.class); private boolean dumpRequests = false; @@ -102,8 +102,8 @@ public class WebRequestTraceFilter implements Filter, Ordered { this.logger.trace("Headers: " + this.objectMapper.writeValueAsString(headers)); } - catch (JsonProcessingException e) { - throw new IllegalStateException("Cannot create JSON", e); + catch (JsonProcessingException ex) { + throw new IllegalStateException("Cannot create JSON", ex); } } } diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java index ec1d61cd27..a88d145daa 100644 --- a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java +++ b/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java @@ -47,6 +47,8 @@ import org.springframework.zero.context.embedded.AbstractEmbeddedServletContaine @Controller public class BasicErrorController implements ErrorController { + private static final String ERROR_KEY = "error"; + private Log logger = LogFactory.getLog(BasicErrorController.class); @Value("${error.path:/error}") @@ -60,7 +62,7 @@ public class BasicErrorController implements ErrorController { @RequestMapping(value = "${error.path:/error}", produces = "text/html") public ModelAndView errorHtml(HttpServletRequest request) { Map map = error(request); - return new ModelAndView("error", map); + return new ModelAndView(ERROR_KEY, map); } @RequestMapping(value = "${error.path:/error}") @@ -75,10 +77,10 @@ public class BasicErrorController implements ErrorController { int status = 999; if (obj != null) { status = (Integer) obj; - map.put("error", HttpStatus.valueOf(status).getReasonPhrase()); + map.put(ERROR_KEY, HttpStatus.valueOf(status).getReasonPhrase()); } else { - map.put("error", "None"); + map.put(ERROR_KEY, "None"); } map.put("status", status); if (error != null) { @@ -102,10 +104,10 @@ public class BasicErrorController implements ErrorController { } return map; } - catch (Exception e) { - map.put("error", e.getClass().getName()); - map.put("message", e.getMessage()); - this.logger.error(e); + catch (Exception ex) { + map.put(ERROR_KEY, ex.getClass().getName()); + map.put("message", ex.getMessage()); + this.logger.error(ex); return map; } } diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java deleted file mode 100644 index e0e4ea2fec..0000000000 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/TestUtils.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2012-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.zero.actuate; - -import java.util.HashMap; -import java.util.Map; - -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.env.MapPropertySource; - -/** - * @author Dave Syer - * - */ -public class TestUtils { - - public static void addEnviroment(ConfigurableApplicationContext context, - String... pairs) { - Map map = new HashMap(); - for (String pair : pairs) { - int index = pair.indexOf(":"); - String key = pair.substring(0, index > 0 ? index : pair.length()); - String value = index > 0 ? pair.substring(index + 1) : ""; - map.put(key, value); - } - context.getEnvironment().getPropertySources() - .addFirst(new MapPropertySource("test", map)); - } - -} diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java index 9031611cb8..8ea87c3337 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.audit.listener; import java.util.Collections; @@ -20,8 +21,6 @@ import java.util.Collections; import org.junit.Test; import org.springframework.zero.actuate.audit.AuditEvent; import org.springframework.zero.actuate.audit.AuditEventRepository; -import org.springframework.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/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java index 7955089ff5..b78a7b9781 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; import org.junit.Before; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.actuate.TestUtils; -import org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration; +import org.springframework.zero.TestUtils; import org.springframework.zero.actuate.endpoint.BeansEndpoint; import org.springframework.zero.actuate.endpoint.DumpEndpoint; import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 6724007ec6..4085fe9479 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; import java.io.FileNotFoundException; @@ -32,9 +33,7 @@ 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.TestUtils; import org.springframework.zero.actuate.endpoint.AbstractEndpoint; import org.springframework.zero.actuate.endpoint.Endpoint; import org.springframework.zero.actuate.properties.ManagementServerProperties; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index e3ab86f5eb..ab5e6bb75d 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.actuate.autoconfigure; 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.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; import org.springframework.zero.actuate.properties.ManagementServerProperties; import static org.hamcrest.Matchers.equalTo; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java index 8b3e957e10..9c17c70e3e 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java @@ -24,8 +24,7 @@ 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 org.springframework.zero.TestUtils; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java index d19aca734d..89cd71d344 100644 --- a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java +++ b/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + 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-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java index 78c328b760..6655d71525 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.autoconfigure; import java.io.IOException; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java index a82fd13e7b..d3cc9d2464 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java @@ -28,20 +28,20 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; * Convenience class for storing base packages during component scan, for reference later * (e.g. by JPA entity scanner). * - * @author Phil Webb + * @author Phillip Webb * @author Dave Syer */ public abstract class AutoConfigurationUtils { - private static String BASE_PACKAGES_BEAN = AutoConfigurationUtils.class.getName() - + ".basePackages"; + private static final String BASE_PACKAGES_BEAN = AutoConfigurationUtils.class + .getName() + ".basePackages"; @SuppressWarnings("unchecked") public static List getBasePackages(BeanFactory beanFactory) { try { return beanFactory.getBean(BASE_PACKAGES_BEAN, List.class); } - catch (NoSuchBeanDefinitionException e) { + catch (NoSuchBeanDefinitionException ex) { return Collections.emptyList(); } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java index ba145a7f39..bbb3737002 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.autoconfigure; import java.lang.annotation.ElementType; diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java index e72c92d105..f43b25fbc9 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java @@ -59,9 +59,9 @@ public class BasicDataSourceConfiguration extends AbstractDataSourceConfiguratio try { this.pool.close(); } - catch (SQLException e) { + catch (SQLException ex) { throw new DataAccessResourceFailureException( - "Could not close data source", e); + "Could not close data source", ex); } } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 11688f071b..bfb97f2ac5 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -140,7 +140,7 @@ public class DataSourceAutoConfiguration { static class SomeDatabaseCondition implements Condition { - protected Log logger = LogFactory.getLog(getClass()); + private Log logger = LogFactory.getLog(getClass()); private Condition tomcatCondition = new TomcatDatabaseCondition(); @@ -157,24 +157,22 @@ public class DataSourceAutoConfiguration { || this.dbcpCondition.matches(context, metadata) || this.embeddedCondition.matches(context, metadata)) { if (this.logger.isDebugEnabled()) { - this.logger.debug(checking - + "Existing auto database detected: match result true"); + this.logger.debug(checking + "Existing auto database " + + "detected: match result true"); } return true; } if (BeanFactoryUtils.beanNamesForTypeIncludingAncestors( context.getBeanFactory(), DataSource.class, true, false).length > 0) { if (this.logger.isDebugEnabled()) { - this.logger - .debug(checking - + "Existing bean configured database detected: match result true"); + this.logger.debug(checking + "Existing bean configured database " + + "detected: match result true"); } return true; } if (this.logger.isDebugEnabled()) { - this.logger - .debug(checking - + "Existing bean configured database not detected: match result false"); + this.logger.debug(checking + "Existing bean configured database not " + + "detected: match result false"); } return false; } @@ -210,7 +208,7 @@ public class DataSourceAutoConfiguration { static abstract class NonEmbeddedDatabaseCondition implements Condition { - protected Log logger = LogFactory.getLog(getClass()); + private Log logger = LogFactory.getLog(getClass()); protected abstract String getDataSourecClassName(); @@ -225,9 +223,29 @@ public class DataSourceAutoConfiguration { } return false; } + + String driverClassName = getDriverClassName(context, checking); + String url = getUrl(context); + + if (driverClassName != null && url != null + && ClassUtils.isPresent(driverClassName, null)) { + if (this.logger.isDebugEnabled()) { + this.logger.debug(checking + "Driver class " + driverClassName + + " found"); + } + return true; + } + + if (this.logger.isDebugEnabled()) { + this.logger.debug(checking + "Driver class " + driverClassName + + " not found"); + } + return false; + } + + private String getDriverClassName(ConditionContext context, String checking) { String driverClassName = context.getEnvironment().getProperty( "spring.database.driverClassName"); - String url = context.getEnvironment().getProperty("spring.database.url"); if (this.logger.isDebugEnabled()) { this.logger.debug(checking + "Spring JDBC detected (embedded database type is " @@ -238,31 +256,23 @@ public class DataSourceAutoConfiguration { .getEmbeddedDatabaseDriverClass(EmbeddedDatabaseConfiguration .getEmbeddedDatabaseType()); } + return driverClassName; + } + + private String getUrl(ConditionContext context) { + String url = context.getEnvironment().getProperty("spring.database.url"); if (url == null) { url = EmbeddedDatabaseConfiguration .getEmbeddedDatabaseUrl(EmbeddedDatabaseConfiguration .getEmbeddedDatabaseType()); } - if (driverClassName != null && url != null - && ClassUtils.isPresent(driverClassName, null)) { - if (this.logger.isDebugEnabled()) { - this.logger.debug(checking + "Driver class " + driverClassName - + " found"); - } - return true; - } - if (this.logger.isDebugEnabled()) { - this.logger.debug(checking + "Driver class " + driverClassName - + " not found"); - } - return false; + return url; } - } static class EmbeddedDatabaseCondition implements Condition { - protected Log logger = LogFactory.getLog(getClass()); + private Log logger = LogFactory.getLog(getClass()); private Condition tomcatCondition = new TomcatDatabaseCondition(); @@ -276,9 +286,8 @@ public class DataSourceAutoConfiguration { if (this.tomcatCondition.matches(context, metadata) || this.dbcpCondition.matches(context, metadata)) { if (this.logger.isDebugEnabled()) { - this.logger - .debug(checking - + "Existing non-embedded database detected: match result false"); + this.logger.debug(checking + "Existing non-embedded " + + "database detected: match result false"); } return false; } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index 57a5476a57..6bbce4d877 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -43,14 +43,6 @@ import org.springframework.zero.context.condition.ConditionalOnClass; @EnableTransactionManagement public class HibernateJpaAutoConfiguration extends JpaAutoConfiguration { - public static enum DDLAUTO { - none, validate, update, create, create_drop; - @Override - public String toString() { - return this.name().toLowerCase().replace("_", "-"); - } - } - private static final Map EMBEDDED_DATABASE_DIALECTS; static { EMBEDDED_DATABASE_DIALECTS = new LinkedHashMap(); @@ -68,7 +60,7 @@ public class HibernateJpaAutoConfiguration extends JpaAutoConfiguration { private boolean showSql; @Value("${spring.jpa.ddlAuto:${spring.jpa.ddl_auto:none}}") - private DDLAUTO ddlAuto; + private String ddlAuto; // e.g. none, validate, update, create, create-drop @Bean @Override @@ -89,10 +81,9 @@ public class HibernateJpaAutoConfiguration extends JpaAutoConfiguration { // FIXME: detect EhCache properties.put("hibernate.cache.provider_class", "org.hibernate.cache.HashtableCacheProvider"); - if (this.ddlAuto != DDLAUTO.none) { - properties.put("hibernate.hbm2ddl.auto", this.ddlAuto.toString()); + if (StringUtils.hasLength(this.ddlAuto) && !"none".equals(this.ddlAuto)) { + properties.put("hibernate.hbm2ddl.auto", this.ddlAuto); } - } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java index 1f04e3936a..e52feac6b9 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -79,7 +79,7 @@ public abstract class JpaAutoConfiguration implements BeanFactoryAware { return EmbeddedDatabaseConfiguration.class.getName().equals( beanDefinition.getFactoryBeanName()); } - catch (NoSuchBeanDefinitionException e) { + catch (NoSuchBeanDefinitionException ex) { return false; } } @@ -91,7 +91,7 @@ public abstract class JpaAutoConfiguration implements BeanFactoryAware { try { return this.beanFactory.getBean("dataSource", DataSource.class); } - catch (RuntimeException e) { + catch (RuntimeException ex) { return this.beanFactory.getBean(DataSource.class); } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index ff4b7a46c5..f5d3c71b70 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -85,7 +85,7 @@ public class ThymeleafAutoConfiguration { return DefaultTemplateResolverConfiguration.this.resourceLoader .getResource(resourceName).getInputStream(); } - catch (IOException e) { + catch (IOException ex) { return null; } } diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java index ab6776e616..c43563b796 100644 --- a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java +++ b/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java @@ -39,7 +39,7 @@ import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration @ComponentScan -public class Spring { +public abstract class Spring { // FIXME can we delete this? is it used? does it belong here diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java index b606b3d403..2af5c7e884 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.autoconfigure; import java.util.Arrays; @@ -25,8 +26,6 @@ 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.autoconfigure.AutoConfigurationSorter; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java index 504421bfa6..a3518be1cd 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -23,12 +23,12 @@ 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; /** + * Tests for {@link MessageSourceAutoConfiguration}. + * * @author Dave Syer */ public class MessageSourceAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java index 585ea7791f..dc99ba8a6c 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.autoconfigure; import org.junit.Test; @@ -24,7 +25,6 @@ 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; @@ -33,7 +33,6 @@ import static org.junit.Assert.assertNotNull; /** * @author Dave Syer - * */ @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = TestConfiguration.class, initializers = ConfigFileApplicationContextInitializer.class) diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java index efc393b29b..e1e2d2e9e0 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -34,13 +34,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.batch.BatchAutoConfiguration; -import org.springframework.zero.autoconfigure.batch.JobLauncherCommandLineRunner; import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import static org.junit.Assert.assertNotNull; /** + * Tests for {@link BatchAutoConfiguration}. + * * @author Dave Syer */ public class BatchAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java index 4f582039e2..c30dea1025 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java @@ -19,12 +19,12 @@ 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; /** + * Tests for {@link JobExecutionExitCodeGenerator}. + * * @author Dave Syer */ public class JobExecutionExitCodeGeneratorTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index d4cdb555f7..6b8a996259 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java @@ -25,7 +25,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.data.JpaRepositoriesAutoConfiguration; import org.springframework.zero.autoconfigure.data.test.City; import org.springframework.zero.autoconfigure.data.test.CityRepository; import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; @@ -34,6 +33,8 @@ import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfigurat import static org.junit.Assert.assertNotNull; /** + * Tests for {@link JpaRepositoriesAutoConfiguration}. + * * @author Dave Syer */ public class JpaRepositoriesAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java index 35c3084e2c..5678f3d1dd 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java @@ -24,7 +24,6 @@ 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; @@ -36,7 +35,7 @@ import static org.junit.Assert.assertNotNull; * @author Dave Syer */ @Ignore -// until spring data commons 1.6.0, jpa 1.5.0 available +// FIXME until spring data commons 1.6.0, jpa 1.5.0 available public class JpaWebAutoConfigurationTests { private AnnotationConfigWebApplicationContext context; diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java index 6eb40b3759..77fe2c1af2 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java @@ -20,11 +20,12 @@ 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; /** + * Tests for {@link BasicDataSourceConfiguration}. + * * @author Dave Syer */ public class BasicDataSourceConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index 8bfa4203e9..95fedfcec4 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -32,13 +32,14 @@ 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; import static org.junit.Assert.assertTrue; /** + * Tests for {@link DataSourceAutoConfiguration}. + * * @author Dave Syer */ public class DataSourceAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 5920d0e11d..7565bbc2a1 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -21,13 +21,13 @@ 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; /** + * Tests for {@link DataSourceTransactionManagerAutoConfiguration}. + * * @author Dave Syer */ public class DataSourceTransactionManagerAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java index 3df8fa63f2..b64dd093b8 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java @@ -20,11 +20,12 @@ 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; /** + * Tests for {@link EmbeddedDatabaseConfiguration}. + * * @author Dave Syer */ public class EmbeddedDatabaseConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 49a10d279f..95a3863fa9 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -28,12 +28,12 @@ import org.springframework.beans.factory.BeanCreationException; 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; /** + * Tests for {@link TomcatDataSourceConfiguration}. + * * @author Dave Syer */ public class TomcatDataSourceConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index fd7100294e..a27213ff48 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -26,13 +26,14 @@ import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.zero.autoconfigure.orm.jpa.test.City; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** + * Tests for {@link HibernateJpaAutoConfiguration}. + * * @author Dave Syer */ public class HibernateJpaAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java index 3e205f1d50..a5f9d355bd 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java @@ -30,7 +30,6 @@ 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; @@ -40,6 +39,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** + * Tests for {@link ThymeleafAutoConfiguration} * @author Dave Syer */ public class ThymeleafAutoConfigurationTests { diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java index 84813d0ba0..6031ab0d18 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.autoconfigure.web; import org.junit.Ignore; -import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; /** * Tests for {@link WebMvcAutoConfiguration}. @@ -25,6 +25,7 @@ import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; */ @Ignore public class WebMvcAutoConfigurationTests { + // FIXME } diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java index 7bdd74f4c0..3f6e03ed5e 100644 --- a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java +++ b/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java @@ -21,11 +21,12 @@ 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; /** + * Tests for {@link Spring}. + * * @author Dave Syer */ public class SimpleMainTests { diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java new file mode 100644 index 0000000000..b13e0428a0 --- /dev/null +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java @@ -0,0 +1,38 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.zero.cli; + +/** + * Simple logger used by the CLI. + * + * @author Phillip Webb + */ +public abstract class Log { + + public static void info(String message) { + System.out.println(message); + } + + public static void error(String message) { + System.err.println(message); + } + + public static void error(Exception ex) { + ex.printStackTrace(System.err); + } + +} diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java index ec73d328fb..2cc2161275 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java @@ -92,23 +92,27 @@ public class SpringZeroCli { return 1; } catch (Exception ex) { - Set options = NO_EXCEPTION_OPTIONS; - if (ex instanceof SpringZeroCliException) { - options = ((SpringZeroCliException) ex).getOptions(); - } - if (!(ex instanceof NoHelpCommandArgumentsException)) { - errorMessage(ex.getMessage()); - } - if (options.contains(SpringZeroCliException.Option.SHOW_USAGE)) { - showUsage(); - } - if (debug || options.contains(SpringZeroCliException.Option.STACK_TRACE)) { - printStackTrace(ex); - } - return 1; + return handleError(debug, ex); } } + private int handleError(boolean debug, Exception ex) { + Set options = NO_EXCEPTION_OPTIONS; + if (ex instanceof SpringZeroCliException) { + options = ((SpringZeroCliException) ex).getOptions(); + } + if (!(ex instanceof NoHelpCommandArgumentsException)) { + errorMessage(ex.getMessage()); + } + if (options.contains(SpringZeroCliException.Option.SHOW_USAGE)) { + showUsage(); + } + if (debug || options.contains(SpringZeroCliException.Option.STACK_TRACE)) { + printStackTrace(ex); + } + return 1; + } + /** * Parse the arguments and run a suitable command. * @param args the arguments @@ -133,28 +137,28 @@ public class SpringZeroCli { } protected void showUsage() { - System.out.print("usage: " + CLI_APP + " "); - System.out.println(""); - System.out.println(" []"); - System.out.println(""); - System.out.println("Available commands are:"); + Log.info("usage: " + CLI_APP + " "); + Log.info(""); + Log.info(" []"); + Log.info(""); + Log.info("Available commands are:"); for (Command command : this.commands) { - System.out.println(String.format("\n %1$s %2$-15s\n %3$s", - command.getName(), command.getUsageHelp(), command.getDescription())); + Log.info(String.format("\n %1$s %2$-15s\n %3$s", command.getName(), + command.getUsageHelp(), command.getDescription())); } - System.out.println(""); - System.out.println("See '" + CLI_APP + Log.info(""); + Log.info("See '" + CLI_APP + " help ' for more information on a specific command."); } protected void errorMessage(String message) { - System.err.println(message == null ? "Unexpected error" : message); + Log.error(message == null ? "Unexpected error" : message); } protected void printStackTrace(Exception ex) { - System.err.println(""); - ex.printStackTrace(System.err); - System.err.println(""); + Log.error(""); + Log.error(ex); + Log.error(""); } private String[] removeDebugFlags(String[] args) { @@ -187,16 +191,16 @@ public class SpringZeroCli { String commandName = args[0]; for (Command command : SpringZeroCli.this.commands) { if (command.getName().equals(commandName)) { - System.out.println(CLI_APP + " " + command.getName() + " - " + Log.info(CLI_APP + " " + command.getName() + " - " + command.getDescription()); - System.out.println(); + Log.info(""); if (command.getUsageHelp() != null) { - System.out.println("usage: " + CLI_APP + " " + command.getName() - + " " + command.getUsageHelp()); - System.out.println(); + Log.info("usage: " + CLI_APP + " " + command.getName() + " " + + command.getUsageHelp()); + Log.info(""); } if (command.getHelp() != null) { - System.out.println(command.getHelp()); + Log.info(command.getHelp()); } return; } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java index a664bc67df..8c5da886d3 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java @@ -25,6 +25,7 @@ import joptsimple.OptionSpec; import org.apache.ivy.util.FileUtil; import org.springframework.zero.cli.Command; +import org.springframework.zero.cli.Log; /** * {@link Command} to 'clean' up grapes, removing cached dependencies and forcing a @@ -35,9 +36,8 @@ import org.springframework.zero.cli.Command; public class CleanCommand extends OptionParsingCommand { public CleanCommand() { - super( - "clean", - "Clean up groovy grapes (useful if snapshots are needed and you need an update)", + super("clean", "Clean up groovy grapes " + + "(useful if snapshots are needed and you need an update)", new CleanOptionHandler()); } @@ -48,10 +48,6 @@ public class CleanCommand extends OptionParsingCommand { private static class CleanOptionHandler extends OptionHandler { - private static enum Layout { - IVY, MAVEN; - } - private OptionSpec allOption; private OptionSpec ivyOption; @@ -61,61 +57,68 @@ public class CleanCommand extends OptionParsingCommand { @Override protected void options() { this.allOption = option("all", "Clean all files (not just snapshots)"); - this.ivyOption = option("ivy", - "Clean just ivy (grapes) cache. Default is on unless --maven is used."); + this.ivyOption = option("ivy", "Clean just ivy (grapes) cache. " + + "Default is on unless --maven is used."); this.mvnOption = option("maven", "Clean just maven cache. Default is off."); } @Override protected void run(OptionSet options) throws Exception { if (!options.has(this.ivyOption)) { - clean(options, getGrapesHome(options), Layout.IVY); + clean(options, getGrapesHome(), Layout.IVY); } if (options.has(this.mvnOption)) { if (options.has(this.ivyOption)) { - clean(options, getGrapesHome(options), Layout.IVY); + clean(options, getGrapesHome(), Layout.IVY); } - clean(options, getMavenHome(options), Layout.MAVEN); + clean(options, getMavenHome(), Layout.MAVEN); } } private void clean(OptionSet options, File root, Layout layout) { - if (root == null || !root.exists()) { return; } - ArrayList specs = new ArrayList(options.nonOptionArguments()); if (!specs.contains("org.springframework.zero") && layout == Layout.IVY) { specs.add(0, "org.springframework.zero"); } for (String spec : specs) { - String group = spec; - String module = null; - if (spec.contains(":")) { - group = spec.substring(0, spec.indexOf(":")); - module = spec.substring(spec.indexOf(":") + 1); - } - File file = getModulePath(root, group, module, layout); - if (file.exists()) { - if (options.has(this.allOption) - || group.equals("org.springframework.zero")) { - System.out.println("Deleting: " + file); - FileUtil.forceDelete(file); - } - else { - for (Object obj : FileUtil.listAll(file, Collections.emptyList())) { - File candidate = (File) obj; - if (candidate.getName().contains("SNAPSHOT")) { - System.out.println("Deleting: " + candidate); - FileUtil.forceDelete(candidate); - } - } - } + clean(options, root, layout, spec); + } + } + + private void clean(OptionSet options, File root, Layout layout, String spec) { + String group = spec; + String module = null; + if (spec.contains(":")) { + group = spec.substring(0, spec.indexOf(':')); + module = spec.substring(spec.indexOf(':') + 1); + } + + File file = getModulePath(root, group, module, layout); + if (!file.exists()) { + return; + } + + if (options.has(this.allOption) || group.equals("org.springframework.zero")) { + delete(file); + return; + } + + for (Object obj : FileUtil.listAll(file, Collections.emptyList())) { + File candidate = (File) obj; + if (candidate.getName().contains("SNAPSHOT")) { + delete(candidate); } } } + private void delete(File file) { + Log.info("Deleting: " + file); + FileUtil.forceDelete(file); + } + private File getModulePath(File root, String group, String module, Layout layout) { File parent = root; if (layout == Layout.IVY) { @@ -133,11 +136,9 @@ public class CleanCommand extends OptionParsingCommand { return new File(parent, module); } - private File getGrapesHome(OptionSet options) { - + private File getGrapesHome() { String dir = System.getenv("GROOVY_HOME"); String userdir = System.getProperty("user.home"); - File home; if (dir == null || !new File(dir).exists()) { dir = userdir; @@ -149,20 +150,20 @@ public class CleanCommand extends OptionParsingCommand { if (dir == null || !new File(dir).exists()) { return null; } - - File grapes = new File(home, "grapes"); - return grapes; + return new File(home, "grapes"); } - private File getMavenHome(OptionSet options) { + private File getMavenHome() { String dir = System.getProperty("user.home"); - if (dir == null || !new File(dir).exists()) { return null; } File home = new File(dir); - File grapes = new File(new File(home, ".m2"), "repository"); - return grapes; + return new File(new File(home, ".m2"), "repository"); + } + + private static enum Layout { + IVY, MAVEN; } } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java index 8b21e932ee..e56b1c4328 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java @@ -78,7 +78,7 @@ public class OptionHandler { try { getParser().printHelpOn(out); } - catch (IOException e) { + catch (IOException ex) { return "Help not available"; } return out.toString(); diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java index c1c47c85fc..5446518cc1 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java @@ -41,7 +41,7 @@ import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; */ public class ScriptCommand implements Command { - private static String[] DEFAULT_PATHS = new String[] { "${SPRING_HOME}/ext", + private static final String[] DEFAULT_PATHS = new String[] { "${SPRING_HOME}/ext", "${SPRING_HOME}/bin" }; private String[] paths = DEFAULT_PATHS; @@ -124,7 +124,7 @@ public class ScriptCommand implements Command { * @param paths the paths to set */ public void setPaths(String[] paths) { - this.paths = paths; + this.paths = (paths == null ? null : paths.clone()); } @Override @@ -140,9 +140,9 @@ public class ScriptCommand implements Command { try { this.main = getMainClass().newInstance(); } - catch (Exception e) { + catch (Exception ex) { throw new IllegalStateException("Cannot create main class: " + this.name, - e); + ex); } if (this.main instanceof OptionHandler) { ((OptionHandler) this.main).options(); @@ -167,11 +167,11 @@ public class ScriptCommand implements Command { try { classes = compiler.compile(source); } - catch (CompilationFailedException e) { - throw new IllegalStateException("Could not compile script", e); + catch (CompilationFailedException ex) { + throw new IllegalStateException("Could not compile script", ex); } - catch (IOException e) { - throw new IllegalStateException("Could not compile script", e); + catch (IOException ex) { + throw new IllegalStateException("Could not compile script", ex); } this.mainClass = classes[0]; } @@ -188,43 +188,44 @@ public class ScriptCommand implements Command { if (!name.endsWith(".groovy")) { resource = "commands/" + name + ".groovy"; } + URL url = getClass().getClassLoader().getResource(resource); - File file = null; if (url != null) { - if (url.toString().startsWith("file:")) { - file = new File(url.toString().substring("file:".length())); - } - else { - // probably in JAR file - try { - file = File.createTempFile(name, ".groovy"); - file.deleteOnExit(); - FileUtil.copy(url, file, null); - } - catch (IOException e) { - throw new IllegalStateException( - "Could not create temp file for source: " + name); - } + return locateSourceFromUrl(name, url); + } + + String home = System.getProperty("SPRING_HOME", System.getenv("SPRING_HOME")); + if (home == null) { + home = "."; + } + + for (String path : this.paths) { + String subbed = path.replace("${SPRING_HOME}", home); + File file = new File(subbed, resource); + if (file.exists()) { + return file; } } - else { - String home = System.getProperty("SPRING_HOME", System.getenv("SPRING_HOME")); - if (home == null) { - home = "."; - } - for (String path : this.paths) { - String subbed = path.replace("${SPRING_HOME}", home); - File test = new File(subbed, resource); - if (test.exists()) { - file = test; - break; - } - } + + throw new IllegalStateException("No script found for : " + name); + } + + private File locateSourceFromUrl(String name, URL url) { + if (url.toString().startsWith("file:")) { + return new File(url.toString().substring("file:".length())); } - if (file == null) { - throw new IllegalStateException("No script found for : " + name); + + // probably in JAR file + try { + File file = File.createTempFile(name, ".groovy"); + file.deleteOnExit(); + FileUtil.copy(url, file, null); + return file; + } + catch (IOException ex) { + throw new IllegalStateException("Could not create temp file for source: " + + name); } - return file; } private static class ScriptConfiguration implements GroovyCompilerConfiguration { diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java index 613c058119..0a06559376 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java @@ -73,7 +73,7 @@ public class DependencyCustomizer { try { DependencyCustomizer.this.loader.loadClass(classname); } - catch (Exception e) { + catch (Exception ex) { return true; } } @@ -97,7 +97,8 @@ public class DependencyCustomizer { DependencyCustomizer.this.loader.loadClass(classname); return false; } - catch (Exception e) { + catch (Exception ex) { + // swallow exception and continue } } return DependencyCustomizer.this.canAdd(); @@ -122,7 +123,8 @@ public class DependencyCustomizer { } return true; } - catch (Exception e) { + catch (Exception ex) { + // swallow exception and continue } } return DependencyCustomizer.this.canAdd(); @@ -147,7 +149,8 @@ public class DependencyCustomizer { } return false; } - catch (Exception e) { + catch (Exception ex) { + // swallow exception and continue } } return DependencyCustomizer.this.canAdd(); diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java index 35d7020312..31864a9ef2 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java @@ -84,9 +84,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati public void applyToMainClass(GroovyClassLoader loader, GroovyCompilerConfiguration configuration, GeneratorContext generatorContext, SourceUnit source, ClassNode classNode) throws CompilationFailedException { - if (true) { // FIXME: add switch for auto config - addEnableAutoConfigurationAnnotation(source, classNode); - } + // FIXME: add switch for auto config + addEnableAutoConfigurationAnnotation(source, classNode); } private void addEnableAutoConfigurationAnnotation(SourceUnit source, @@ -101,8 +100,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati annotationClass)); classNode.addAnnotation(annotationNode); } - catch (ClassNotFoundException e) { - throw new IllegalStateException(e); + catch (ClassNotFoundException ex) { + throw new IllegalStateException(ex); } } } diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java index 584fd1a242..1330089e05 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java @@ -56,8 +56,8 @@ public class SpringZeroRunner { public SpringZeroRunner(final SpringZeroRunnerConfiguration configuration, File[] files, String... args) { this.configuration = configuration; - this.files = files; - this.args = args; + this.files = files.clone(); + this.args = args.clone(); this.compiler = new GroovyCompiler(configuration); if (configuration.getLogLevel().intValue() <= Level.FINE.intValue()) { System.setProperty("groovy.grape.report.downloads", "true"); diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java b/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java index 0494b36ce5..610a5e867b 100644 --- a/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java +++ b/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java @@ -30,7 +30,7 @@ import org.codehaus.groovy.control.CompilationFailedException; /** * @author Dave Syer */ -public class GroovyTemplate { +public abstract class GroovyTemplate { // FIXME is this used? diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java b/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java index 5a9dd95b58..4460ac75b7 100644 --- a/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java +++ b/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java @@ -36,6 +36,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; /** + * Integration tests to exercise the samples. + * * @author Dave Syer */ public class SampleIntegrationTests { diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java b/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java index ae60d8df67..743bebf540 100644 --- a/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java +++ b/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java @@ -13,22 +13,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + 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; import static org.junit.Assert.assertTrue; /** - * @author Dave Syer + * Tests for {@link ScriptCommand}. * + * @author Dave Syer */ public class ScriptCommandTests { diff --git a/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java b/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java index c4b02b652f..50ad915775 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java @@ -118,41 +118,54 @@ class BeanDefinitionLoader { private int load(Object source) { Assert.notNull(source, "Source must not be null"); if (source instanceof Class) { - Class type = (Class) source; - if (isComponent(type)) { - this.annotatedReader.register(type); - return 1; - } - return 0; + return load((Class) source); } - if (source instanceof Resource) { - return this.xmlReader.loadBeanDefinitions((Resource) source); + return load((Resource) source); } - if (source instanceof Package) { - // FIXME register the scanned package for data to pick up - return this.scanner.scan(((Package) source).getName()); + return load((Package) source); } - if (source instanceof CharSequence) { - try { - return load(Class.forName(source.toString())); - } - catch (ClassNotFoundException e) { - } + return load((CharSequence) source); + } + throw new IllegalArgumentException("Invalid source type " + source.getClass()); + } - Resource loadedResource = (this.resourceLoader != null ? this.resourceLoader - : DEFAULT_RESOURCE_LOADER).getResource(source.toString()); - if (loadedResource != null && loadedResource.exists()) { - return load(loadedResource); - } - Package packageResource = Package.getPackage(source.toString()); - if (packageResource != null) { - return load(packageResource); - } + private int load(Class source) { + if (isComponent(source)) { + this.annotatedReader.register(source); + return 1; + } + return 0; + } + + private int load(Resource source) { + return this.xmlReader.loadBeanDefinitions(source); + } + + private int load(Package source) { + // FIXME register the scanned package for data to pick up + return this.scanner.scan(source.getName()); + } + + private int load(CharSequence source) { + try { + return load(Class.forName(source.toString())); + } + catch (ClassNotFoundException ex) { + // swallow exception and continue } + Resource loadedResource = (this.resourceLoader != null ? this.resourceLoader + : DEFAULT_RESOURCE_LOADER).getResource(source.toString()); + if (loadedResource != null && loadedResource.exists()) { + return load(loadedResource); + } + Package packageResource = Package.getPackage(source.toString()); + if (packageResource != null) { + return load(packageResource); + } throw new IllegalArgumentException("Invalid source '" + source + "'"); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java b/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java index e5114a2ff3..da07a747a7 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java @@ -183,7 +183,7 @@ public class SpringApplication { initialize(); } - protected void initialize() { + private void initialize() { this.webEnvironment = deduceWebEnvironment(); this.initializers = new ArrayList>(); @SuppressWarnings("rawtypes") @@ -376,8 +376,8 @@ public class SpringApplication { String optionName; String optionValue = ""; if (optionText.contains("=")) { - optionName = optionText.substring(0, optionText.indexOf("=")); - optionValue = optionText.substring(optionText.indexOf("=") + 1, + optionName = optionText.substring(0, optionText.indexOf('=')); + optionValue = optionText.substring(optionText.indexOf('=') + 1, optionText.length()); } else { @@ -439,8 +439,8 @@ public class SpringApplication { try { runner.run(args); } - catch (Exception e) { - throw new IllegalStateException("Failed to execute CommandLineRunner", e); + catch (Exception ex) { + throw new IllegalStateException("Failed to execute CommandLineRunner", ex); } } } @@ -617,8 +617,8 @@ public class SpringApplication { } } - catch (Exception e) { - e.printStackTrace(); + catch (Exception ex) { + ex.printStackTrace(); exitCode = (exitCode == 0 ? 1 : exitCode); } return exitCode; @@ -633,9 +633,9 @@ public class SpringApplication { exitCode = value; } } - catch (Exception e) { + catch (Exception ex) { exitCode = (exitCode == 0 ? 1 : exitCode); - e.printStackTrace(); + ex.printStackTrace(); } } return exitCode; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java index a0f2d05f19..d2d5428087 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java @@ -75,8 +75,8 @@ public class CustomPropertyConstructor extends Constructor { try { typeMap.put(alias, this.propertyUtils.getProperty(type, name)); } - catch (IntrospectionException e) { - throw new RuntimeException(e); + catch (IntrospectionException ex) { + throw new RuntimeException(ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java index f294c12844..7866ffe471 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java @@ -38,8 +38,8 @@ public class InetAddressEditor extends PropertyEditorSupport implements Property try { setValue(InetAddress.getByName(text)); } - catch (UnknownHostException e) { - throw new IllegalArgumentException("Cannot locate host", e); + catch (UnknownHostException ex) { + throw new IllegalArgumentException("Cannot locate host", ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java index d22a8d8c48..cd9806d12e 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java @@ -46,8 +46,7 @@ import org.springframework.validation.Validator; public class PropertiesConfigurationFactory implements FactoryBean, MessageSourceAware, InitializingBean { - private static final Log logger = LogFactory - .getLog(PropertiesConfigurationFactory.class); + private final Log logger = LogFactory.getLog(getClass()); private boolean ignoreUnknownFields = true; @@ -193,23 +192,23 @@ public class PropertiesConfigurationFactory implements FactoryBean, Assert.state(this.properties != null || this.propertySources != null, "Properties or propertySources should not be null"); try { - if (logger.isTraceEnabled()) { + if (this.logger.isTraceEnabled()) { if (this.properties != null) { - logger.trace("Properties:\n" + this.properties); + this.logger.trace("Properties:\n" + this.properties); } else { - logger.trace("Property Sources: " + this.propertySources); + this.logger.trace("Property Sources: " + this.propertySources); } } this.hasBeenBound = true; doBindPropertiesToTarget(); } - catch (BindException e) { + catch (BindException ex) { if (this.exceptionIfInvalid) { - throw e; + throw ex; } - logger.error("Failed to load Properties validation bean. " - + "Your Properties may be invalid.", e); + this.logger.error("Failed to load Properties validation bean. " + + "Your Properties may be invalid.", ex); } } @@ -241,10 +240,11 @@ public class PropertiesConfigurationFactory implements FactoryBean, dataBinder.validate(); BindingResult errors = dataBinder.getBindingResult(); if (errors.hasErrors()) { - logger.error("Properties configuration failed validation"); + this.logger.error("Properties configuration failed validation"); for (ObjectError error : errors.getAllErrors()) { - logger.error(this.messageSource != null ? this.messageSource.getMessage( - error, Locale.getDefault()) + " (" + error + ")" : error); + this.logger.error(this.messageSource != null ? this.messageSource + .getMessage(error, Locale.getDefault()) + " (" + error + ")" + : error); } if (this.exceptionIfInvalid) { BindException summary = new BindException(errors); diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java index 430fbfd4bc..8d7ca09621 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java @@ -199,6 +199,7 @@ public class RelaxedDataBinder extends DataBinder { } } catch (InvalidPropertyException ex) { + // swallow and contrinue } } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java index 4e86bebf6b..4bb49bfec4 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java @@ -50,7 +50,7 @@ import org.yaml.snakeyaml.error.YAMLException; public class YamlConfigurationFactory implements FactoryBean, MessageSourceAware, InitializingBean { - private static final Log logger = LogFactory.getLog(YamlConfigurationFactory.class); + private final Log logger = LogFactory.getLog(getClass()); private Class type; @@ -128,44 +128,45 @@ public class YamlConfigurationFactory implements FactoryBean, MessageSourc Charset.defaultCharset()); } - Assert.state( - this.yaml != null, - "Yaml document should not be null: either set it directly or set the resource to load it from"); + Assert.state(this.yaml != null, "Yaml document should not be null: " + + "either set it directly or set the resource to load it from"); try { - logger.trace("Yaml document is\n" + this.yaml); + if (this.logger.isTraceEnabled()) { + this.logger.trace("Yaml document is\n" + this.yaml); + } Constructor constructor = new CustomPropertyConstructor(this.type, this.propertyAliases); this.configuration = (T) (new Yaml(constructor)).load(this.yaml); - if (this.validator != null) { - BindingResult errors = new BeanPropertyBindingResult(this.configuration, - "configuration"); - this.validator.validate(this.configuration, errors); - - if (errors.hasErrors()) { - logger.error("YAML configuration failed validation"); - for (ObjectError error : errors.getAllErrors()) { - logger.error(this.messageSource != null ? this.messageSource - .getMessage(error, Locale.getDefault()) - + " (" - + error - + ")" : error); - } - if (this.exceptionIfInvalid) { - BindException summary = new BindException(errors); - throw summary; - } - } + validate(); } } - catch (YAMLException e) { + catch (YAMLException ex) { if (this.exceptionIfInvalid) { - throw e; + throw ex; + } + this.logger.error("Failed to load YAML validation bean. " + + "Your YAML file may be invalid.", ex); + } + } + + private void validate() throws BindException { + BindingResult errors = new BeanPropertyBindingResult(this.configuration, + "configuration"); + this.validator.validate(this.configuration, errors); + + if (errors.hasErrors()) { + this.logger.error("YAML configuration failed validation"); + for (ObjectError error : errors.getAllErrors()) { + this.logger.error(this.messageSource != null ? this.messageSource + .getMessage(error, Locale.getDefault()) + " (" + error + ")" + : error); + } + if (this.exceptionIfInvalid) { + BindException summary = new BindException(errors); + throw summary; } - logger.error( - "Failed to load YAML validation bean. Your YAML file may be invalid.", - e); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java index be4780c83c..df64c81d49 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.config; import java.util.List; @@ -29,26 +30,24 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class JacksonJsonParser implements JsonParser { @Override + @SuppressWarnings("unchecked") public Map parseMap(String json) { try { - @SuppressWarnings("unchecked") - Map map = new ObjectMapper().readValue(json, Map.class); - return map; + return new ObjectMapper().readValue(json, Map.class); } - catch (Exception e) { - throw new IllegalArgumentException("Cannot parse JSON", e); + catch (Exception ex) { + throw new IllegalArgumentException("Cannot parse JSON", ex); } } @Override + @SuppressWarnings("unchecked") public List parseList(String json) { try { - @SuppressWarnings("unchecked") - List list = new ObjectMapper().readValue(json, List.class); - return list; + return new ObjectMapper().readValue(json, List.class); } - catch (Exception e) { - throw new IllegalArgumentException("Cannot parse JSON", e); + catch (Exception ex) { + throw new IllegalArgumentException("Cannot parse JSON", ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java index a2f0fb119a..8433276390 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.config; import java.util.List; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java index 006ee4352d..cf92a8aec2 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java @@ -26,7 +26,7 @@ import org.springframework.util.ClassUtils; * @see YamlJsonParser * @see SimpleJsonParser */ -public class JsonParserFactory { +public abstract class JsonParserFactory { /** * Static factory for the "best" JSON parser available on the classpath. Tries Jackson diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java index 0a46f37983..6eb723d4d7 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java @@ -30,17 +30,15 @@ import org.yaml.snakeyaml.Yaml; public class YamlJsonParser implements JsonParser { @Override + @SuppressWarnings("unchecked") public Map parseMap(String json) { - @SuppressWarnings("unchecked") - Map map = new Yaml().loadAs(json, Map.class); - return map; + return new Yaml().loadAs(json, Map.class); } @Override + @SuppressWarnings("unchecked") public List parseList(String json) { - @SuppressWarnings("unchecked") - List list = new Yaml().loadAs(json, List.class); - return list; + return new Yaml().loadAs(json, List.class); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java index 14764108b5..de1fc092b1 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java @@ -38,35 +38,7 @@ import org.yaml.snakeyaml.Yaml; */ public class YamlProcessor { - public interface MatchCallback { - void process(Properties properties, Map map); - } - - public interface DocumentMatcher { - MatchStatus matches(Properties properties); - } - - private static final Log logger = LogFactory.getLog(YamlProcessor.class); - - public static enum ResolutionMethod { - OVERRIDE, OVERRIDE_AND_IGNORE, FIRST_FOUND - } - - public static enum MatchStatus { - - /** - * A match was found. - */ - FOUND, - /** - * A match was not found. - */ - NOT_FOUND, - /** - * Not enough information to decide. - */ - ABSTAIN - } + private final Log logger = LogFactory.getLog(getClass()); private ResolutionMethod resolutionMethod = ResolutionMethod.OVERRIDE; @@ -139,7 +111,7 @@ public class YamlProcessor { * @param resources the resources to set */ public void setResources(Resource[] resources) { - this.resources = resources; + this.resources = (resources == null ? null : resources.clone()); } /** @@ -154,52 +126,56 @@ public class YamlProcessor { */ protected void process(MatchCallback callback) { Yaml yaml = new Yaml(); - boolean found = false; for (Resource resource : this.resources) { - try { - logger.info("Loading from YAML: " + resource); - int count = 0; - for (Object object : yaml.loadAll(resource.getInputStream())) { - if (this.resolutionMethod != ResolutionMethod.FIRST_FOUND || !found) { - @SuppressWarnings("unchecked") - Map map = (Map) object; - if (map != null) { - found = process(map, callback); - if (found) { - count++; - } - } - } - } - - logger.info("Loaded " + count + " document" + (count > 1 ? "s" : "") - + " from YAML resource: " + resource); - - if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND && found) { - // No need to load any more resources - break; - } - } - catch (IOException e) { - if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND - || this.resolutionMethod == ResolutionMethod.OVERRIDE_AND_IGNORE) { - if (logger.isWarnEnabled()) { - logger.warn("Could not load map from " + resource + ": " - + e.getMessage()); - } - } - else { - throw new IllegalStateException(e); - } + boolean found = process(callback, yaml, resource); + if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND && found) { + return; } } } + private boolean process(MatchCallback callback, Yaml yaml, Resource resource) { + int count = 0; + try { + this.logger.info("Loading from YAML: " + resource); + for (Object object : yaml.loadAll(resource.getInputStream())) { + if (object != null && process(asMap(object), callback)) { + count++; + if (this.resolutionMethod == ResolutionMethod.FIRST_FOUND) { + break; + } + } + } + this.logger.info("Loaded " + count + " document" + (count > 1 ? "s" : "") + + " from YAML resource: " + resource); + } + catch (IOException ex) { + handleProcessError(resource, ex); + } + return count > 0; + } + + private void handleProcessError(Resource resource, IOException ex) { + if (this.resolutionMethod != ResolutionMethod.FIRST_FOUND + && this.resolutionMethod != ResolutionMethod.OVERRIDE_AND_IGNORE) { + throw new IllegalStateException(ex); + } + if (this.logger.isWarnEnabled()) { + this.logger.warn("Could not load map from " + resource + ": " + + ex.getMessage()); + } + } + + @SuppressWarnings("unchecked") + private Map asMap(Object object) { + return (Map) object; + } + private boolean process(Map map, MatchCallback callback) { Properties properties = new Properties(); assignProperties(properties, map, null); if (this.documentMatchers.isEmpty()) { - logger.debug("Merging document (no matchers set)" + map); + this.logger.debug("Merging document (no matchers set)" + map); callback.process(properties, map); } else { @@ -209,7 +185,8 @@ public class YamlProcessor { MatchStatus match = matcher.matches(properties); result = match.ordinal() < result.ordinal() ? match : result; if (match == MatchStatus.FOUND) { - logger.debug("Matched document with document matcher: " + properties); + this.logger.debug("Matched document with document matcher: " + + properties); callback.process(properties, map); valueFound = true; // No need to check for more matches @@ -217,11 +194,11 @@ public class YamlProcessor { } } if (result == MatchStatus.ABSTAIN && this.matchDefault) { - logger.debug("Matched document with default matcher: " + map); + this.logger.debug("Matched document with default matcher: " + map); callback.process(properties, map); } else if (!valueFound) { - logger.debug("Unmatched document"); + this.logger.debug("Unmatched document"); return false; } } @@ -268,13 +245,26 @@ public class YamlProcessor { } } + public interface MatchCallback { + void process(Properties properties, Map map); + } + + public interface DocumentMatcher { + MatchStatus matches(Properties properties); + } + + public static enum ResolutionMethod { + OVERRIDE, OVERRIDE_AND_IGNORE, FIRST_FOUND + } + + public static enum MatchStatus { + FOUND, NOT_FOUND, ABSTAIN + } + /** * Matches a document containing a given key and where the value of that key is an * array containing one of the given values, or where one of the values matches one of * the given values (interpreted as regexes). - * - * @author Dave Syer - * */ public static class ArrayDocumentMatcher implements DocumentMatcher { diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java index 0698a9772b..cb16ac442b 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java @@ -43,7 +43,7 @@ import org.springframework.util.ReflectionUtils.MethodCallback; */ abstract class AbstractOnBeanCondition implements ConfigurationCondition { - protected Log logger = LogFactory.getLog(getClass()); + private final Log logger = LogFactory.getLog(getClass()); protected abstract Class annotationClass(); @@ -79,7 +79,8 @@ abstract class AbstractOnBeanCondition implements ConfigurationCondition { } }); } - catch (Exception e) { + catch (Exception ex) { + // swallow exception and continue } } } @@ -119,6 +120,7 @@ abstract class AbstractOnBeanCondition implements ConfigurationCondition { } } catch (ClassNotFoundException ex) { + // swallow exception and continue } } for (String beanName : beanNames) { diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java index 9fda8cf106..d896c24631 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java @@ -26,7 +26,7 @@ import org.springframework.core.type.MethodMetadata; * * @author Dave Syer */ -public class ConditionLogUtils { +public abstract class ConditionLogUtils { public static String getPrefix(Log logger, AnnotatedTypeMetadata metadata) { String prefix = ""; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java index 90d81e7753..03f1f28886 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.context.condition; import org.apache.commons.logging.Log; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java index 663e6f0214..5a068f4ac5 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -77,7 +77,8 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * @param port the port number for the embedded servlet container */ public AbstractEmbeddedServletContainerFactory(int port) { - setPort(port); + checkPort(port); + this.port = port; } /** @@ -87,8 +88,10 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * @param port the port number for the embedded servlet container */ public AbstractEmbeddedServletContainerFactory(String contextPath, int port) { - setContextPath(contextPath); - setPort(port); + checkContextPath(contextPath); + checkPort(port); + this.contextPath = contextPath; + this.port = port; } /** @@ -100,6 +103,11 @@ public abstract class AbstractEmbeddedServletContainerFactory implements */ @Override public void setContextPath(String contextPath) { + checkContextPath(contextPath); + this.contextPath = contextPath; + } + + private void checkContextPath(String contextPath) { Assert.notNull(contextPath, "ContextPath must not be null"); if (contextPath.length() > 0) { if ("/".equals(contextPath)) { @@ -111,7 +119,6 @@ public abstract class AbstractEmbeddedServletContainerFactory implements "ContextPath must start with '/ and not end with '/'"); } } - this.contextPath = contextPath; } /** @@ -131,10 +138,14 @@ public abstract class AbstractEmbeddedServletContainerFactory implements */ @Override public void setPort(int port) { + checkPort(port); + this.port = port; + } + + private void checkPort(int port) { if (port < 0 || port > 65535) { throw new IllegalArgumentException("Port must be between 1 and 65535"); } - this.port = port; } /** @@ -333,32 +344,33 @@ public abstract class AbstractEmbeddedServletContainerFactory implements * warning and returning {@code null} otherwise. */ protected final File getValidDocumentRoot() { - - // User specified - if (getDocumentRoot() != null) { - return getDocumentRoot(); + File file = getDocumentRoot(); + file = file != null ? file : getWarFileDocumentRoot(); + file = file != null ? file : getCommonDocumentRoot(); + if (file == null && this.logger.isWarnEnabled()) { + this.logger.warn("None of the document roots " + + Arrays.asList(COMMON_DOC_ROOTS) + + " point to a directory and will be ignored."); } + return file; + } - // Packaged as a WAR file + private File getWarFileDocumentRoot() { File warFile = getCodeSourceArchive(); if (warFile.exists() && !warFile.isDirectory() && warFile.getName().toLowerCase().endsWith(".war")) { return warFile.getAbsoluteFile(); } + return null; + } - // Common DocRoots + private File getCommonDocumentRoot() { for (String commonDocRoot : COMMON_DOC_ROOTS) { File root = new File(commonDocRoot); if (root != null && root.exists() && root.isDirectory()) { return root.getAbsoluteFile(); } } - - if (this.logger.isWarnEnabled()) { - this.logger.warn("None of the document roots " - + Arrays.asList(COMMON_DOC_ROOTS) - + " point to a directory and will be ignored."); - } return null; } @@ -379,7 +391,7 @@ public abstract class AbstractEmbeddedServletContainerFactory implements } return new File(path); } - catch (IOException e) { + catch (IOException ex) { return null; } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java index 60477fd613..81bb275455 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java @@ -16,6 +16,7 @@ package org.springframework.zero.context.embedded; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.context.annotation.AnnotatedBeanDefinitionReader; @@ -152,7 +153,7 @@ public class AnnotationConfigEmbeddedWebApplicationContext extends * @see #scan(String...) * @see #refresh() */ - public void register(Class... annotatedClasses) { + public final void register(Class... annotatedClasses) { this.annotatedClasses = annotatedClasses; Assert.notEmpty(annotatedClasses, "At least one annotated class must be specified"); @@ -165,7 +166,7 @@ public class AnnotationConfigEmbeddedWebApplicationContext extends * @see #register(Class...) * @see #refresh() */ - public void scan(String... basePackages) { + public final void scan(String... basePackages) { this.basePackages = basePackages; Assert.notEmpty(basePackages, "At least one base package must be specified"); } @@ -187,4 +188,9 @@ public class AnnotationConfigEmbeddedWebApplicationContext extends } } + @Override + public final void refresh() throws BeansException, IllegalStateException { + super.refresh(); + } + } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java index cf0ecee206..dfaa91df2e 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.context.embedded; import java.util.ArrayList; diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java index b319ab9691..7267d37ce5 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java @@ -136,9 +136,9 @@ public class EmbeddedWebApplicationContext extends GenericWebApplicationContext try { getSelfInitializer().onStartup(getServletContext()); } - catch (ServletException e) { + catch (ServletException ex) { throw new ApplicationContextException( - "Cannot initialize servlet context", e); + "Cannot initialize servlet context", ex); } } WebApplicationContextUtils.registerWebApplicationScopes(getBeanFactory(), diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java index e2699dd282..bbe3af8745 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java @@ -84,8 +84,13 @@ public class FilterRegistrationBean extends RegistrationBean { */ public FilterRegistrationBean(Filter filter, ServletRegistrationBean... servletRegistrationBeans) { - setFilter(filter); - addServletRegistrationBeans(servletRegistrationBeans); + Assert.notNull(filter, "Filter must not be null"); + Assert.notNull(servletRegistrationBeans, + "ServletRegistrationBeans must not be null"); + this.filter = filter; + for (ServletRegistrationBean servletRegistrationBean : servletRegistrationBeans) { + this.servletRegistrationBeans.add(servletRegistrationBean); + } } /** diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java index 0756ba0185..312dcf45b8 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java @@ -69,8 +69,10 @@ public class ServletRegistrationBean extends RegistrationBean { * @param urlMappings the URLs being mapped */ public ServletRegistrationBean(Servlet servlet, String... urlMappings) { - setServlet(servlet); - addUrlMappings(urlMappings); + Assert.notNull(servlet, "Servlet must not be null"); + Assert.notNull(urlMappings, "UrlMappings must not be null"); + this.servlet = servlet; + this.urlMappings.addAll(Arrays.asList(urlMappings)); } /** diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java index 895222ec44..60a3b0c0c9 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java @@ -16,6 +16,7 @@ package org.springframework.zero.context.embedded; +import org.springframework.beans.BeansException; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.io.ClassPathResource; @@ -46,7 +47,7 @@ public class XmlEmbeddedWebApplicationContext extends EmbeddedWebApplicationCont * {@linkplain #load loaded} and then manually {@link #refresh refreshed}. */ public XmlEmbeddedWebApplicationContext() { - reader.setEnvironment(this.getEnvironment()); + this.reader.setEnvironment(this.getEnvironment()); } /** @@ -105,7 +106,7 @@ public class XmlEmbeddedWebApplicationContext extends EmbeddedWebApplicationCont * Load bean definitions from the given XML resources. * @param resources one or more resources to load from */ - public void load(Resource... resources) { + public final void load(Resource... resources) { this.reader.loadBeanDefinitions(resources); } @@ -113,7 +114,7 @@ public class XmlEmbeddedWebApplicationContext extends EmbeddedWebApplicationCont * Load bean definitions from the given XML resources. * @param resourceLocations one or more resource locations to load from */ - public void load(String... resourceLocations) { + public final void load(String... resourceLocations) { this.reader.loadBeanDefinitions(resourceLocations); } @@ -123,11 +124,16 @@ public class XmlEmbeddedWebApplicationContext extends EmbeddedWebApplicationCont * specified resource name * @param resourceNames relatively-qualified names of resources to load */ - public void load(Class relativeClass, String... resourceNames) { + public final void load(Class relativeClass, String... resourceNames) { Resource[] resources = new Resource[resourceNames.length]; for (int i = 0; i < resourceNames.length; i++) { resources[i] = new ClassPathResource(resourceNames[i], relativeClass); } - this.load(resources); + this.reader.loadBeanDefinitions(resources); + } + + @Override + public final void refresh() throws BeansException, IllegalStateException { + super.refresh(); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index 9caf560d92..f9a45d0893 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -70,7 +70,8 @@ public class TomcatEmbeddedServletContainer implements EmbeddedServletContainer try { this.tomcat.stop(); } - catch (LifecycleException e) { + catch (LifecycleException ex) { + // swallow and continue } this.tomcat.destroy(); } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java index 1c4c4eef33..8db25ecb8d 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java @@ -33,10 +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; +import org.springframework.zero.config.YamlPropertiesFactoryBean; /** * {@link ApplicationContextInitializer} that configures the context environment by @@ -82,7 +82,7 @@ public class ConfigFileApplicationContextInitializer implements @Override public void initialize(ConfigurableApplicationContext applicationContext) { - List candidates = getCandidateLocations(applicationContext); + List candidates = getCandidateLocations(); // Initial load allows profiles to be activated for (String candidate : candidates) { @@ -97,8 +97,7 @@ public class ConfigFileApplicationContextInitializer implements } } - private List getCandidateLocations( - ConfigurableApplicationContext applicationContext) { + private List getCandidateLocations() { List candidates = new ArrayList(); for (String searchLocation : this.searchLocations) { for (Loader loader : LOADERS) { @@ -150,7 +149,7 @@ public class ConfigFileApplicationContextInitializer implements * Set the search locations that will be considered. */ public void setSearchLocations(String[] searchLocations) { - this.searchLocations = searchLocations; + this.searchLocations = (searchLocations == null ? null : searchLocations.clone()); } /** @@ -200,9 +199,9 @@ public class ConfigFileApplicationContextInitializer implements .getDescription(), properties)); } } - catch (IOException e) { + catch (IOException ex) { throw new IllegalStateException("Could not load properties file from " - + resource, e); + + resource, ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java index 0809d0475b..868d92644e 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java @@ -171,14 +171,10 @@ public class LoggingApplicationContextInitializer implements try { doInit(applicationContext, configLocation); } - catch (RuntimeException ex) { - throw ex; - } catch (Exception ex) { throw new IllegalStateException("Cannot initialize logging from " + configLocation, ex); } - } protected abstract void doInit(ApplicationContext applicationContext, diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java b/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java index 4213bf5636..f4ae67c05f 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java @@ -41,15 +41,12 @@ public abstract class JavaLoggerConfigurer { LogManager.getLogManager().readConfiguration( ResourceUtils.getURL(resolvedLocation).openStream()); } - catch (FileNotFoundException e) { - throw e; - } - catch (RuntimeException e) { - throw e; - } - catch (Exception e) { + catch (Exception ex) { + if (ex instanceof FileNotFoundException) { + throw (FileNotFoundException) ex; + } throw new IllegalArgumentException("Could not initialize logging from " - + location, e); + + location, ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java b/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java index 63da7cf340..f5ae1b5ce1 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java @@ -48,9 +48,9 @@ public abstract class LogbackConfigurer { try { new ContextInitializer(context).configureByResource(url); } - catch (JoranException e) { + catch (JoranException ex) { throw new IllegalArgumentException("Could not initialize logging from " - + location, e); + + location, ex); } } diff --git a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java index 2b2d22297e..5bafb1216f 100644 --- a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java +++ b/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.web; import javax.servlet.ServletContext; @@ -28,8 +44,7 @@ import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebAppl */ public abstract class SpringServletInitializer implements WebApplicationInitializer { - /** Logger available to subclasses. */ - protected final Log logger = LogFactory.getLog(getClass()); + private final Log logger = LogFactory.getLog(getClass()); @Override public void onStartup(ServletContext servletContext) throws ServletException { @@ -44,9 +59,9 @@ public abstract class SpringServletInitializer implements WebApplicationInitiali }); } else { - this.logger - .debug("No ContextLoaderListener registered, as " - + "createRootApplicationContext() did not return an application context"); + this.logger.debug("No ContextLoaderListener registered, as " + + "createRootApplicationContext() did not " + + "return an application context"); } } @@ -55,7 +70,7 @@ public abstract class SpringServletInitializer implements WebApplicationInitiali ApplicationContext parent = null; Object object = servletContext .getAttribute(WebApplicationContext.ROOT_WEB_APPLICATION_CONTEXT_ATTRIBUTE); - if (object != null && object instanceof ApplicationContext) { + if (object instanceof ApplicationContext) { this.logger.info("Root context already created (using as parent)."); parent = (ApplicationContext) object; servletContext.setAttribute( diff --git a/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java b/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java index 1bfb39243f..f9f35eaede 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java @@ -23,9 +23,11 @@ import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.env.MapPropertySource; /** + * General test utilities. + * * @author Dave Syer */ -public class TestUtils { +public abstract class TestUtils { public static void addEnviroment(ConfigurableApplicationContext context, String... pairs) { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java b/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java index d3a29c8fbc..9ad499fd80 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java @@ -24,11 +24,11 @@ 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; /** + * Tests for {@link PropertySourcesPropertyValues}. * @author Dave Syer */ public class PropertySourcesPropertyValuesTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java index 1fcab85503..20e5a9aea8 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java @@ -28,12 +28,13 @@ 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; /** + * Tests for {@link YamlConfigurationFactory} + * * @author Dave Syer */ public class YamlConfigurationFactoryTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java index 8203d85952..271de278ae 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.config; -import org.springframework.zero.config.JacksonJsonParser; -import org.springframework.zero.config.JsonParser; /** - * @author Dave Syer + * Tests for {@link JsonParser}. * + * @author Dave Syer */ public class JacksonParserTests extends SimpleJsonParserTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java index 2012dd972c..5beea86618 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java @@ -13,20 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + 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; /** - * @author Dave Syer + * Tests for {@link SimpleJsonParser}. * + * @author Dave Syer */ public class SimpleJsonParserTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java similarity index 82% rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java index 81357d5641..1cda3586e5 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlParserTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.config; -import org.springframework.zero.config.JsonParser; -import org.springframework.zero.config.YamlJsonParser; /** - * @author Dave Syer + * Tests for {@link YamlJsonParser}. * + * @author Dave Syer */ -public class YamlParserTests extends SimpleJsonParserTests { +public class YamlJsonParserTests extends SimpleJsonParserTests { @Override protected JsonParser getParser() { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java index 4ef7cff491..ea7afe8dc1 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java @@ -25,12 +25,13 @@ 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; /** + * Tests for {@link YamlMapFactoryBean}. + * * @author Dave Syer */ public class YamlMapFactoryBeanTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java index a9d6898bbf..8b31b02748 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java @@ -25,7 +25,6 @@ import org.junit.Test; 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; @@ -34,6 +33,8 @@ import org.yaml.snakeyaml.Yaml; import static org.junit.Assert.assertEquals; /** + * Tests for {@link YamlPropertiesFactoryBean}. + * * @author Dave Syer */ public class YamlPropertiesFactoryBeanTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java index e7f97ce9ee..cfffc9d6db 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java @@ -28,6 +28,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link OnClassCondition}. + * * @author Dave Syer */ public class OnClassConditionTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java index a9e5eae562..fb4f208f37 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java @@ -20,13 +20,14 @@ 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.condition.ConditionalOnExpression; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link OnExpressionCondition}. + * * @author Dave Syer */ public class OnExpressionConditionTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java index 9b1622e660..b2696b7b07 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java @@ -26,6 +26,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link OnMissingClassCondition}. + * * @author Dave Syer */ public class OnMissingClassConditionTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/NotWebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/NotWebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java index 7f8fc6f186..dce5631907 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/NotWebApplicationConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java @@ -28,9 +28,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link OnNotWebApplicationCondition}. + * * @author Dave Syer */ -public class NotWebApplicationConditionTests { +public class OnNotWebApplicationConditionTests { private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java index d83a15fa7f..493c23d681 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java @@ -20,13 +20,14 @@ 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.condition.ConditionalOnResource; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link OnResourceCondition}. + * * @author Dave Syer */ public class OnResourceConditionTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/WebApplicationConditionTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java similarity index 95% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/WebApplicationConditionTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java index 4ac8d68774..ad729822b2 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/WebApplicationConditionTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java @@ -29,9 +29,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link OnWebApplicationCondition}. + * * @author Dave Syer */ -public class WebApplicationConditionTests { +public class OnWebApplicationConditionTests { private AnnotationConfigWebApplicationContext context = new AnnotationConfigWebApplicationContext(); diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index ee17be4f4d..d1e8485929 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -80,7 +80,7 @@ public abstract class AbstractEmbeddedServletContainerFactoryTests { try { this.container.stop(); } - catch (Exception e) { + catch (Exception ex) { } } } diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java index a2c799597a..3c80529520 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java @@ -13,19 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.context.initializer; import org.junit.Test; 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; /** - * @author Dave Syer + * Tests for {@link ContextIdApplicationContextInitializer}. * + * @author Dave Syer */ public class ContextIdApplicationContextInitializerTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java index 04e393f985..0d57fcc636 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java @@ -13,19 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.context.initializer; import org.junit.Test; 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; /** - * @author Dave Syer + * Tests for {@link VcapApplicationContextInitializer}. * + * @author Dave Syer */ public class VcapApplicationContextInitializerTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java index bdbe34b1ff..0d0048cb32 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java @@ -25,11 +25,12 @@ 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; /** + * Tests for {@link JavaLoggerConfigurer}. + * * @author Dave Syer */ public class JavaLoggerConfigurerTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java index 8f4c77181c..8accbccc7c 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java @@ -29,6 +29,8 @@ import org.junit.Test; import static org.junit.Assert.assertTrue; /** + * Tests for {@link LogbackConfigurer}. + * * @author Dave Syer */ public class LogbackConfigurerTests { diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingInitializerTests.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java similarity index 90% rename from spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingInitializerTests.java rename to spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java index 434939baa3..200f49c1c7 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingInitializerTests.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java @@ -32,9 +32,11 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; /** + * Tests for {@link LoggingApplicationContextInitializer}. + * * @author Dave Syer */ -public class LoggingInitializerTests { +public class LoggingApplicationContextInitializerTests { private LoggingApplicationContextInitializer initializer = new LoggingApplicationContextInitializer(); @@ -65,7 +67,7 @@ public class LoggingInitializerTests { public void testDefaultConfigLocation() { GenericApplicationContext context = new GenericApplicationContext(); this.initializer.initialize(context); - Log logger = LogFactory.getLog(LoggingInitializerTests.class); + Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.contains("Hello world")); @@ -87,7 +89,7 @@ public class LoggingInitializerTests { } }); this.initializer.initialize(context); - Log logger = LogFactory.getLog(LoggingInitializerTests.class); + Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.contains("Hello world")); @@ -112,7 +114,7 @@ public class LoggingInitializerTests { } }); this.initializer.initialize(context); - Log logger = LogFactory.getLog(LoggingInitializerTests.class); + Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.startsWith("foo.log")); @@ -135,7 +137,7 @@ public class LoggingInitializerTests { } }); this.initializer.initialize(context); - Log logger = LogFactory.getLog(LoggingInitializerTests.class); + Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.startsWith("foo/springzero.log")); diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java b/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java index 317ade89dc..5ab6d99b48 100644 --- a/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java +++ b/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java @@ -20,6 +20,8 @@ import java.util.logging.Formatter; import java.util.logging.LogRecord; /** + * Simple test {@link Formatter}. + * * @author Dave Syer */ public class TestFormatter extends Formatter { diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java index fd80577b29..70df2f2808 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java @@ -56,8 +56,8 @@ public abstract class Launcher { try { launch(args, getClass().getProtectionDomain()); } - catch (Exception e) { - e.printStackTrace(); + catch (Exception ex) { + ex.printStackTrace(); System.exit(1); } } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java index e09a68e849..61f1a7029c 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java @@ -37,23 +37,23 @@ public class MainMethodRunner implements Runnable { */ public MainMethodRunner(String mainClass, String[] args) { this.mainClassName = mainClass; - this.args = args; + this.args = (args == null ? null : args.clone()); } @Override public void run() { try { Class mainClass = Thread.currentThread().getContextClassLoader() - .loadClass(mainClassName); + .loadClass(this.mainClassName); Method mainMethod = mainClass.getDeclaredMethod("main", String[].class); if (mainMethod == null) { - throw new IllegalStateException(mainClassName + throw new IllegalStateException(this.mainClassName + " does not have a main method"); } - mainMethod.invoke(null, new Object[] { args }); + mainMethod.invoke(null, new Object[] { this.args }); } - catch (Exception e) { - e.printStackTrace(); + catch (Exception ex) { + ex.printStackTrace(); System.exit(1); } } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java index 01e6897133..b9df11001e 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java @@ -225,8 +225,8 @@ public class RandomAccessDataFile implements RandomAccessData { return (file == null ? new RandomAccessFile( RandomAccessDataFile.this.file, "r") : file); } - catch (InterruptedException e) { - throw new IOException(e); + catch (InterruptedException ex) { + throw new IOException(ex); } } @@ -249,8 +249,8 @@ public class RandomAccessDataFile implements RandomAccessData { this.available.release(size); } } - catch (InterruptedException e) { - throw new IOException(e); + catch (InterruptedException ex) { + throw new IOException(ex); } } } diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java index dc499e3bf5..9d4f2f8401 100644 --- a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java +++ b/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java @@ -82,7 +82,7 @@ public class RandomAccessJarFile extends JarFile { * @throws IOException */ public RandomAccessJarFile(File file, JarEntryFilter... filters) throws IOException { - this(new RandomAccessDataFile(file)); + this(new RandomAccessDataFile(file), filters); } /** @@ -93,7 +93,7 @@ public class RandomAccessJarFile extends JarFile { */ public RandomAccessJarFile(RandomAccessDataFile file, JarEntryFilter... filters) throws IOException { - this(file, file.getFile().getPath(), file); + this(file, file.getFile().getPath(), file, filters); } /** @@ -204,32 +204,40 @@ public class RandomAccessJarFile extends JarFile { if (ze == null) { throw new IllegalArgumentException("ZipEntry must not be null"); } + if (ze.isDirectory()) { - final String directoryName = ze.getName(); - JarEntryFilter[] filtersToUse = new JarEntryFilter[filters.length + 1]; - System.arraycopy(filters, 0, filtersToUse, 1, filters.length); - filtersToUse[0] = new JarEntryFilter() { - @Override - public String apply(String entryName, JarEntry entry) { - if (entryName.startsWith(directoryName) - && !entryName.equals(directoryName)) { - return entryName.substring(ze.getName().length()); - } - return null; + return getNestedJarFileFromDirectoryEntry(ze, filters); + } + + return getNestedJarFileFromFileEntry(ze, filters); + } + + private RandomAccessJarFile getNestedJarFileFromDirectoryEntry(final ZipEntry entry, + JarEntryFilter... filters) throws IOException { + final String name = entry.getName(); + JarEntryFilter[] filtersToUse = new JarEntryFilter[filters.length + 1]; + System.arraycopy(filters, 0, filtersToUse, 1, filters.length); + filtersToUse[0] = new JarEntryFilter() { + @Override + public String apply(String entryName, JarEntry ze) { + if (entryName.startsWith(name) && !entryName.equals(name)) { + return entryName.substring(entry.getName().length()); } - }; - return new RandomAccessJarFile(this.rootJarFile, getName() + "!/" - + directoryName.substring(0, directoryName.length() - 1), this.data, - filtersToUse); - } - else { - if (ze.getMethod() != ZipEntry.STORED) { - throw new IllegalStateException("Unable to open nested compressed entry " - + ze.getName()); + return null; } - return new RandomAccessJarFile(this.rootJarFile, getName() + "!/" - + ze.getName(), getData(ze), filters); + }; + return new RandomAccessJarFile(this.rootJarFile, getName() + "!/" + + name.substring(0, name.length() - 1), this.data, filtersToUse); + } + + private RandomAccessJarFile getNestedJarFileFromFileEntry(ZipEntry entry, + JarEntryFilter... filters) throws IOException { + if (entry.getMethod() != ZipEntry.STORED) { + throw new IllegalStateException("Unable to open nested compressed entry " + + entry.getName()); } + return new RandomAccessJarFile(this.rootJarFile, getName() + "!/" + + entry.getName(), getData(entry), filters); } /** @@ -414,7 +422,7 @@ public class RandomAccessJarFile extends JarFile { return (int) (this.jarEntry == null ? this.jarFile.size() : this.jarEntry .getSize()); } - catch (IOException e) { + catch (IOException ex) { return -1; } } diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java index 630a664815..c93c6d60b8 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java @@ -39,7 +39,7 @@ import org.objectweb.asm.Type; * * @author Phillip Webb */ -class MainClassFinder { +abstract class MainClassFinder { private static final String DOT_CLASS = ".class"; diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java index 1006e74c6c..b3013e596f 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java +++ b/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java @@ -37,7 +37,8 @@ public class PropertiesMergingResourceTransformer implements ResourceTransformer // FIXME move out of core - String resource; // Set this in pom configuration with ... + private String resource; // Set this in pom configuration with + // ... private Properties data = new Properties(); @@ -84,4 +85,12 @@ public class PropertiesMergingResourceTransformer implements ResourceTransformer this.data.clear(); } + public String getResource() { + return this.resource; + } + + public void setResource(String resource) { + this.resource = resource; + } + } diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java index 3dbbf70eee..796d1f2029 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.maven; import java.io.File; @@ -25,7 +26,6 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.maven.MainClassFinder; import org.springframework.zero.maven.sample.ClassWithMainMethod; import org.springframework.zero.maven.sample.ClassWithoutMainMethod; diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java index e0d4573bb7..79a035f3c7 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java @@ -21,7 +21,6 @@ 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; @@ -29,6 +28,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; /** + * Tests for {@link PropertiesMergingResourceTransformer}. + * * @author Dave Syer */ public class PropertiesMergingResourceTransformerTests { @@ -54,7 +55,7 @@ public class PropertiesMergingResourceTransformerTests { @Test public void testOutput() throws Exception { - this.transformer.resource = "foo"; + this.transformer.setResource("foo"); this.transformer.processResource("foo", new ByteArrayInputStream("foo=bar".getBytes()), null); ByteArrayOutputStream out = new ByteArrayOutputStream(); diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java index ad6e5423b3..6560f33e2e 100644 --- a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java +++ b/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.maven.sample; /** diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java index ae7c95711b..e60a2bfd41 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator.ui; import java.util.Date; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index 52ad4bc01e..42f5cc4aab 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator.ui; import java.io.IOException; @@ -18,7 +34,6 @@ 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; @@ -26,14 +41,13 @@ import static org.junit.Assert.assertEquals; * Integration tests for separate management and main service ports. * * @author Dave Syer - * */ public class SampleActuatorUiApplicationPortTests { private static ConfigurableApplicationContext context; - private static int port = 9000; - private static int managementPort = 9001; + private static int port = 9010; + private static int managementPort = 9011; @BeforeClass public static void start() throws Exception { diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java index 81443973f5..f30e81befd 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator.ui; import java.io.IOException; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index 59f0647988..4084397b14 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; @@ -24,7 +40,6 @@ 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; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java index 9f036daed4..0c98e44e43 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; @@ -26,7 +42,6 @@ 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; @@ -39,8 +54,8 @@ public class ManagementAddressSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; - private static int port = 9000; - private static int managementPort = 9001; + private static int port = 9010; + private static int managementPort = 9011; @BeforeClass public static void start() throws Exception { diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java index e96fa66b08..6d4aa16301 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; @@ -17,7 +33,6 @@ 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; @@ -25,14 +40,13 @@ import static org.junit.Assert.assertEquals; * Integration tests for separate management and main service ports. * * @author Dave Syer - * */ public class ManagementSampleActuatorApplicationTests { private static ConfigurableApplicationContext context; - private static int port = 9000; - private static int managementPort = 9001; + private static int port = 9010; + private static int managementPort = 9011; @BeforeClass public static void start() throws Exception { diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java index ec00119ab9..d6dd397904 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; @@ -26,7 +42,6 @@ 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; @@ -34,7 +49,6 @@ import static org.junit.Assert.assertEquals; * Integration tests for switching off management endpoints. * * @author Dave Syer - * */ public class NoManagementSampleActuatorApplicationTests { diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java index 9070afa4dd..9888c6cc08 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; @@ -25,7 +41,6 @@ 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; @@ -35,7 +50,6 @@ import static org.junit.Assert.assertTrue; * Basic integration tests for service demo application. * * @author Dave Syer - * */ public class SampleActuatorApplicationTests { diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java index 24840007f7..a4e92246ee 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; @@ -25,7 +41,6 @@ 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; @@ -34,7 +49,6 @@ import static org.junit.Assert.assertTrue; * Integration tests for separate management and main service ports. * * @author Dave Syer - * */ public class ShutdownSampleActuatorApplicationTests { diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java index 0890cb2c68..1a3d5e4540 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.actuator; import java.io.IOException; diff --git a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java index 4e42a6f075..46ef39e090 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.zero.sample.batch; import java.io.ByteArrayOutputStream; @@ -22,7 +23,6 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.zero.SpringApplication; -import org.springframework.zero.sample.batch.SampleBatchApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties index 04e13807d5..2793254e4e 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/resources/application.properties @@ -1 +1 @@ -spring.jpa.ddl_auto: create_drop \ No newline at end of file +spring.jpa.ddl_auto: create-drop \ No newline at end of file diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java index 0d9d3239ba..187d2a3f16 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.data.jpa; import java.io.IOException; @@ -16,7 +32,6 @@ 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; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java index e2e25fcc08..2728be0718 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.integration.consumer; import java.util.concurrent.Callable; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java index 71d245c499..4eda4280f8 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.integration.producer; import java.io.File; diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java index 72c93991b9..3b8e138aa0 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.jetty; import java.io.IOException; diff --git a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java index 08095a6e88..03eb746058 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/test/java/org/springframework/zero/sample/profile/SampleProfileApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.profile; import java.io.ByteArrayOutputStream; @@ -8,7 +24,6 @@ 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; diff --git a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java index a4bb5d3264..f9459132b8 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/test/java/org/springframework/zero/sample/simple/SampleSimpleApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.simple; import java.io.ByteArrayOutputStream; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index e804d81219..196c712f01 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.tomcat; import java.io.IOException; @@ -22,7 +38,6 @@ 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; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java index 856d7b5c0b..41b969527b 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.tomcat; import java.io.IOException; diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java index 46019181c5..b8a7b960bf 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.traditional; import java.io.IOException; @@ -16,7 +32,6 @@ 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; diff --git a/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java b/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java index 64a2e334cb..1e5f33ce99 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-xml/src/test/java/org/springframework/zero/sample/xml/SampleSpringXmlApplicationTests.java @@ -1,3 +1,19 @@ +/* + * Copyright 2012-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package org.springframework.zero.sample.xml; import java.io.ByteArrayOutputStream; @@ -6,7 +22,6 @@ 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; From cd51f357a3cfae04954ac6dce5134c3e2a6ad241 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 8 Jul 2013 11:41:51 -0700 Subject: [PATCH 14/15] Further maven module restructure --- pom.xml | 14 ++++----- .../README.md | 0 .../docs/Features.md | 0 .../pom.xml | 6 ++-- .../zero/actuate/audit/AuditEvent.java | 0 .../actuate/audit/AuditEventRepository.java | 0 .../audit/InMemoryAuditEventRepository.java | 0 .../audit/listener/AuditApplicationEvent.java | 0 .../actuate/audit/listener/AuditListener.java | 0 .../autoconfigure/AuditAutoConfiguration.java | 0 .../EndpointAutoConfiguration.java | 0 .../EndpointWebMvcAutoConfiguration.java | 0 ...dpointWebMvcChildContextConfiguration.java | 0 .../ErrorMvcAutoConfiguration.java | 0 ...mentServerPropertiesAutoConfiguration.java | 0 .../MetricFilterAutoConfiguration.java | 0 .../MetricRepositoryAutoConfiguration.java | 0 .../SecurityAutoConfiguration.java | 0 .../TraceRepositoryAutoConfiguration.java | 0 .../TraceWebFilterAutoConfiguration.java | 0 .../actuate/endpoint/AbstractEndpoint.java | 0 .../zero/actuate/endpoint/ActionEndpoint.java | 0 .../zero/actuate/endpoint/BeansEndpoint.java | 0 .../zero/actuate/endpoint/DumpEndpoint.java | 0 .../zero/actuate/endpoint/Endpoint.java | 0 .../actuate/endpoint/EnvironmentEndpoint.java | 0 .../zero/actuate/endpoint/HealthEndpoint.java | 0 .../zero/actuate/endpoint/InfoEndpoint.java | 0 .../actuate/endpoint/MetricsEndpoint.java | 0 .../zero/actuate/endpoint/PublicMetrics.java | 0 .../actuate/endpoint/ShutdownEndpoint.java | 0 .../zero/actuate/endpoint/TraceEndpoint.java | 0 .../endpoint/VanillaPublicMetrics.java | 0 .../endpoint/mvc/EndpointHandlerAdapter.java | 0 .../endpoint/mvc/EndpointHandlerMapping.java | 0 .../fixme/ManagementServerConfiguration.java | 0 .../zero/actuate/health/HealthIndicator.java | 0 .../health/VanillaHealthIndicator.java | 0 .../zero/actuate/metrics/CounterService.java | 0 .../metrics/DefaultCounterService.java | 0 .../actuate/metrics/DefaultGaugeService.java | 0 .../zero/actuate/metrics/GaugeService.java | 0 .../metrics/InMemoryMetricRepository.java | 0 .../zero/actuate/metrics/Measurement.java | 0 .../zero/actuate/metrics/Metric.java | 0 .../actuate/metrics/MetricRepository.java | 0 .../ManagementServerProperties.java | 0 .../properties/SecurityProperties.java | 0 .../security/AuthenticationAuditListener.java | 0 .../security/AuthorizationAuditListener.java | 0 .../trace/InMemoryTraceRepository.java | 0 .../zero/actuate/trace/Trace.java | 0 .../zero/actuate/trace/TraceRepository.java | 0 .../actuate/trace/WebRequestTraceFilter.java | 0 .../actuate/web/BasicErrorController.java | 0 .../zero/actuate/web/ErrorController.java | 0 .../main/resources/META-INF/spring.factories | 0 .../zero/actuate/audit/AuditEventTests.java | 0 .../InMemoryAuditEventRepositoryTests.java | 0 .../audit/listener/AuditListenerTests.java | 0 .../AuditAutoConfigurationTests.java | 0 .../EndpointAutoConfigurationTests.java | 0 .../EndpointWebMvcAutoConfigurationTests.java | 0 ...erverPropertiesAutoConfigurationTests.java | 0 .../MetricFilterAutoConfigurationTests.java | 0 ...etricRepositoryAutoConfigurationTests.java | 0 .../SecurityAutoConfigurationTests.java | 0 ...TraceRepositoryAutoConfigurationTests.java | 0 .../TraceWebFilterAutoConfigurationTest.java | 0 .../endpoint/AbstractEndpointTests.java | 0 .../actuate/endpoint/BeansEndpointTests.java | 0 .../actuate/endpoint/DumpEndpointTests.java | 0 .../endpoint/EnvironmentEndpointTests.java | 0 .../actuate/endpoint/HealthEndpointTests.java | 0 .../actuate/endpoint/InfoEndpointTests.java | 0 .../endpoint/MetricsEndpointTests.java | 0 .../endpoint/ShutdownEndpointTests.java | 0 .../actuate/endpoint/TraceEndpointTests.java | 0 .../endpoint/VanillaPublicMetricsTests.java | 0 .../mvc/EndpointHandlerAdapterTests.java | 0 .../mvc/EndpointHandlerMappingTests.java | 0 .../fixme/ErrorConfigurationTests.java | 0 .../health/VanillaHealthIndicatorTests.java | 0 .../metrics/DefaultCounterServiceTests.java | 0 .../metrics/DefaultGaugeServiceTests.java | 0 .../InMemoryMetricRepositoryTests.java | 0 .../properties/SecurityPropertiesTests.java | 0 .../AuthenticationAuditListenerTests.java | 0 .../AuthorizationAuditListenerTests.java | 0 .../trace/InMemoryTraceRepositoryTests.java | 0 .../trace/WebRequestTraceFilterTests.java | 0 .../src/test/resources/git.properties | 0 .../pom.xml | 6 ++-- .../AutoConfigurationSorter.java | 0 .../autoconfigure/AutoConfigurationUtils.java | 0 .../autoconfigure/AutoConfigureAfter.java | 0 .../autoconfigure/ComponentScanDetector.java | 0 .../EnableAutoConfiguration.java | 0 ...EnableAutoConfigurationImportSelector.java | 0 .../MessageSourceAutoConfiguration.java | 0 .../PropertyPlaceholderAutoConfiguration.java | 0 .../batch/BatchAutoConfiguration.java | 0 .../batch/BatchDatabaseInitializer.java | 0 .../batch/JobExecutionEvent.java | 0 .../batch/JobExecutionExitCodeGenerator.java | 0 .../batch/JobLauncherCommandLineRunner.java | 0 .../JpaRepositoriesAutoConfiguration.java | 0 ...JpaRepositoriesAutoConfigureRegistrar.java | 0 .../jdbc/AbstractDataSourceConfiguration.java | 0 .../jdbc/BasicDataSourceConfiguration.java | 0 .../jdbc/DataSourceAutoConfiguration.java | 0 ...ceTransactionManagerAutoConfiguration.java | 0 .../jdbc/EmbeddedDatabaseConfiguration.java | 0 .../jdbc/TomcatDataSourceConfiguration.java | 0 .../jpa/HibernateJpaAutoConfiguration.java | 0 .../orm/jpa/JpaAutoConfiguration.java | 0 .../thymeleaf/ThymeleafAutoConfiguration.java | 0 ...ddedServletContainerAutoConfiguration.java | 0 .../web/MultipartAutoConfiguration.java | 0 .../ServerPropertiesAutoConfiguration.java | 0 .../web/WebMvcAutoConfiguration.java | 0 .../org/springframework/zero/main/Spring.java | 0 .../main/resources/META-INF/spring.factories | 0 .../zero/autoconfigure/AdhocTestSuite.java | 0 .../AutoConfigurationSorterTest.java | 0 .../ComponentScanDetectorConfiguration.java | 0 .../MessageSourceAutoConfigurationTests.java | 0 .../zero/autoconfigure/SpringJUnitTests.java | 0 .../batch/BatchAutoConfigurationTests.java | 0 .../JobExecutionExitCodeGeneratorTests.java | 0 ...JpaRepositoriesAutoConfigurationTests.java | 0 .../data/JpaWebAutoConfigurationTests.java | 0 .../zero/autoconfigure/data/test/City.java | 0 .../data/test/CityRepository.java | 0 .../BasicDataSourceConfigurationTests.java | 0 .../DataSourceAutoConfigurationTests.java | 0 ...nsactionManagerAutoConfigurationTests.java | 0 .../EmbeddedDatabaseConfigurationTests.java | 0 .../TomcatDataSourceConfigurationTests.java | 0 .../HibernateJpaAutoConfigurationTests.java | 0 .../zero/autoconfigure/orm/jpa/test/City.java | 0 .../ThymeleafAutoConfigurationTests.java | 0 ...ervletContainerAutoConfigurationTests.java | 0 .../web/MultipartAutoConfigurationTests.java | 0 ...erverPropertiesAutoConfigurationTests.java | 0 .../web/WebMvcAutoConfigurationTests.java | 0 .../zero/main/SimpleMainTests.java | 0 .../zero/autoconfigure/jdbc/schema.sql | 0 .../src/test/resources/templates/layout.html | 0 .../src/test/resources/templates/template.txt | 0 .../src/test/resources/templates/tiles.xml | 0 .../src/test/resources/templates/view.html | 0 .../test/resources/test/messages.properties | 0 .../pom.xml | 2 +- .../java/org/springframework/zero/Banner.java | 0 .../zero/BeanDefinitionLoader.java | 0 .../zero/CommandLineRunner.java | 0 .../zero/ExitCodeGenerator.java | 0 .../zero/SpringApplication.java | 0 .../zero/bind/CustomPropertyConstructor.java | 0 .../zero/bind/InetAddressEditor.java | 0 .../bind/PropertiesConfigurationFactory.java | 0 .../bind/PropertySourcesPropertyValues.java | 0 .../zero/bind/RelaxedDataBinder.java | 0 .../zero/bind/YamlConfigurationFactory.java | 0 .../zero/config/JacksonJsonParser.java | 0 .../zero/config/JsonParser.java | 0 .../zero/config/JsonParserFactory.java | 0 .../zero/config/SimpleJsonParser.java | 0 .../zero/config/YamlJsonParser.java | 0 .../zero/config/YamlMapFactoryBean.java | 0 .../zero/config/YamlProcessor.java | 0 .../config/YamlPropertiesFactoryBean.java | 0 .../condition/AbstractOnBeanCondition.java | 0 .../context/condition/ConditionLogUtils.java | 0 .../context/condition/ConditionalOnBean.java | 0 .../context/condition/ConditionalOnClass.java | 0 .../condition/ConditionalOnExpression.java | 0 .../condition/ConditionalOnMissingBean.java | 0 .../condition/ConditionalOnMissingClass.java | 0 .../ConditionalOnNotWebApplication.java | 0 .../condition/ConditionalOnResource.java | 0 .../ConditionalOnWebApplication.java | 0 .../context/condition/OnBeanCondition.java | 0 .../context/condition/OnClassCondition.java | 0 .../condition/OnExpressionCondition.java | 0 .../condition/OnMissingBeanCondition.java | 0 .../condition/OnMissingClassCondition.java | 0 .../OnNotWebApplicationCondition.java | 0 .../condition/OnResourceCondition.java | 0 .../condition/OnWebApplicationCondition.java | 0 ...stractEmbeddedServletContainerFactory.java | 0 ...onConfigEmbeddedWebApplicationContext.java | 0 ...urableEmbeddedServletContainerFactory.java | 0 .../embedded/EmbeddedServletContainer.java | 0 .../EmbeddedServletContainerCustomizer.java | 0 ...tContainerCustomizerBeanPostProcessor.java | 0 .../EmbeddedServletContainerException.java | 0 .../EmbeddedServletContainerFactory.java | 0 .../EmbeddedWebApplicationContext.java | 0 .../zero/context/embedded/ErrorPage.java | 0 .../embedded/FilterRegistrationBean.java | 0 .../context/embedded/RegistrationBean.java | 0 .../embedded/ServletContextInitializer.java | 0 .../embedded/ServletRegistrationBean.java | 0 ...onContextServletContextAwareProcessor.java | 0 .../XmlEmbeddedWebApplicationContext.java | 0 .../jetty/JettyEmbeddedServletContainer.java | 0 .../JettyEmbeddedServletContainerFactory.java | 0 ...ervletContextInitializerConfiguration.java | 0 .../context/embedded/jetty/package-info.java | 0 .../zero/context/embedded/package-info.java | 0 .../embedded/properties/ServerProperties.java | 0 ...etContextInitializerLifecycleListener.java | 0 .../TomcatEmbeddedServletContainer.java | 0 ...TomcatEmbeddedServletContainerFactory.java | 0 .../TomcatEmbeddedWebappClassLoader.java | 0 .../context/embedded/tomcat/package-info.java | 0 ...nfigFileApplicationContextInitializer.java | 0 ...ontextIdApplicationContextInitializer.java | 0 ...DelegateApplicationContextInitializer.java | 0 .../LoggingApplicationContextInitializer.java | 0 .../VcapApplicationContextInitializer.java | 0 .../properties/ConfigurationProperties.java | 0 ...urationPropertiesBindingConfiguration.java | 0 ...urationPropertiesBindingPostProcessor.java | 0 .../ConfigurationPropertiesHolder.java | 0 .../EnableConfigurationProperties.java | 0 ...ConfigurationPropertiesImportSelector.java | 0 .../zero/logging/JavaLoggerConfigurer.java | 0 .../zero/logging/LogbackConfigurer.java | 0 .../zero/web/SpringServletInitializer.java | 0 .../main/resources/META-INF/spring.factories | 0 .../src/main/resources/favicon.ico | Bin .../zero/logging/log4j.properties | 0 .../springframework/zero/logging/logback.xml | 0 .../zero/logging/logging.properties | 0 .../zero/BeanDefinitionLoaderTests.java | 0 .../zero/SpringApplicationTests.java | 0 .../org/springframework/zero/TestUtils.java | 0 .../PropertiesConfigurationFactoryTests.java | 0 .../PropertySourcesPropertyValuesTests.java | 0 .../zero/bind/RelaxedDataBinderTests.java | 0 .../bind/YamlConfigurationFactoryTests.java | 0 .../zero/config/JacksonParserTests.java | 0 .../zero/config/SimpleJsonParserTests.java | 0 .../zero/config/YamlJsonParserTests.java | 0 .../zero/config/YamlMapFactoryBeanTests.java | 0 .../YamlPropertiesFactoryBeanTests.java | 0 .../context/condition/AssertMissingBean.java | 0 .../condition/AssertMissingBeanCondition.java | 0 .../condition/OnBeanConditionTests.java | 0 .../condition/OnClassConditionTests.java | 0 .../condition/OnExpressionConditionTests.java | 0 .../OnMissingBeanConditionTests.java | 0 .../OnMissingClassConditionTests.java | 0 .../OnNotWebApplicationConditionTests.java | 0 .../condition/OnResourceConditionTests.java | 0 .../OnWebApplicationConditionTests.java | 0 ...tEmbeddedServletContainerFactoryTests.java | 0 ...figEmbeddedWebApplicationContextTests.java | 0 ...edServletContainerMvcIntegrationTests.java | 0 .../EmbeddedWebApplicationContextTests.java | 0 .../zero/context/embedded/ExampleFilter.java | 0 .../zero/context/embedded/ExampleServlet.java | 0 .../embedded/FilterRegistrationBeanTests.java | 0 .../MockEmbeddedServletContainerFactory.java | 0 .../zero/context/embedded/MockFilter.java | 0 .../zero/context/embedded/MockServlet.java | 0 .../ServletRegistrationBeanTests.java | 0 ...XmlEmbeddedWebApplicationContextTests.java | 0 ...leEmbeddedWebApplicationConfiguration.java | 0 ...yEmbeddedServletContainerFactoryTests.java | 0 .../properties/ServerPropertiesTests.java | 0 ...tEmbeddedServletContainerFactoryTests.java | 0 ...ileApplicationContextInitializerTests.java | 0 ...tIdApplicationContextInitializerTests.java | 0 ...gateApplicationContextInitializerTest.java | 0 ...capApplicationContextInitializerTests.java | 0 .../EnableConfigurationPropertiesTests.java | 0 .../EnableConfigurationPropertiesTests.java | 0 .../logging/JavaLoggerConfigurerTests.java | 0 .../zero/logging/LogbackConfigurerTests.java | 0 ...ingApplicationContextInitializerTests.java | 0 .../zero/logging/TestFormatter.java | 0 .../zero/sampleconfig/MyComponent.java | 0 .../src/test/resources/application.properties | 0 .../enableprofile-myprofile.properties | 0 .../test/resources/enableprofile.properties | 0 .../src/test/resources/logback-nondefault.xml | 0 .../src/test/resources/logback-test.xml | 0 .../resources/logging-nondefault.properties | 0 .../zero/context/embedded/conf.properties | 0 ...pleEmbeddedWebApplicationConfiguration.xml | 0 .../org/springframework/zero/context/foo.xml | 0 .../context/properties/testProperties.xml | 0 .../org/springframework/zero/sample-beans.xml | 0 .../specificfile-specificprofile.properties | 0 .../resources/specificlocation.properties | 0 .../src/test/resources/testprofiles.yml | 0 .../test/resources/testproperties.properties | 0 .../src/test/resources/testsetprofiles.yml | 0 .../src/test/resources/testyaml.yml | 0 {spring-zero-cli => spring-cli}/pom.xml | 2 +- .../samples/actuator.groovy | 0 .../samples/app.groovy | 0 .../samples/integration.groovy | 0 .../samples/job.groovy | 0 .../samples/runner.groovy | 0 .../samples/runner.xml | 0 .../samples/template.groovy | 0 .../samples/ui.groovy | 0 .../samples/web.groovy | 0 .../src/main/assembly/descriptor.xml | 0 .../org/springframework/zero/cli/Command.java | 0 .../zero/cli/CommandFactory.java | 0 .../org/springframework/zero/cli/Log.java | 0 .../zero/cli/NoSuchCommandException.java | 0 .../zero/cli/SpringZeroCli.java | 0 .../zero/cli/SpringZeroCliException.java | 0 .../zero/cli/command/AbstractCommand.java | 0 .../zero/cli/command/CleanCommand.java | 0 .../zero/cli/command/CreateCommand.java | 0 .../cli/command/DefaultCommandFactory.java | 0 .../zero/cli/command/OptionHandler.java | 0 .../cli/command/OptionParsingCommand.java | 0 .../zero/cli/command/RunCommand.java | 0 .../zero/cli/command/ScriptCommand.java | 0 .../command/ScriptCompilationCustomizer.java | 0 .../zero/cli/command/VersionCommand.java | 0 .../zero/cli/compiler/AstUtils.java | 0 .../compiler/CompilerAutoConfiguration.java | 0 .../cli/compiler/DependencyCustomizer.java | 0 .../compiler/ExtendedGroovyClassLoader.java | 0 .../zero/cli/compiler/GroovyCompiler.java | 0 .../compiler/GroovyCompilerConfiguration.java | 0 .../SpringBatchCompilerAutoConfiguration.java | 0 ...gIntegrationCompilerAutoConfiguration.java | 0 .../SpringMvcCompilerAutoConfiguration.java | 0 .../SpringZeroCompilerAutoConfiguration.java | 0 .../zero/cli/runner/SpringZeroRunner.java | 0 .../runner/SpringZeroRunnerConfiguration.java | 0 .../zero/cli/template/GroovyTemplate.java | 0 .../src/main/resources/.gitignore | 0 ...rg.springframework.zero.cli.CommandFactory | 0 ...ero.cli.compiler.CompilerAutoConfiguration | 0 .../src/main/scripts/spring | 0 .../zero/cli/SampleIntegrationTests.java | 0 .../zero/cli/SpringZeroCliTests.java | 0 .../zero/cli/command/ScriptCommandTests.java | 0 .../test/resources/commands/closure.groovy | 0 .../test/resources/commands/command.groovy | 0 .../test/resources/commands/handler.groovy | 0 .../src/test/resources/commands/mixin.groovy | 0 .../test/resources/commands/runnable.groovy | 0 .../src/test/resources/commands/script.groovy | 0 .../src/test/resources/commands/test.groovy | 0 .../src/test/resources/css/bootstrap.min.css | 0 .../src/test/resources/log4j.properties | 0 .../src/test/resources/templates/home.html | 0 .../src/test/resources/templates/test.txt | 0 .../pom.xml | 2 +- .../zero/launcher/JarLauncher.java | 0 .../zero/launcher/Launcher.java | 0 .../zero/launcher/MainMethodRunner.java | 0 .../zero/launcher/WarLauncher.java | 0 .../zero/launcher/data/RandomAccessData.java | 0 .../launcher/data/RandomAccessDataFile.java | 0 .../zero/launcher/data/package-info.java | 0 .../zero/launcher/jar/JarEntryFilter.java | 0 .../jar/RandomAccessDataZipEntry.java | 0 .../jar/RandomAccessDataZipInputStream.java | 0 .../launcher/jar/RandomAccessJarFile.java | 0 .../zero/launcher/jar/package-info.java | 0 .../zero/launcher/package-info.java | 0 .../zero/launcher/ByteArrayStartsWith.java | 0 .../data/RandomAccessDataFileTest.java | 0 .../RandomAccessDataZipInputStreamTest.java | 0 .../launcher/jar/RandomAccessJarFileTest.java | 0 .../pom.xml | 4 +-- .../src/it/executable-jar/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../src/it/executable-jar/verify.groovy | 0 .../src/it/executable-war/pom.xml | 0 .../main/java/org/test/SampleApplication.java | 0 .../executable-war/src/main/webapp/index.html | 0 .../src/it/executable-war/verify.groovy | 0 .../src/it/settings.xml | 0 .../maven/AbstractExecutableArchiveMojo.java | 2 +- .../zero/maven/ExecutableJarMojo.java | 0 .../zero/maven/ExecutableWarMojo.java | 0 .../zero/maven/MainClassFinder.java | 0 .../PropertiesMergingResourceTransformer.java | 0 .../resources/META-INF/plexus/components.xml | 4 +-- .../zero/maven/MainClassFinderTests.java | 0 ...ertiesMergingResourceTransformerTests.java | 0 .../springframework/zero/maven/Verify.java | 0 .../maven/sample/ClassWithMainMethod.java | 0 .../maven/sample/ClassWithoutMainMethod.java | 0 .../pom.xml | 16 +++++----- .../spring-starter-actuator}/pom.xml | 8 ++--- .../spring-starter-batch}/pom.xml | 6 ++-- .../spring-starter-data-jpa}/pom.xml | 6 ++-- .../spring-starter-integration}/pom.xml | 6 ++-- .../spring-starter-security}/pom.xml | 6 ++-- .../spring-starter-web}/pom.xml | 6 ++-- .../spring-starter}/pom.xml | 8 ++--- spring-zero-intergration-tests/pom.xml | 28 +++++++++--------- .../spring-zero-sample-actuator-ui/pom.xml | 6 ++-- .../spring-zero-sample-actuator/pom.xml | 4 +-- .../spring-zero-sample-batch/pom.xml | 4 +-- .../spring-zero-sample-data-jpa/pom.xml | 6 ++-- .../spring-zero-sample-integration/pom.xml | 4 +-- .../spring-zero-sample-jetty/pom.xml | 4 +-- .../spring-zero-sample-profile/pom.xml | 4 +-- .../spring-zero-sample-simple/pom.xml | 4 +-- .../spring-zero-sample-tomcat/pom.xml | 4 +-- .../spring-zero-sample-traditional/pom.xml | 4 +-- .../spring-zero-sample-web-ui/pom.xml | 4 +-- .../spring-zero-sample-xml/pom.xml | 4 +-- 420 files changed, 92 insertions(+), 92 deletions(-) rename {spring-zero-actuator => spring-actuator}/README.md (100%) rename {spring-zero-actuator => spring-actuator}/docs/Features.md (100%) rename {spring-zero-actuator => spring-actuator}/pom.xml (94%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/Metric.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/trace/Trace.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/java/org/springframework/zero/actuate/web/ErrorController.java (100%) rename {spring-zero-actuator => spring-actuator}/src/main/resources/META-INF/spring.factories (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java (100%) rename {spring-zero-actuator => spring-actuator}/src/test/resources/git.properties (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/pom.xml (96%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/java/org/springframework/zero/main/Spring.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/main/resources/META-INF/spring.factories (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/java/org/springframework/zero/main/SimpleMainTests.java (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/resources/templates/layout.html (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/resources/templates/template.txt (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/resources/templates/tiles.xml (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/resources/templates/view.html (100%) rename {spring-zero-autoconfigure => spring-autoconfigure}/src/test/resources/test/messages.properties (100%) rename {spring-zero-core => spring-bootstrap}/pom.xml (98%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/Banner.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/BeanDefinitionLoader.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/CommandLineRunner.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/ExitCodeGenerator.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/SpringApplication.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/bind/InetAddressEditor.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/JacksonJsonParser.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/JsonParser.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/JsonParserFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/SimpleJsonParser.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/YamlJsonParser.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/YamlProcessor.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/package-info.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/java/org/springframework/zero/web/SpringServletInitializer.java (100%) rename {spring-zero-core => spring-bootstrap}/src/main/resources/META-INF/spring.factories (100%) rename {spring-zero-core => spring-bootstrap}/src/main/resources/favicon.ico (100%) rename {spring-zero-core => spring-bootstrap}/src/main/resources/org/springframework/zero/logging/log4j.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/main/resources/org/springframework/zero/logging/logback.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/main/resources/org/springframework/zero/logging/logging.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/SpringApplicationTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/TestUtils.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/config/JacksonParserTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/MockFilter.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/MockServlet.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/logging/TestFormatter.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/application.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/enableprofile-myprofile.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/enableprofile.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/logback-nondefault.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/logback-test.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/logging-nondefault.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/org/springframework/zero/context/embedded/conf.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/org/springframework/zero/context/foo.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/org/springframework/zero/context/properties/testProperties.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/org/springframework/zero/sample-beans.xml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/specificfile-specificprofile.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/specificlocation.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/testprofiles.yml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/testproperties.properties (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/testsetprofiles.yml (100%) rename {spring-zero-core => spring-bootstrap}/src/test/resources/testyaml.yml (100%) rename {spring-zero-cli => spring-cli}/pom.xml (98%) rename {spring-zero-cli => spring-cli}/samples/actuator.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/app.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/integration.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/job.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/runner.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/runner.xml (100%) rename {spring-zero-cli => spring-cli}/samples/template.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/ui.groovy (100%) rename {spring-zero-cli => spring-cli}/samples/web.groovy (100%) rename {spring-zero-cli => spring-cli}/src/main/assembly/descriptor.xml (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/Command.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/CommandFactory.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/Log.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/SpringZeroCli.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/CleanCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/CreateCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/OptionHandler.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/RunCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/command/VersionCommand.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java (100%) rename {spring-zero-cli => spring-cli}/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java (100%) rename {spring-zero-cli => spring-cli}/src/main/resources/.gitignore (100%) rename {spring-zero-cli => spring-cli}/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory (100%) rename {spring-zero-cli => spring-cli}/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration (100%) rename {spring-zero-cli => spring-cli}/src/main/scripts/spring (100%) rename {spring-zero-cli => spring-cli}/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java (100%) rename {spring-zero-cli => spring-cli}/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java (100%) rename {spring-zero-cli => spring-cli}/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/closure.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/command.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/handler.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/mixin.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/runnable.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/script.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/commands/test.groovy (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/css/bootstrap.min.css (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/log4j.properties (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/templates/home.html (100%) rename {spring-zero-cli => spring-cli}/src/test/resources/templates/test.txt (100%) rename {spring-zero-launcher => spring-launcher}/pom.xml (92%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/JarLauncher.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/Launcher.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/WarLauncher.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/data/package-info.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/jar/package-info.java (100%) rename {spring-zero-launcher => spring-launcher}/src/main/java/org/springframework/zero/launcher/package-info.java (100%) rename {spring-zero-launcher => spring-launcher}/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java (100%) rename {spring-zero-launcher => spring-launcher}/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java (100%) rename {spring-zero-launcher => spring-launcher}/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java (100%) rename {spring-zero-launcher => spring-launcher}/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/pom.xml (97%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-jar/pom.xml (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-jar/src/main/java/org/test/SampleApplication.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-jar/verify.groovy (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-war/pom.xml (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-war/src/main/java/org/test/SampleApplication.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-war/src/main/webapp/index.html (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/executable-war/verify.groovy (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/it/settings.xml (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java (99%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/main/java/org/springframework/zero/maven/MainClassFinder.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/main/resources/META-INF/plexus/components.xml (93%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/test/java/org/springframework/zero/maven/Verify.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java (100%) rename {spring-zero-maven-plugin => spring-package-maven-plugin}/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java (100%) rename {spring-zero-starters => spring-starters}/pom.xml (60%) rename {spring-zero-starters/spring-zero-starter-actuator => spring-starters/spring-starter-actuator}/pom.xml (79%) rename {spring-zero-starters/spring-zero-starter-batch => spring-starters/spring-starter-batch}/pom.xml (86%) rename {spring-zero-starters/spring-zero-starter-data-jpa => spring-starters/spring-starter-data-jpa}/pom.xml (88%) rename {spring-zero-starters/spring-zero-starter-integration => spring-starters/spring-starter-integration}/pom.xml (89%) rename {spring-zero-starters/spring-zero-starter-security => spring-starters/spring-starter-security}/pom.xml (83%) rename {spring-zero-starters/spring-zero-starter-web => spring-starters/spring-starter-web}/pom.xml (88%) rename {spring-zero-starters/spring-zero-starter => spring-starters/spring-starter}/pom.xml (90%) diff --git a/pom.xml b/pom.xml index 66b5adc1c2..eb221adb12 100644 --- a/pom.xml +++ b/pom.xml @@ -36,14 +36,14 @@ - spring-zero-actuator - spring-zero-autoconfigure - spring-zero-cli - spring-zero-core + spring-bootstrap + spring-autoconfigure + spring-starters + spring-actuator + spring-launcher + spring-package-maven-plugin + spring-cli spring-zero-intergration-tests - spring-zero-launcher - spring-zero-maven-plugin - spring-zero-starters diff --git a/spring-zero-actuator/README.md b/spring-actuator/README.md similarity index 100% rename from spring-zero-actuator/README.md rename to spring-actuator/README.md diff --git a/spring-zero-actuator/docs/Features.md b/spring-actuator/docs/Features.md similarity index 100% rename from spring-zero-actuator/docs/Features.md rename to spring-actuator/docs/Features.md diff --git a/spring-zero-actuator/pom.xml b/spring-actuator/pom.xml similarity index 94% rename from spring-zero-actuator/pom.xml rename to spring-actuator/pom.xml index a0e2d92625..65b4a208bc 100644 --- a/spring-zero-actuator/pom.xml +++ b/spring-actuator/pom.xml @@ -7,7 +7,7 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-actuator + spring-actuator jar ${basedir}/.. @@ -16,7 +16,7 @@ ${project.groupId} - spring-zero-autoconfigure + spring-autoconfigure ${project.version} @@ -69,7 +69,7 @@ ${project.groupId} - spring-zero-core + spring-bootstrap ${project.version} tests test diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java diff --git a/spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java b/spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java similarity index 100% rename from spring-zero-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java rename to spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java diff --git a/spring-zero-actuator/src/main/resources/META-INF/spring.factories b/spring-actuator/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-zero-actuator/src/main/resources/META-INF/spring.factories rename to spring-actuator/src/main/resources/META-INF/spring.factories diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java diff --git a/spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java b/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java similarity index 100% rename from spring-zero-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java rename to spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java diff --git a/spring-zero-actuator/src/test/resources/git.properties b/spring-actuator/src/test/resources/git.properties similarity index 100% rename from spring-zero-actuator/src/test/resources/git.properties rename to spring-actuator/src/test/resources/git.properties diff --git a/spring-zero-autoconfigure/pom.xml b/spring-autoconfigure/pom.xml similarity index 96% rename from spring-zero-autoconfigure/pom.xml rename to spring-autoconfigure/pom.xml index 2de900f63b..0f04f0543f 100644 --- a/spring-zero-autoconfigure/pom.xml +++ b/spring-autoconfigure/pom.xml @@ -7,7 +7,7 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-autoconfigure + spring-autoconfigure jar ${basedir}/.. @@ -16,7 +16,7 @@ ${project.groupId} - spring-zero-core + spring-bootstrap ${project.version} @@ -103,7 +103,7 @@ ${project.groupId} - spring-zero-core + spring-bootstrap ${project.version} tests test diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java diff --git a/spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java similarity index 100% rename from spring-zero-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java rename to spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java diff --git a/spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-autoconfigure/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-zero-autoconfigure/src/main/resources/META-INF/spring.factories rename to spring-autoconfigure/src/main/resources/META-INF/spring.factories diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java diff --git a/spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java b/spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java similarity index 100% rename from spring-zero-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java rename to spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java diff --git a/spring-zero-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql b/spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql rename to spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql diff --git a/spring-zero-autoconfigure/src/test/resources/templates/layout.html b/spring-autoconfigure/src/test/resources/templates/layout.html similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/templates/layout.html rename to spring-autoconfigure/src/test/resources/templates/layout.html diff --git a/spring-zero-autoconfigure/src/test/resources/templates/template.txt b/spring-autoconfigure/src/test/resources/templates/template.txt similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/templates/template.txt rename to spring-autoconfigure/src/test/resources/templates/template.txt diff --git a/spring-zero-autoconfigure/src/test/resources/templates/tiles.xml b/spring-autoconfigure/src/test/resources/templates/tiles.xml similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/templates/tiles.xml rename to spring-autoconfigure/src/test/resources/templates/tiles.xml diff --git a/spring-zero-autoconfigure/src/test/resources/templates/view.html b/spring-autoconfigure/src/test/resources/templates/view.html similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/templates/view.html rename to spring-autoconfigure/src/test/resources/templates/view.html diff --git a/spring-zero-autoconfigure/src/test/resources/test/messages.properties b/spring-autoconfigure/src/test/resources/test/messages.properties similarity index 100% rename from spring-zero-autoconfigure/src/test/resources/test/messages.properties rename to spring-autoconfigure/src/test/resources/test/messages.properties diff --git a/spring-zero-core/pom.xml b/spring-bootstrap/pom.xml similarity index 98% rename from spring-zero-core/pom.xml rename to spring-bootstrap/pom.xml index 0eeb3c4ab6..29e3b1b099 100644 --- a/spring-zero-core/pom.xml +++ b/spring-bootstrap/pom.xml @@ -7,7 +7,7 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-core + spring-bootstrap jar ${basedir}/.. diff --git a/spring-zero-core/src/main/java/org/springframework/zero/Banner.java b/spring-bootstrap/src/main/java/org/springframework/zero/Banner.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/Banner.java rename to spring-bootstrap/src/main/java/org/springframework/zero/Banner.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java b/spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/BeanDefinitionLoader.java rename to spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java b/spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/CommandLineRunner.java rename to spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java b/spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/ExitCodeGenerator.java rename to spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java b/spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/SpringApplication.java rename to spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/bind/InetAddressEditor.java rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/JacksonJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/JsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/JsonParserFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/SimpleJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java rename to spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java diff --git a/spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java similarity index 100% rename from spring-zero-core/src/main/java/org/springframework/zero/web/SpringServletInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java diff --git a/spring-zero-core/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-zero-core/src/main/resources/META-INF/spring.factories rename to spring-bootstrap/src/main/resources/META-INF/spring.factories diff --git a/spring-zero-core/src/main/resources/favicon.ico b/spring-bootstrap/src/main/resources/favicon.ico similarity index 100% rename from spring-zero-core/src/main/resources/favicon.ico rename to spring-bootstrap/src/main/resources/favicon.ico diff --git a/spring-zero-core/src/main/resources/org/springframework/zero/logging/log4j.properties b/spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties similarity index 100% rename from spring-zero-core/src/main/resources/org/springframework/zero/logging/log4j.properties rename to spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties diff --git a/spring-zero-core/src/main/resources/org/springframework/zero/logging/logback.xml b/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml similarity index 100% rename from spring-zero-core/src/main/resources/org/springframework/zero/logging/logback.xml rename to spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml diff --git a/spring-zero-core/src/main/resources/org/springframework/zero/logging/logging.properties b/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties similarity index 100% rename from spring-zero-core/src/main/resources/org/springframework/zero/logging/logging.properties rename to spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties diff --git a/spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/SpringApplicationTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java b/spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/TestUtils.java rename to spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/config/JacksonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockFilter.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/MockServlet.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java b/spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/logging/TestFormatter.java rename to spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java diff --git a/spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java b/spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java similarity index 100% rename from spring-zero-core/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java rename to spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java diff --git a/spring-zero-core/src/test/resources/application.properties b/spring-bootstrap/src/test/resources/application.properties similarity index 100% rename from spring-zero-core/src/test/resources/application.properties rename to spring-bootstrap/src/test/resources/application.properties diff --git a/spring-zero-core/src/test/resources/enableprofile-myprofile.properties b/spring-bootstrap/src/test/resources/enableprofile-myprofile.properties similarity index 100% rename from spring-zero-core/src/test/resources/enableprofile-myprofile.properties rename to spring-bootstrap/src/test/resources/enableprofile-myprofile.properties diff --git a/spring-zero-core/src/test/resources/enableprofile.properties b/spring-bootstrap/src/test/resources/enableprofile.properties similarity index 100% rename from spring-zero-core/src/test/resources/enableprofile.properties rename to spring-bootstrap/src/test/resources/enableprofile.properties diff --git a/spring-zero-core/src/test/resources/logback-nondefault.xml b/spring-bootstrap/src/test/resources/logback-nondefault.xml similarity index 100% rename from spring-zero-core/src/test/resources/logback-nondefault.xml rename to spring-bootstrap/src/test/resources/logback-nondefault.xml diff --git a/spring-zero-core/src/test/resources/logback-test.xml b/spring-bootstrap/src/test/resources/logback-test.xml similarity index 100% rename from spring-zero-core/src/test/resources/logback-test.xml rename to spring-bootstrap/src/test/resources/logback-test.xml diff --git a/spring-zero-core/src/test/resources/logging-nondefault.properties b/spring-bootstrap/src/test/resources/logging-nondefault.properties similarity index 100% rename from spring-zero-core/src/test/resources/logging-nondefault.properties rename to spring-bootstrap/src/test/resources/logging-nondefault.properties diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/conf.properties b/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties similarity index 100% rename from spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/conf.properties rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml similarity index 100% rename from spring-zero-core/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/foo.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml similarity index 100% rename from spring-zero-core/src/test/resources/org/springframework/zero/context/foo.xml rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml similarity index 100% rename from spring-zero-core/src/test/resources/org/springframework/zero/context/properties/testProperties.xml rename to spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml diff --git a/spring-zero-core/src/test/resources/org/springframework/zero/sample-beans.xml b/spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml similarity index 100% rename from spring-zero-core/src/test/resources/org/springframework/zero/sample-beans.xml rename to spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml diff --git a/spring-zero-core/src/test/resources/specificfile-specificprofile.properties b/spring-bootstrap/src/test/resources/specificfile-specificprofile.properties similarity index 100% rename from spring-zero-core/src/test/resources/specificfile-specificprofile.properties rename to spring-bootstrap/src/test/resources/specificfile-specificprofile.properties diff --git a/spring-zero-core/src/test/resources/specificlocation.properties b/spring-bootstrap/src/test/resources/specificlocation.properties similarity index 100% rename from spring-zero-core/src/test/resources/specificlocation.properties rename to spring-bootstrap/src/test/resources/specificlocation.properties diff --git a/spring-zero-core/src/test/resources/testprofiles.yml b/spring-bootstrap/src/test/resources/testprofiles.yml similarity index 100% rename from spring-zero-core/src/test/resources/testprofiles.yml rename to spring-bootstrap/src/test/resources/testprofiles.yml diff --git a/spring-zero-core/src/test/resources/testproperties.properties b/spring-bootstrap/src/test/resources/testproperties.properties similarity index 100% rename from spring-zero-core/src/test/resources/testproperties.properties rename to spring-bootstrap/src/test/resources/testproperties.properties diff --git a/spring-zero-core/src/test/resources/testsetprofiles.yml b/spring-bootstrap/src/test/resources/testsetprofiles.yml similarity index 100% rename from spring-zero-core/src/test/resources/testsetprofiles.yml rename to spring-bootstrap/src/test/resources/testsetprofiles.yml diff --git a/spring-zero-core/src/test/resources/testyaml.yml b/spring-bootstrap/src/test/resources/testyaml.yml similarity index 100% rename from spring-zero-core/src/test/resources/testyaml.yml rename to spring-bootstrap/src/test/resources/testyaml.yml diff --git a/spring-zero-cli/pom.xml b/spring-cli/pom.xml similarity index 98% rename from spring-zero-cli/pom.xml rename to spring-cli/pom.xml index 6b25178ff0..79421c5c0f 100644 --- a/spring-zero-cli/pom.xml +++ b/spring-cli/pom.xml @@ -7,7 +7,7 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-cli + spring-cli jar ${basedir}/.. diff --git a/spring-zero-cli/samples/actuator.groovy b/spring-cli/samples/actuator.groovy similarity index 100% rename from spring-zero-cli/samples/actuator.groovy rename to spring-cli/samples/actuator.groovy diff --git a/spring-zero-cli/samples/app.groovy b/spring-cli/samples/app.groovy similarity index 100% rename from spring-zero-cli/samples/app.groovy rename to spring-cli/samples/app.groovy diff --git a/spring-zero-cli/samples/integration.groovy b/spring-cli/samples/integration.groovy similarity index 100% rename from spring-zero-cli/samples/integration.groovy rename to spring-cli/samples/integration.groovy diff --git a/spring-zero-cli/samples/job.groovy b/spring-cli/samples/job.groovy similarity index 100% rename from spring-zero-cli/samples/job.groovy rename to spring-cli/samples/job.groovy diff --git a/spring-zero-cli/samples/runner.groovy b/spring-cli/samples/runner.groovy similarity index 100% rename from spring-zero-cli/samples/runner.groovy rename to spring-cli/samples/runner.groovy diff --git a/spring-zero-cli/samples/runner.xml b/spring-cli/samples/runner.xml similarity index 100% rename from spring-zero-cli/samples/runner.xml rename to spring-cli/samples/runner.xml diff --git a/spring-zero-cli/samples/template.groovy b/spring-cli/samples/template.groovy similarity index 100% rename from spring-zero-cli/samples/template.groovy rename to spring-cli/samples/template.groovy diff --git a/spring-zero-cli/samples/ui.groovy b/spring-cli/samples/ui.groovy similarity index 100% rename from spring-zero-cli/samples/ui.groovy rename to spring-cli/samples/ui.groovy diff --git a/spring-zero-cli/samples/web.groovy b/spring-cli/samples/web.groovy similarity index 100% rename from spring-zero-cli/samples/web.groovy rename to spring-cli/samples/web.groovy diff --git a/spring-zero-cli/src/main/assembly/descriptor.xml b/spring-cli/src/main/assembly/descriptor.xml similarity index 100% rename from spring-zero-cli/src/main/assembly/descriptor.xml rename to spring-cli/src/main/assembly/descriptor.xml diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java b/spring-cli/src/main/java/org/springframework/zero/cli/Command.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/Command.java rename to spring-cli/src/main/java/org/springframework/zero/cli/Command.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java b/spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java rename to spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java b/spring-cli/src/main/java/org/springframework/zero/cli/Log.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/Log.java rename to spring-cli/src/main/java/org/springframework/zero/cli/Log.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java b/spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java rename to spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java b/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java rename to spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java b/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java rename to spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCliException.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/AbstractCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/CleanCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/CreateCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/DefaultCommandFactory.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/OptionHandler.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/OptionParsingCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/RunCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/ScriptCompilationCustomizer.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java b/spring-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java rename to spring-cli/src/main/java/org/springframework/zero/cli/command/VersionCommand.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/AstUtils.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/CompilerAutoConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/DependencyCustomizer.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/ExtendedGroovyClassLoader.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompiler.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java b/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java rename to spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java b/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java rename to spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java diff --git a/spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java b/spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java similarity index 100% rename from spring-zero-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java rename to spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java diff --git a/spring-zero-cli/src/main/resources/.gitignore b/spring-cli/src/main/resources/.gitignore similarity index 100% rename from spring-zero-cli/src/main/resources/.gitignore rename to spring-cli/src/main/resources/.gitignore diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory similarity index 100% rename from spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory rename to spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory diff --git a/spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration similarity index 100% rename from spring-zero-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration rename to spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration diff --git a/spring-zero-cli/src/main/scripts/spring b/spring-cli/src/main/scripts/spring similarity index 100% rename from spring-zero-cli/src/main/scripts/spring rename to spring-cli/src/main/scripts/spring diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java b/spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java similarity index 100% rename from spring-zero-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java rename to spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java b/spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java similarity index 100% rename from spring-zero-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java rename to spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java diff --git a/spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java b/spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java similarity index 100% rename from spring-zero-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java rename to spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java diff --git a/spring-zero-cli/src/test/resources/commands/closure.groovy b/spring-cli/src/test/resources/commands/closure.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/closure.groovy rename to spring-cli/src/test/resources/commands/closure.groovy diff --git a/spring-zero-cli/src/test/resources/commands/command.groovy b/spring-cli/src/test/resources/commands/command.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/command.groovy rename to spring-cli/src/test/resources/commands/command.groovy diff --git a/spring-zero-cli/src/test/resources/commands/handler.groovy b/spring-cli/src/test/resources/commands/handler.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/handler.groovy rename to spring-cli/src/test/resources/commands/handler.groovy diff --git a/spring-zero-cli/src/test/resources/commands/mixin.groovy b/spring-cli/src/test/resources/commands/mixin.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/mixin.groovy rename to spring-cli/src/test/resources/commands/mixin.groovy diff --git a/spring-zero-cli/src/test/resources/commands/runnable.groovy b/spring-cli/src/test/resources/commands/runnable.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/runnable.groovy rename to spring-cli/src/test/resources/commands/runnable.groovy diff --git a/spring-zero-cli/src/test/resources/commands/script.groovy b/spring-cli/src/test/resources/commands/script.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/script.groovy rename to spring-cli/src/test/resources/commands/script.groovy diff --git a/spring-zero-cli/src/test/resources/commands/test.groovy b/spring-cli/src/test/resources/commands/test.groovy similarity index 100% rename from spring-zero-cli/src/test/resources/commands/test.groovy rename to spring-cli/src/test/resources/commands/test.groovy diff --git a/spring-zero-cli/src/test/resources/css/bootstrap.min.css b/spring-cli/src/test/resources/css/bootstrap.min.css similarity index 100% rename from spring-zero-cli/src/test/resources/css/bootstrap.min.css rename to spring-cli/src/test/resources/css/bootstrap.min.css diff --git a/spring-zero-cli/src/test/resources/log4j.properties b/spring-cli/src/test/resources/log4j.properties similarity index 100% rename from spring-zero-cli/src/test/resources/log4j.properties rename to spring-cli/src/test/resources/log4j.properties diff --git a/spring-zero-cli/src/test/resources/templates/home.html b/spring-cli/src/test/resources/templates/home.html similarity index 100% rename from spring-zero-cli/src/test/resources/templates/home.html rename to spring-cli/src/test/resources/templates/home.html diff --git a/spring-zero-cli/src/test/resources/templates/test.txt b/spring-cli/src/test/resources/templates/test.txt similarity index 100% rename from spring-zero-cli/src/test/resources/templates/test.txt rename to spring-cli/src/test/resources/templates/test.txt diff --git a/spring-zero-launcher/pom.xml b/spring-launcher/pom.xml similarity index 92% rename from spring-zero-launcher/pom.xml rename to spring-launcher/pom.xml index 10651bba2a..7d3e5c0f34 100644 --- a/spring-zero-launcher/pom.xml +++ b/spring-launcher/pom.xml @@ -7,7 +7,7 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-launcher + spring-launcher jar ${basedir}/.. diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java diff --git a/spring-zero-launcher/src/main/java/org/springframework/zero/launcher/package-info.java b/spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java similarity index 100% rename from spring-zero-launcher/src/main/java/org/springframework/zero/launcher/package-info.java rename to spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java similarity index 100% rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java rename to spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java similarity index 100% rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java rename to spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java similarity index 100% rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java rename to spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java diff --git a/spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java b/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java similarity index 100% rename from spring-zero-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java rename to spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java diff --git a/spring-zero-maven-plugin/pom.xml b/spring-package-maven-plugin/pom.xml similarity index 97% rename from spring-zero-maven-plugin/pom.xml rename to spring-package-maven-plugin/pom.xml index e47d5de482..4b4c5ef463 100644 --- a/spring-zero-maven-plugin/pom.xml +++ b/spring-package-maven-plugin/pom.xml @@ -7,7 +7,7 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-maven-plugin + spring-package-maven-plugin maven-plugin ${basedir}/.. @@ -85,7 +85,7 @@ ${project.groupId} - spring-zero-launcher + spring-launcher ${project.version} test diff --git a/spring-zero-maven-plugin/src/it/executable-jar/pom.xml b/spring-package-maven-plugin/src/it/executable-jar/pom.xml similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-jar/pom.xml rename to spring-package-maven-plugin/src/it/executable-jar/pom.xml diff --git a/spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java b/spring-package-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java rename to spring-package-maven-plugin/src/it/executable-jar/src/main/java/org/test/SampleApplication.java diff --git a/spring-zero-maven-plugin/src/it/executable-jar/verify.groovy b/spring-package-maven-plugin/src/it/executable-jar/verify.groovy similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-jar/verify.groovy rename to spring-package-maven-plugin/src/it/executable-jar/verify.groovy diff --git a/spring-zero-maven-plugin/src/it/executable-war/pom.xml b/spring-package-maven-plugin/src/it/executable-war/pom.xml similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-war/pom.xml rename to spring-package-maven-plugin/src/it/executable-war/pom.xml diff --git a/spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java b/spring-package-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java rename to spring-package-maven-plugin/src/it/executable-war/src/main/java/org/test/SampleApplication.java diff --git a/spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html b/spring-package-maven-plugin/src/it/executable-war/src/main/webapp/index.html similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-war/src/main/webapp/index.html rename to spring-package-maven-plugin/src/it/executable-war/src/main/webapp/index.html diff --git a/spring-zero-maven-plugin/src/it/executable-war/verify.groovy b/spring-package-maven-plugin/src/it/executable-war/verify.groovy similarity index 100% rename from spring-zero-maven-plugin/src/it/executable-war/verify.groovy rename to spring-package-maven-plugin/src/it/executable-war/verify.groovy diff --git a/spring-zero-maven-plugin/src/it/settings.xml b/spring-package-maven-plugin/src/it/settings.xml similarity index 100% rename from spring-zero-maven-plugin/src/it/settings.xml rename to spring-package-maven-plugin/src/it/settings.xml diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java b/spring-package-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/zero/maven/AbstractExecutableArchiveMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java index 01f36e0bfa..3d8d4f449b 100644 --- a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java @@ -292,7 +292,7 @@ public abstract class AbstractExecutableArchiveMojo extends AbstractMojo { String version = getClass().getPackage().getImplementationVersion(); DefaultArtifact artifact = new DefaultArtifact( - "org.springframework.zero:spring-zero-launcher:" + version); + "org.springframework.zero:spring-launcher:" + version); ArtifactDescriptorRequest descriptorRequest = new ArtifactDescriptorRequest( artifact, repositories, "plugin"); ArtifactDescriptorResult descriptorResult = this.repositorySystem diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java similarity index 100% rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java similarity index 100% rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java similarity index 100% rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java diff --git a/spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java b/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java similarity index 100% rename from spring-zero-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java rename to spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java diff --git a/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml b/spring-package-maven-plugin/src/main/resources/META-INF/plexus/components.xml similarity index 93% rename from spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml rename to spring-package-maven-plugin/src/main/resources/META-INF/plexus/components.xml index f24d528037..1658c975dc 100644 --- a/spring-zero-maven-plugin/src/main/resources/META-INF/plexus/components.xml +++ b/spring-package-maven-plugin/src/main/resources/META-INF/plexus/components.xml @@ -27,7 +27,7 @@ org.apache.maven.plugins:maven-resources-plugin:testResources org.apache.maven.plugins:maven-compiler-plugin:testCompile org.apache.maven.plugins:maven-surefire-plugin:test - org.springframework.zero:spring-zero-maven-plugin:executable-jar + org.springframework.zero:spring-package-maven-plugin:executable-jar org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy @@ -62,7 +62,7 @@ org.apache.maven.plugins:maven-resources-plugin:testResources org.apache.maven.plugins:maven-compiler-plugin:testCompile org.apache.maven.plugins:maven-surefire-plugin:test - org.springframework.zero:spring-zero-maven-plugin:executable-war + org.springframework.zero:spring-package-maven-plugin:executable-war org.apache.maven.plugins:maven-install-plugin:install org.apache.maven.plugins:maven-deploy-plugin:deploy diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java similarity index 100% rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java similarity index 100% rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java similarity index 100% rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java similarity index 100% rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java diff --git a/spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java similarity index 100% rename from spring-zero-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java rename to spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java diff --git a/spring-zero-starters/pom.xml b/spring-starters/pom.xml similarity index 60% rename from spring-zero-starters/pom.xml rename to spring-starters/pom.xml index e82942c123..65984ce82f 100644 --- a/spring-zero-starters/pom.xml +++ b/spring-starters/pom.xml @@ -7,18 +7,18 @@ spring-zero 0.5.0.BUILD-SNAPSHOT - spring-zero-starters + spring-starters pom ${basedir}/.. - spring-zero-starter-actuator - spring-zero-starter-batch - spring-zero-starter-integration - spring-zero-starter-data-jpa - spring-zero-starter-security - spring-zero-starter - spring-zero-starter-web + spring-starter + spring-starter-actuator + spring-starter-batch + spring-starter-integration + spring-starter-data-jpa + spring-starter-security + spring-starter-web diff --git a/spring-zero-starters/spring-zero-starter-actuator/pom.xml b/spring-starters/spring-starter-actuator/pom.xml similarity index 79% rename from spring-zero-starters/spring-zero-starter-actuator/pom.xml rename to spring-starters/spring-starter-actuator/pom.xml index 0d31c5c529..b27d2776e9 100644 --- a/spring-zero-starters/spring-zero-starter-actuator/pom.xml +++ b/spring-starters/spring-starter-actuator/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter-actuator + spring-starter-actuator jar ${basedir}/../.. @@ -15,12 +15,12 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} ${project.groupId} - spring-zero-actuator + spring-actuator ${project.version} diff --git a/spring-zero-starters/spring-zero-starter-batch/pom.xml b/spring-starters/spring-starter-batch/pom.xml similarity index 86% rename from spring-zero-starters/spring-zero-starter-batch/pom.xml rename to spring-starters/spring-starter-batch/pom.xml index d5ffc46428..dff74e224c 100644 --- a/spring-zero-starters/spring-zero-starter-batch/pom.xml +++ b/spring-starters/spring-starter-batch/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter-batch + spring-starter-batch jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} diff --git a/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml b/spring-starters/spring-starter-data-jpa/pom.xml similarity index 88% rename from spring-zero-starters/spring-zero-starter-data-jpa/pom.xml rename to spring-starters/spring-starter-data-jpa/pom.xml index 9174bd195f..825132f9c7 100644 --- a/spring-zero-starters/spring-zero-starter-data-jpa/pom.xml +++ b/spring-starters/spring-starter-data-jpa/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter-data-jpa + spring-starter-data-jpa jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} diff --git a/spring-zero-starters/spring-zero-starter-integration/pom.xml b/spring-starters/spring-starter-integration/pom.xml similarity index 89% rename from spring-zero-starters/spring-zero-starter-integration/pom.xml rename to spring-starters/spring-starter-integration/pom.xml index 88dc4b4140..46e5f9e22a 100644 --- a/spring-zero-starters/spring-zero-starter-integration/pom.xml +++ b/spring-starters/spring-starter-integration/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter-integration + spring-starter-integration jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} diff --git a/spring-zero-starters/spring-zero-starter-security/pom.xml b/spring-starters/spring-starter-security/pom.xml similarity index 83% rename from spring-zero-starters/spring-zero-starter-security/pom.xml rename to spring-starters/spring-starter-security/pom.xml index 97532d0e2f..d4e1846cc9 100644 --- a/spring-zero-starters/spring-zero-starter-security/pom.xml +++ b/spring-starters/spring-starter-security/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter-security + spring-starter-security jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} diff --git a/spring-zero-starters/spring-zero-starter-web/pom.xml b/spring-starters/spring-starter-web/pom.xml similarity index 88% rename from spring-zero-starters/spring-zero-starter-web/pom.xml rename to spring-starters/spring-starter-web/pom.xml index c5eaa47897..69291ca400 100644 --- a/spring-zero-starters/spring-zero-starter-web/pom.xml +++ b/spring-starters/spring-starter-web/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter-web + spring-starter-web jar ${basedir}/../.. @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} diff --git a/spring-zero-starters/spring-zero-starter/pom.xml b/spring-starters/spring-starter/pom.xml similarity index 90% rename from spring-zero-starters/spring-zero-starter/pom.xml rename to spring-starters/spring-starter/pom.xml index e418b39597..9ef7545c20 100644 --- a/spring-zero-starters/spring-zero-starter/pom.xml +++ b/spring-starters/spring-starter/pom.xml @@ -4,10 +4,10 @@ 4.0.0 org.springframework.zero - spring-zero-starters + spring-starters 0.5.0.BUILD-SNAPSHOT - spring-zero-starter + spring-starter jar ${basedir}/../.. @@ -15,12 +15,12 @@ ${project.groupId} - spring-zero-core + spring-bootstrap ${project.version} ${project.groupId} - spring-zero-autoconfigure + spring-autoconfigure ${project.version} diff --git a/spring-zero-intergration-tests/pom.xml b/spring-zero-intergration-tests/pom.xml index 99411dd398..1d16b84aa5 100644 --- a/spring-zero-intergration-tests/pom.xml +++ b/spring-zero-intergration-tests/pom.xml @@ -16,74 +16,74 @@ ${project.groupId} - spring-zero-actuator + spring-actuator ${project.version} ${project.groupId} - spring-zero-autoconfigure + spring-autoconfigure ${project.version} ${project.groupId} - spring-zero-cli + spring-cli ${project.version} ${project.groupId} - spring-zero-core + spring-bootstrap ${project.version} ${project.groupId} - spring-zero-launcher + spring-launcher ${project.version} ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} ${project.groupId} - spring-zero-starter + spring-starter ${project.version} ${project.groupId} - spring-zero-starter-actuator + spring-starter-actuator ${project.version} ${project.groupId} - spring-zero-starter-batch + spring-starter-batch ${project.version} ${project.groupId} - spring-zero-starter-data-jpa + spring-starter-data-jpa ${project.version} ${project.groupId} - spring-zero-starter-integration + spring-starter-integration ${project.version} ${project.groupId} - spring-zero-starter-security + spring-starter-security ${project.version} ${project.groupId} - spring-zero-starter-web + spring-starter-web ${project.version} - + maven-invoker-plugin src/it/settings.xml diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml index bfe4f4bf05..777a14be8c 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/pom.xml @@ -15,12 +15,12 @@ ${project.groupId} - spring-zero-starter-actuator + spring-starter-actuator ${project.version} ${project.groupId} - spring-zero-starter-web + spring-starter-web ${project.version} @@ -40,7 +40,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-actuator/pom.xml b/spring-zero-samples/spring-zero-sample-actuator/pom.xml index 84d62b3a20..231f565c5d 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/pom.xml +++ b/spring-zero-samples/spring-zero-sample-actuator/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter-actuator + spring-starter-actuator ${project.version} @@ -43,7 +43,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-batch/pom.xml b/spring-zero-samples/spring-zero-sample-batch/pom.xml index b8baffbbdf..47aea5414f 100644 --- a/spring-zero-samples/spring-zero-sample-batch/pom.xml +++ b/spring-zero-samples/spring-zero-sample-batch/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter-batch + spring-starter-batch ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml index af1f1fe468..b1d97e4446 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml +++ b/spring-zero-samples/spring-zero-sample-data-jpa/pom.xml @@ -15,12 +15,12 @@ ${project.groupId} - spring-zero-starter-data-jpa + spring-starter-data-jpa ${project.version} ${project.groupId} - spring-zero-starter-web + spring-starter-web ${project.version} @@ -33,7 +33,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-integration/pom.xml b/spring-zero-samples/spring-zero-sample-integration/pom.xml index 44b43bd46f..536c18e0b4 100644 --- a/spring-zero-samples/spring-zero-sample-integration/pom.xml +++ b/spring-zero-samples/spring-zero-sample-integration/pom.xml @@ -15,7 +15,7 @@ org.springframework.zero - spring-zero-starter-integration + spring-starter-integration ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-jetty/pom.xml b/spring-zero-samples/spring-zero-sample-jetty/pom.xml index eccf6b857e..9852f84791 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/pom.xml +++ b/spring-zero-samples/spring-zero-sample-jetty/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} @@ -42,7 +42,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-profile/pom.xml b/spring-zero-samples/spring-zero-sample-profile/pom.xml index 46b40d65b5..31e5d3e6d1 100644 --- a/spring-zero-samples/spring-zero-sample-profile/pom.xml +++ b/spring-zero-samples/spring-zero-sample-profile/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} @@ -28,7 +28,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-simple/pom.xml b/spring-zero-samples/spring-zero-sample-simple/pom.xml index 1457432890..ae892af52b 100644 --- a/spring-zero-samples/spring-zero-sample-simple/pom.xml +++ b/spring-zero-samples/spring-zero-sample-simple/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-tomcat/pom.xml b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml index 04935bf2bc..7af98507b5 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/pom.xml +++ b/spring-zero-samples/spring-zero-sample-tomcat/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} @@ -35,7 +35,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-traditional/pom.xml b/spring-zero-samples/spring-zero-sample-traditional/pom.xml index 4095d6612f..d964433de4 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/pom.xml +++ b/spring-zero-samples/spring-zero-sample-traditional/pom.xml @@ -16,7 +16,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} @@ -44,7 +44,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml index a790637251..16f71b89ca 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/pom.xml +++ b/spring-zero-samples/spring-zero-sample-web-ui/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter-web + spring-starter-web ${project.version} @@ -31,7 +31,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true diff --git a/spring-zero-samples/spring-zero-sample-xml/pom.xml b/spring-zero-samples/spring-zero-sample-xml/pom.xml index e987c69895..4d335a23f6 100644 --- a/spring-zero-samples/spring-zero-sample-xml/pom.xml +++ b/spring-zero-samples/spring-zero-sample-xml/pom.xml @@ -15,7 +15,7 @@ ${project.groupId} - spring-zero-starter + spring-starter ${project.version} @@ -23,7 +23,7 @@ ${project.groupId} - spring-zero-maven-plugin + spring-package-maven-plugin ${project.version} true From 0b863611d9563d6a41ebe219925e68be407e501a Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 8 Jul 2013 13:39:03 -0700 Subject: [PATCH 15/15] Package restructure --- spring-actuator/docs/Features.md | 28 ++++++------- .../{zero => }/actuate/audit/AuditEvent.java | 2 +- .../actuate/audit/AuditEventRepository.java | 2 +- .../audit/InMemoryAuditEventRepository.java | 2 +- .../audit/listener/AuditApplicationEvent.java | 4 +- .../actuate/audit/listener/AuditListener.java | 6 +-- .../autoconfigure/AuditAutoConfiguration.java | 20 ++++----- .../EndpointAutoConfiguration.java | 42 +++++++++---------- .../EndpointWebMvcAutoConfiguration.java | 28 ++++++------- ...dpointWebMvcChildContextConfiguration.java | 18 ++++---- .../ErrorMvcAutoConfiguration.java | 18 ++++---- ...mentServerPropertiesAutoConfiguration.java | 16 +++---- .../MetricFilterAutoConfiguration.java | 14 +++---- .../MetricRepositoryAutoConfiguration.java | 18 ++++---- .../SecurityAutoConfiguration.java | 20 ++++----- .../TraceRepositoryAutoConfiguration.java | 10 ++--- .../TraceWebFilterAutoConfiguration.java | 12 +++--- .../actuate/endpoint/AbstractEndpoint.java | 2 +- .../actuate/endpoint/ActionEndpoint.java | 2 +- .../actuate/endpoint/BeansEndpoint.java | 4 +- .../actuate/endpoint/DumpEndpoint.java | 4 +- .../{zero => }/actuate/endpoint/Endpoint.java | 2 +- .../actuate/endpoint/EnvironmentEndpoint.java | 4 +- .../actuate/endpoint/HealthEndpoint.java | 6 +-- .../actuate/endpoint/InfoEndpoint.java | 4 +- .../actuate/endpoint/MetricsEndpoint.java | 6 +-- .../actuate/endpoint/PublicMetrics.java | 4 +- .../actuate/endpoint/ShutdownEndpoint.java | 6 +-- .../actuate/endpoint/TraceEndpoint.java | 8 ++-- .../endpoint/VanillaPublicMetrics.java | 6 +-- .../endpoint/mvc/EndpointHandlerAdapter.java | 4 +- .../endpoint/mvc/EndpointHandlerMapping.java | 6 +-- .../fixme/ManagementServerConfiguration.java | 22 +++++----- .../actuate/health/HealthIndicator.java | 2 +- .../health/VanillaHealthIndicator.java | 2 +- .../actuate/metrics/CounterService.java | 2 +- .../metrics/DefaultCounterService.java | 2 +- .../actuate/metrics/DefaultGaugeService.java | 2 +- .../actuate/metrics/GaugeService.java | 2 +- .../metrics/InMemoryMetricRepository.java | 2 +- .../actuate/metrics/Measurement.java | 2 +- .../{zero => }/actuate/metrics/Metric.java | 2 +- .../actuate/metrics/MetricRepository.java | 2 +- .../ManagementServerProperties.java | 6 +-- .../properties/SecurityProperties.java | 4 +- .../security/AuthenticationAuditListener.java | 6 +-- .../security/AuthorizationAuditListener.java | 6 +-- .../trace/InMemoryTraceRepository.java | 2 +- .../{zero => }/actuate/trace/Trace.java | 2 +- .../actuate/trace/TraceRepository.java | 2 +- .../actuate/trace/WebRequestTraceFilter.java | 2 +- .../actuate/web/BasicErrorController.java | 4 +- .../actuate/web/ErrorController.java | 2 +- .../main/resources/META-INF/spring.factories | 22 +++++----- .../actuate/audit/AuditEventTests.java | 4 +- .../InMemoryAuditEventRepositoryTests.java | 6 +-- .../audit/listener/AuditListenerTests.java | 8 ++-- .../AuditAutoConfigurationTests.java | 12 +++--- .../EndpointAutoConfigurationTests.java | 21 +++++----- .../EndpointWebMvcAutoConfigurationTests.java | 22 +++++----- ...erverPropertiesAutoConfigurationTests.java | 5 ++- .../MetricFilterAutoConfigurationTests.java | 8 ++-- ...etricRepositoryAutoConfigurationTests.java | 12 +++--- .../SecurityAutoConfigurationTests.java | 8 ++-- ...TraceRepositoryAutoConfigurationTests.java | 8 ++-- .../TraceWebFilterAutoConfigurationTest.java | 10 ++--- .../endpoint/AbstractEndpointTests.java | 5 ++- .../actuate/endpoint/BeansEndpointTests.java | 6 +-- .../actuate/endpoint/DumpEndpointTests.java | 6 +-- .../endpoint/EnvironmentEndpointTests.java | 6 +-- .../actuate/endpoint/HealthEndpointTests.java | 8 ++-- .../actuate/endpoint/InfoEndpointTests.java | 6 +-- .../endpoint/MetricsEndpointTests.java | 10 ++--- .../endpoint/ShutdownEndpointTests.java | 8 ++-- .../actuate/endpoint/TraceEndpointTests.java | 12 +++--- .../endpoint/VanillaPublicMetricsTests.java | 8 ++-- .../mvc/EndpointHandlerAdapterTests.java | 6 +-- .../mvc/EndpointHandlerMappingTests.java | 8 ++-- .../fixme/ErrorConfigurationTests.java | 2 +- .../health/VanillaHealthIndicatorTests.java | 4 +- .../metrics/DefaultCounterServiceTests.java | 4 +- .../metrics/DefaultGaugeServiceTests.java | 4 +- .../InMemoryMetricRepositoryTests.java | 3 +- .../properties/SecurityPropertiesTests.java | 6 +-- .../AuthenticationAuditListenerTests.java | 4 +- .../AuthorizationAuditListenerTests.java | 4 +- .../trace/InMemoryTraceRepositoryTests.java | 6 +-- .../trace/WebRequestTraceFilterTests.java | 6 +-- .../AutoConfigurationSorter.java | 2 +- .../autoconfigure/AutoConfigurationUtils.java | 2 +- .../autoconfigure/AutoConfigureAfter.java | 2 +- .../autoconfigure/ComponentScanDetector.java | 2 +- .../EnableAutoConfiguration.java | 12 +++--- ...EnableAutoConfigurationImportSelector.java | 2 +- .../MessageSourceAutoConfiguration.java | 4 +- .../PropertyPlaceholderAutoConfiguration.java | 4 +- .../batch/BatchAutoConfiguration.java | 14 +++---- .../batch/BatchDatabaseInitializer.java | 2 +- .../batch/JobExecutionEvent.java | 2 +- .../batch/JobExecutionExitCodeGenerator.java | 4 +- .../batch/JobLauncherCommandLineRunner.java | 4 +- .../JpaRepositoriesAutoConfiguration.java | 8 ++-- ...JpaRepositoriesAutoConfigureRegistrar.java | 4 +- .../jdbc/AbstractDataSourceConfiguration.java | 2 +- .../jdbc/BasicDataSourceConfiguration.java | 2 +- .../jdbc/DataSourceAutoConfiguration.java | 10 ++--- ...ceTransactionManagerAutoConfiguration.java | 10 ++--- .../jdbc/EmbeddedDatabaseConfiguration.java | 4 +- .../jdbc/TomcatDataSourceConfiguration.java | 2 +- .../{zero => autoconfigure}/main/Spring.java | 6 +-- .../jpa/HibernateJpaAutoConfiguration.java | 6 +-- .../orm/jpa/JpaAutoConfiguration.java | 12 +++--- .../thymeleaf/ThymeleafAutoConfiguration.java | 14 +++---- ...ddedServletContainerAutoConfiguration.java | 20 ++++----- .../web/MultipartAutoConfiguration.java | 10 ++--- .../ServerPropertiesAutoConfiguration.java | 16 +++---- .../web/WebMvcAutoConfiguration.java | 14 +++---- .../main/resources/META-INF/spring.factories | 26 ++++++------ .../autoconfigure/AdhocTestSuite.java | 6 +-- .../AutoConfigurationSorterTest.java | 4 +- .../ComponentScanDetectorConfiguration.java | 4 +- .../MessageSourceAutoConfigurationTests.java | 4 +- .../autoconfigure/SpringJUnitTests.java | 7 ++-- .../batch/BatchAutoConfigurationTests.java | 8 ++-- .../JobExecutionExitCodeGeneratorTests.java | 4 +- ...JpaRepositoriesAutoConfigurationTests.java | 15 +++---- .../data/JpaWebAutoConfigurationTests.java | 13 +++--- .../autoconfigure/data/test/City.java | 2 +- .../data/test/CityRepository.java | 2 +- .../BasicDataSourceConfigurationTests.java | 3 +- .../DataSourceAutoConfigurationTests.java | 5 ++- ...nsactionManagerAutoConfigurationTests.java | 4 +- .../EmbeddedDatabaseConfigurationTests.java | 3 +- .../TomcatDataSourceConfigurationTests.java | 6 ++- .../main/SimpleMainTests.java | 5 ++- .../HibernateJpaAutoConfigurationTests.java | 13 +++--- .../autoconfigure/orm/jpa/test/City.java | 2 +- .../ThymeleafAutoConfigurationTests.java | 5 ++- ...ervletContainerAutoConfigurationTests.java | 16 +++---- .../web/MultipartAutoConfigurationTests.java | 12 +++--- ...erverPropertiesAutoConfigurationTests.java | 19 +++++---- .../web/WebMvcAutoConfigurationTests.java | 3 +- .../{zero => }/autoconfigure/jdbc/schema.sql | 0 .../{zero => bootstrap}/Banner.java | 17 ++++---- .../BeanDefinitionLoader.java | 2 +- .../CommandLineRunner.java | 2 +- .../ExitCodeGenerator.java | 2 +- .../SpringApplication.java | 6 +-- .../bind/CustomPropertyConstructor.java | 2 +- .../bind/InetAddressEditor.java | 2 +- .../bind/PropertiesConfigurationFactory.java | 2 +- .../bind/PropertySourcesPropertyValues.java | 2 +- .../bind/RelaxedDataBinder.java | 2 +- .../bind/YamlConfigurationFactory.java | 2 +- .../config/JacksonJsonParser.java | 2 +- .../config/JsonParser.java | 2 +- .../config/JsonParserFactory.java | 2 +- .../config/SimpleJsonParser.java | 2 +- .../config/YamlJsonParser.java | 2 +- .../config/YamlMapFactoryBean.java | 2 +- .../config/YamlProcessor.java | 2 +- .../config/YamlPropertiesFactoryBean.java | 2 +- .../condition/AbstractOnBeanCondition.java | 2 +- .../context/condition/ConditionLogUtils.java | 2 +- .../context/condition/ConditionalOnBean.java | 2 +- .../context/condition/ConditionalOnClass.java | 2 +- .../condition/ConditionalOnExpression.java | 2 +- .../condition/ConditionalOnMissingBean.java | 2 +- .../condition/ConditionalOnMissingClass.java | 2 +- .../ConditionalOnNotWebApplication.java | 2 +- .../condition/ConditionalOnResource.java | 2 +- .../ConditionalOnWebApplication.java | 2 +- .../context/condition/OnBeanCondition.java | 2 +- .../context/condition/OnClassCondition.java | 2 +- .../condition/OnExpressionCondition.java | 2 +- .../condition/OnMissingBeanCondition.java | 2 +- .../condition/OnMissingClassCondition.java | 2 +- .../OnNotWebApplicationCondition.java | 2 +- .../condition/OnResourceCondition.java | 2 +- .../condition/OnWebApplicationCondition.java | 2 +- ...stractEmbeddedServletContainerFactory.java | 2 +- ...onConfigEmbeddedWebApplicationContext.java | 2 +- ...urableEmbeddedServletContainerFactory.java | 2 +- .../embedded/EmbeddedServletContainer.java | 2 +- .../EmbeddedServletContainerCustomizer.java | 2 +- ...tContainerCustomizerBeanPostProcessor.java | 2 +- .../EmbeddedServletContainerException.java | 2 +- .../EmbeddedServletContainerFactory.java | 6 +-- .../EmbeddedWebApplicationContext.java | 2 +- .../context/embedded/ErrorPage.java | 2 +- .../embedded/FilterRegistrationBean.java | 2 +- .../context/embedded/RegistrationBean.java | 2 +- .../embedded/ServletContextInitializer.java | 2 +- .../embedded/ServletRegistrationBean.java | 2 +- ...onContextServletContextAwareProcessor.java | 2 +- .../XmlEmbeddedWebApplicationContext.java | 2 +- .../jetty/JettyEmbeddedServletContainer.java | 6 +-- .../JettyEmbeddedServletContainerFactory.java | 12 +++--- ...ervletContextInitializerConfiguration.java | 4 +- .../context/embedded/jetty/package-info.java | 4 +- .../context/embedded/package-info.java | 6 +-- .../embedded/properties/ServerProperties.java | 14 +++---- ...etContextInitializerLifecycleListener.java | 4 +- .../TomcatEmbeddedServletContainer.java | 6 +-- ...TomcatEmbeddedServletContainerFactory.java | 14 +++---- .../TomcatEmbeddedWebappClassLoader.java | 2 +- .../context/embedded/tomcat/package-info.java | 4 +- ...nfigFileApplicationContextInitializer.java | 10 ++--- ...ontextIdApplicationContextInitializer.java | 2 +- ...DelegateApplicationContextInitializer.java | 2 +- .../LoggingApplicationContextInitializer.java | 6 +-- .../VcapApplicationContextInitializer.java | 6 +-- .../properties/ConfigurationProperties.java | 2 +- ...urationPropertiesBindingConfiguration.java | 6 +-- ...urationPropertiesBindingPostProcessor.java | 4 +- .../ConfigurationPropertiesHolder.java | 2 +- .../EnableConfigurationProperties.java | 2 +- ...ConfigurationPropertiesImportSelector.java | 2 +- .../logging/JavaLoggerConfigurer.java | 2 +- .../logging/LogbackConfigurer.java | 2 +- .../web/SpringServletInitializer.java | 6 +-- .../main/resources/META-INF/spring.factories | 10 ++--- .../logging/log4j.properties | 0 .../{zero => bootstrap}/logging/logback.xml | 0 .../logging/logging.properties | 0 .../BeanDefinitionLoaderTests.java | 6 +-- .../SpringApplicationTests.java | 14 +++---- .../{zero => bootstrap}/TestUtils.java | 2 +- .../PropertiesConfigurationFactoryTests.java | 4 +- .../PropertySourcesPropertyValuesTests.java | 3 +- .../bind/RelaxedDataBinderTests.java | 4 +- .../bind/YamlConfigurationFactoryTests.java | 3 +- .../config/JacksonParserTests.java | 5 ++- .../config/SimpleJsonParserTests.java | 4 +- .../config/YamlJsonParserTests.java | 5 ++- .../config/YamlMapFactoryBeanTests.java | 5 ++- .../YamlPropertiesFactoryBeanTests.java | 9 ++-- .../context/condition/AssertMissingBean.java | 4 +- .../condition/AssertMissingBeanCondition.java | 4 +- .../condition/OnBeanConditionTests.java | 7 ++-- .../condition/OnClassConditionTests.java | 6 +-- .../condition/OnExpressionConditionTests.java | 4 +- .../OnMissingBeanConditionTests.java | 6 +-- .../OnMissingClassConditionTests.java | 4 +- .../OnNotWebApplicationConditionTests.java | 7 ++-- .../condition/OnResourceConditionTests.java | 4 +- .../OnWebApplicationConditionTests.java | 7 ++-- ...tEmbeddedServletContainerFactoryTests.java | 14 +++---- ...figEmbeddedWebApplicationContextTests.java | 8 ++-- ...edServletContainerMvcIntegrationTests.java | 8 ++-- .../EmbeddedWebApplicationContextTests.java | 6 ++- .../context/embedded/ExampleFilter.java | 2 +- .../context/embedded/ExampleServlet.java | 2 +- .../embedded/FilterRegistrationBeanTests.java | 6 +-- .../MockEmbeddedServletContainerFactory.java | 10 ++--- .../context/embedded/MockFilter.java | 2 +- .../context/embedded/MockServlet.java | 2 +- .../ServletRegistrationBeanTests.java | 3 +- ...XmlEmbeddedWebApplicationContextTests.java | 4 +- ...leEmbeddedWebApplicationConfiguration.java | 10 ++--- ...yEmbeddedServletContainerFactoryTests.java | 8 ++-- .../properties/ServerPropertiesTests.java | 6 +-- ...tEmbeddedServletContainerFactoryTests.java | 8 ++-- ...ileApplicationContextInitializerTests.java | 4 +- ...tIdApplicationContextInitializerTests.java | 5 ++- ...gateApplicationContextInitializerTest.java | 4 +- ...capApplicationContextInitializerTests.java | 5 ++- .../EnableConfigurationPropertiesTests.java | 12 +++--- .../EnableConfigurationPropertiesTests.java | 6 +-- .../logging/JavaLoggerConfigurerTests.java | 3 +- .../logging/LogbackConfigurerTests.java | 4 +- ...ingApplicationContextInitializerTests.java | 8 ++-- .../logging/TestFormatter.java | 2 +- .../sampleconfig/MyComponent.java | 2 +- .../src/test/resources/logback-nondefault.xml | 2 +- .../src/test/resources/logback-test.xml | 6 +-- .../context/embedded/conf.properties | 0 ...pleEmbeddedWebApplicationConfiguration.xml | 4 +- .../{zero => bootstrap}/context/foo.xml | 0 .../context/properties/testProperties.xml | 4 +- .../{zero => bootstrap}/sample-beans.xml | 2 +- spring-cli/pom.xml | 2 +- spring-cli/samples/actuator.groovy | 2 +- spring-cli/samples/template.groovy | 2 +- spring-cli/src/main/assembly/descriptor.xml | 2 +- .../{zero => }/cli/Command.java | 2 +- .../{zero => }/cli/CommandFactory.java | 2 +- .../springframework/{zero => }/cli/Log.java | 2 +- .../cli/NoSuchCommandException.java | 6 +-- .../SpringZeroCli.java => cli/SpringCli.java} | 38 ++++++++--------- .../SpringCliException.java} | 22 +++++----- .../cli/command/AbstractCommand.java | 4 +- .../{zero => }/cli/command/CleanCommand.java | 6 +-- .../{zero => }/cli/command/CreateCommand.java | 4 +- .../cli/command/DefaultCommandFactory.java | 6 +-- .../{zero => }/cli/command/OptionHandler.java | 2 +- .../cli/command/OptionParsingCommand.java | 4 +- .../{zero => }/cli/command/RunCommand.java | 24 +++++------ .../{zero => }/cli/command/ScriptCommand.java | 8 ++-- .../command/ScriptCompilationCustomizer.java | 4 +- .../cli/command/VersionCommand.java | 4 +- .../{zero => }/cli/compiler/AstUtils.java | 2 +- .../compiler/CompilerAutoConfiguration.java | 2 +- .../cli/compiler/DependencyCustomizer.java | 2 +- .../compiler/ExtendedGroovyClassLoader.java | 2 +- .../cli/compiler/GroovyCompiler.java | 4 +- .../compiler/GroovyCompilerConfiguration.java | 2 +- .../SpringBatchCompilerAutoConfiguration.java | 8 ++-- .../SpringCompilerAutoConfiguration.java} | 29 +++++++------ ...gIntegrationCompilerAutoConfiguration.java | 8 ++-- .../SpringMvcCompilerAutoConfiguration.java | 10 ++--- .../runner/SpringApplicationRunner.java} | 23 +++++----- ...SpringApplicationRunnerConfiguration.java} | 8 ++-- .../cli/template/GroovyTemplate.java | 2 +- .../org.springframework.cli.CommandFactory | 1 + ...ork.cli.compiler.CompilerAutoConfiguration | 5 +++ ...rg.springframework.zero.cli.CommandFactory | 1 - ...ero.cli.compiler.CompilerAutoConfiguration | 5 --- .../cli/SampleIntegrationTests.java | 6 +-- .../SpringCliTests.java} | 26 ++++++------ .../cli/command/ScriptCommandTests.java | 4 +- .../test/resources/commands/closure.groovy | 2 +- .../test/resources/commands/command.groovy | 2 +- .../test/resources/commands/handler.groovy | 2 +- .../src/test/resources/commands/mixin.groovy | 2 +- .../test/resources/commands/runnable.groovy | 2 +- .../src/test/resources/commands/test.groovy | 2 +- .../src/test/resources/log4j.properties | 3 +- .../{zero => }/launcher/JarLauncher.java | 4 +- .../{zero => }/launcher/Launcher.java | 4 +- .../{zero => }/launcher/MainMethodRunner.java | 2 +- .../{zero => }/launcher/WarLauncher.java | 6 +-- .../launcher/data/RandomAccessData.java | 2 +- .../launcher/data/RandomAccessDataFile.java | 2 +- .../launcher/data/package-info.java | 4 +- .../launcher/jar/JarEntryFilter.java | 2 +- .../jar/RandomAccessDataZipEntry.java | 4 +- .../jar/RandomAccessDataZipInputStream.java | 4 +- .../launcher/jar/RandomAccessJarFile.java | 6 +-- .../{zero => }/launcher/jar/package-info.java | 2 +- .../{zero => }/launcher/package-info.java | 6 +-- .../launcher/ByteArrayStartsWith.java | 2 +- .../data/RandomAccessDataFileTest.java | 8 ++-- .../RandomAccessDataZipInputStreamTest.java | 8 ++-- .../launcher/jar/RandomAccessJarFileTest.java | 8 ++-- .../src/it/executable-jar/verify.groovy | 2 +- .../src/it/executable-war/verify.groovy | 2 +- .../AbstractExecutableArchiveMojo.java | 2 +- .../packaging}/ExecutableJarMojo.java | 4 +- .../packaging}/ExecutableWarMojo.java | 4 +- .../packaging}/MainClassFinder.java | 2 +- .../PropertiesMergingResourceTransformer.java | 2 +- .../packaging}/MainClassFinderTests.java | 7 ++-- ...ertiesMergingResourceTransformerTests.java | 3 +- .../maven => maven/packaging}/Verify.java | 10 ++--- .../sample/ClassWithMainMethod.java | 2 +- .../sample/ClassWithoutMainMethod.java | 2 +- .../ui/SampleActuatorUiApplication.java | 6 +-- .../SampleActuatorUiApplicationPortTests.java | 2 +- .../ui/SampleActuatorUiApplicationTests.java | 2 +- .../actuator/SampleActuatorApplication.java | 6 +-- .../sample/actuator/ServiceProperties.java | 2 +- ...pertiesSampleActuatorApplicationTests.java | 2 +- ...AddressSampleActuatorApplicationTests.java | 2 +- ...agementSampleActuatorApplicationTests.java | 2 +- ...agementSampleActuatorApplicationTests.java | 2 +- .../SampleActuatorApplicationTests.java | 2 +- ...hutdownSampleActuatorApplicationTests.java | 2 +- ...nsecureSampleActuatorApplicationTests.java | 2 +- .../sample/batch/SampleBatchApplication.java | 4 +- .../batch/SampleBatchApplicationTests.java | 2 +- .../data/jpa/SampleDataJpaApplication.java | 4 +- .../jpa/SampleDataJpaApplicationTests.java | 2 +- .../SampleIntegrationApplication.java | 6 +-- .../sample/integration/ServiceProperties.java | 2 +- .../SampleIntegrationApplicationTests.java | 2 +- .../producer/ProducerApplication.java | 4 +- .../sample/jetty/SampleJettyApplication.java | 4 +- .../jetty/SampleJettyApplicationTests.java | 2 +- .../profile/SampleProfileApplication.java | 6 +-- .../simple/SampleSimpleApplication.java | 6 +-- .../tomcat/SampleTomcatApplication.java | 4 +- ...igurationSampleTomcatApplicationTests.java | 8 ++-- .../tomcat/SampleTomcatApplicationTests.java | 2 +- .../SampleTraditionalApplication.java | 4 +- .../SampleTraditionalApplicationTests.java | 2 +- .../sample/web/ui/SampleWebUiApplication.java | 4 +- .../web/ui/SampleWebUiApplicationTests.java | 2 +- .../xml/SampleSpringXmlApplication.java | 4 +- 389 files changed, 1111 insertions(+), 1051 deletions(-) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/audit/AuditEvent.java (98%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/audit/AuditEventRepository.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/audit/InMemoryAuditEventRepository.java (97%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/audit/listener/AuditApplicationEvent.java (95%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/audit/listener/AuditListener.java (88%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/AuditAutoConfiguration.java (73%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/EndpointAutoConfiguration.java (78%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java (84%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java (82%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/ErrorMvcAutoConfiguration.java (69%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java (66%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/MetricFilterAutoConfiguration.java (89%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java (68%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/SecurityAutoConfiguration.java (91%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java (75%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java (80%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/AbstractEndpoint.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/ActionEndpoint.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/BeansEndpoint.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/DumpEndpoint.java (90%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/Endpoint.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/EnvironmentEndpoint.java (95%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/HealthEndpoint.java (87%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/InfoEndpoint.java (92%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/MetricsEndpoint.java (89%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/PublicMetrics.java (89%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/ShutdownEndpoint.java (92%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/TraceEndpoint.java (84%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/VanillaPublicMetrics.java (90%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/mvc/EndpointHandlerAdapter.java (98%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/endpoint/mvc/EndpointHandlerMapping.java (95%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/fixme/ManagementServerConfiguration.java (83%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/health/HealthIndicator.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/health/VanillaHealthIndicator.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/CounterService.java (95%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/DefaultCounterService.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/DefaultGaugeService.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/GaugeService.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/InMemoryMetricRepository.java (97%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/Measurement.java (97%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/Metric.java (98%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/metrics/MetricRepository.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/properties/ManagementServerProperties.java (90%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/properties/SecurityProperties.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/security/AuthenticationAuditListener.java (94%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/security/AuthorizationAuditListener.java (93%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/trace/InMemoryTraceRepository.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/trace/Trace.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/trace/TraceRepository.java (95%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/trace/WebRequestTraceFilter.java (98%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/web/BasicErrorController.java (96%) rename spring-actuator/src/main/java/org/springframework/{zero => }/actuate/web/ErrorController.java (95%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/audit/AuditEventTests.java (93%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/audit/InMemoryAuditEventRepositoryTests.java (88%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/audit/listener/AuditListenerTests.java (80%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/AuditAutoConfigurationTests.java (83%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/EndpointAutoConfigurationTests.java (80%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java (89%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java (90%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java (91%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java (83%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/SecurityAutoConfigurationTests.java (90%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java (87%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java (76%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/AbstractEndpointTests.java (95%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/BeansEndpointTests.java (88%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/DumpEndpointTests.java (88%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/EnvironmentEndpointTests.java (87%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/HealthEndpointTests.java (85%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/InfoEndpointTests.java (88%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/MetricsEndpointTests.java (84%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/ShutdownEndpointTests.java (87%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/TraceEndpointTests.java (80%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/VanillaPublicMetricsTests.java (85%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java (86%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/endpoint/mvc/EndpointHandlerMappingTests.java (93%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/fixme/ErrorConfigurationTests.java (96%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/health/VanillaHealthIndicatorTests.java (89%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/metrics/DefaultCounterServiceTests.java (88%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/metrics/DefaultGaugeServiceTests.java (88%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/metrics/InMemoryMetricRepositoryTests.java (89%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/properties/SecurityPropertiesTests.java (91%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/security/AuthenticationAuditListenerTests.java (87%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/security/AuthorizationAuditListenerTests.java (87%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/trace/InMemoryTraceRepositoryTests.java (89%) rename spring-actuator/src/test/java/org/springframework/{zero => }/actuate/trace/WebRequestTraceFilterTests.java (88%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/AutoConfigurationSorter.java (99%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/AutoConfigurationUtils.java (97%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/AutoConfigureAfter.java (95%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/ComponentScanDetector.java (99%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/EnableAutoConfiguration.java (85%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/EnableAutoConfigurationImportSelector.java (98%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/MessageSourceAutoConfiguration.java (92%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/PropertyPlaceholderAutoConfiguration.java (92%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/batch/BatchAutoConfiguration.java (77%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/batch/BatchDatabaseInitializer.java (97%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/batch/JobExecutionEvent.java (95%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/batch/JobExecutionExitCodeGenerator.java (93%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/batch/JobLauncherCommandLineRunner.java (96%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/data/JpaRepositoriesAutoConfiguration.java (83%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java (97%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/jdbc/AbstractDataSourceConfiguration.java (98%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/jdbc/BasicDataSourceConfiguration.java (97%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/jdbc/DataSourceAutoConfiguration.java (96%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java (83%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java (96%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/jdbc/TomcatDataSourceConfiguration.java (96%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => autoconfigure}/main/Spring.java (94%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java (94%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/orm/jpa/JpaAutoConfiguration.java (90%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java (90%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java (78%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/web/MultipartAutoConfiguration.java (81%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/web/ServerPropertiesAutoConfiguration.java (76%) rename spring-autoconfigure/src/main/java/org/springframework/{zero => }/autoconfigure/web/WebMvcAutoConfiguration.java (92%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/AdhocTestSuite.java (82%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/AutoConfigurationSorterTest.java (94%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/ComponentScanDetectorConfiguration.java (88%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/MessageSourceAutoConfigurationTests.java (91%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/SpringJUnitTests.java (85%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/batch/BatchAutoConfigurationTests.java (90%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java (89%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java (77%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/data/JpaWebAutoConfigurationTests.java (80%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/data/test/City.java (96%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/data/test/CityRepository.java (94%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java (91%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java (95%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java (89%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java (91%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java (90%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => autoconfigure}/main/SimpleMainTests.java (91%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java (81%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/orm/jpa/test/City.java (96%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java (94%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java (84%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/web/MultipartAutoConfigurationTests.java (92%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java (82%) rename spring-autoconfigure/src/test/java/org/springframework/{zero => }/autoconfigure/web/WebMvcAutoConfigurationTests.java (87%) rename spring-autoconfigure/src/test/resources/org/springframework/{zero => }/autoconfigure/jdbc/schema.sql (100%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/Banner.java (66%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/BeanDefinitionLoader.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/CommandLineRunner.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/ExitCodeGenerator.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/SpringApplication.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/bind/CustomPropertyConstructor.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/bind/InetAddressEditor.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/bind/PropertiesConfigurationFactory.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/bind/PropertySourcesPropertyValues.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/bind/RelaxedDataBinder.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/bind/YamlConfigurationFactory.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/JacksonJsonParser.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/JsonParser.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/JsonParserFactory.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/SimpleJsonParser.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/YamlJsonParser.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/YamlMapFactoryBean.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/YamlProcessor.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/config/YamlPropertiesFactoryBean.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/AbstractOnBeanCondition.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionLogUtils.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnBean.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnClass.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnExpression.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnMissingBean.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnMissingClass.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnNotWebApplication.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnResource.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/ConditionalOnWebApplication.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnBeanCondition.java (94%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnClassCondition.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnExpressionCondition.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnMissingBeanCondition.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnMissingClassCondition.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnNotWebApplicationCondition.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnResourceCondition.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/condition/OnWebApplicationCondition.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/AbstractEmbeddedServletContainerFactory.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/ConfigurableEmbeddedServletContainerFactory.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedServletContainer.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedServletContainerCustomizer.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedServletContainerException.java (94%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedServletContainerFactory.java (85%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedWebApplicationContext.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/ErrorPage.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/FilterRegistrationBean.java (99%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/RegistrationBean.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/ServletContextInitializer.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/ServletRegistrationBean.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/WebApplicationContextServletContextAwareProcessor.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/XmlEmbeddedWebApplicationContext.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/jetty/JettyEmbeddedServletContainer.java (89%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/jetty/ServletContextInitializerConfiguration.java (94%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/jetty/package-info.java (76%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/package-info.java (74%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/properties/ServerProperties.java (86%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java (93%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/tomcat/TomcatEmbeddedServletContainer.java (91%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java (95%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/embedded/tomcat/package-info.java (76%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/initializer/ConfigFileApplicationContextInitializer.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/initializer/ContextIdApplicationContextInitializer.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/initializer/EnvironmentDelegateApplicationContextInitializer.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/initializer/LoggingApplicationContextInitializer.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/initializer/VcapApplicationContextInitializer.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/properties/ConfigurationProperties.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/properties/ConfigurationPropertiesBindingConfiguration.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/properties/ConfigurationPropertiesBindingPostProcessor.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/properties/ConfigurationPropertiesHolder.java (94%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/properties/EnableConfigurationProperties.java (96%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/context/properties/EnableConfigurationPropertiesImportSelector.java (98%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/logging/JavaLoggerConfigurer.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/logging/LogbackConfigurer.java (97%) rename spring-bootstrap/src/main/java/org/springframework/{zero => bootstrap}/web/SpringServletInitializer.java (94%) rename spring-bootstrap/src/main/resources/org/springframework/{zero => bootstrap}/logging/log4j.properties (100%) rename spring-bootstrap/src/main/resources/org/springframework/{zero => bootstrap}/logging/logback.xml (100%) rename spring-bootstrap/src/main/resources/org/springframework/{zero => bootstrap}/logging/logging.properties (100%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/BeanDefinitionLoaderTests.java (95%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/SpringApplicationTests.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/TestUtils.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/bind/PropertiesConfigurationFactoryTests.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/bind/PropertySourcesPropertyValuesTests.java (96%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/bind/RelaxedDataBinderTests.java (99%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/bind/YamlConfigurationFactoryTests.java (96%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/config/JacksonParserTests.java (83%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/config/SimpleJsonParserTests.java (92%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/config/YamlJsonParserTests.java (83%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/config/YamlMapFactoryBeanTests.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/config/YamlPropertiesFactoryBeanTests.java (95%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/AssertMissingBean.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/AssertMissingBeanCondition.java (92%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnBeanConditionTests.java (92%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnClassConditionTests.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnExpressionConditionTests.java (89%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnMissingBeanConditionTests.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnMissingClassConditionTests.java (92%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnNotWebApplicationConditionTests.java (85%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnResourceConditionTests.java (90%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/condition/OnWebApplicationConditionTests.java (87%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/EmbeddedWebApplicationContextTests.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/ExampleFilter.java (96%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/ExampleServlet.java (95%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/FilterRegistrationBeanTests.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/MockEmbeddedServletContainerFactory.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/MockFilter.java (95%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/MockServlet.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/ServletRegistrationBeanTests.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/XmlEmbeddedWebApplicationContextTests.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java (73%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java (84%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/properties/ServerPropertiesTests.java (91%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java (84%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/initializer/ConfigFileApplicationContextInitializerTests.java (96%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/initializer/ContextIdApplicationContextInitializerTests.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/initializer/VcapApplicationContextInitializerTests.java (93%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/properties/EnableConfigurationPropertiesTests.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/context/test/EnableConfigurationPropertiesTests.java (94%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/logging/JavaLoggerConfigurerTests.java (95%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/logging/LogbackConfigurerTests.java (97%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/logging/LoggingApplicationContextInitializerTests.java (96%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/logging/TestFormatter.java (95%) rename spring-bootstrap/src/test/java/org/springframework/{zero => bootstrap}/sampleconfig/MyComponent.java (93%) rename spring-bootstrap/src/test/resources/org/springframework/{zero => bootstrap}/context/embedded/conf.properties (100%) rename spring-bootstrap/src/test/resources/org/springframework/{zero => bootstrap}/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml (63%) rename spring-bootstrap/src/test/resources/org/springframework/{zero => bootstrap}/context/foo.xml (100%) rename spring-bootstrap/src/test/resources/org/springframework/{zero => bootstrap}/context/properties/testProperties.xml (61%) rename spring-bootstrap/src/test/resources/org/springframework/{zero => bootstrap}/sample-beans.xml (83%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/Command.java (97%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/CommandFactory.java (96%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/Log.java (96%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/NoSuchCommandException.java (86%) rename spring-cli/src/main/java/org/springframework/{zero/cli/SpringZeroCli.java => cli/SpringCli.java} (83%) rename spring-cli/src/main/java/org/springframework/{zero/cli/SpringZeroCliException.java => cli/SpringCliException.java} (75%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/AbstractCommand.java (93%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/CleanCommand.java (97%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/CreateCommand.java (94%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/DefaultCommandFactory.java (88%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/OptionHandler.java (97%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/OptionParsingCommand.java (93%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/RunCommand.java (86%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/ScriptCommand.java (96%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/ScriptCompilationCustomizer.java (98%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/command/VersionCommand.java (91%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/AstUtils.java (96%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/CompilerAutoConfiguration.java (98%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/DependencyCustomizer.java (99%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/ExtendedGroovyClassLoader.java (98%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/GroovyCompiler.java (98%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/GroovyCompilerConfiguration.java (95%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java (91%) rename spring-cli/src/main/java/org/springframework/{zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java => cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java} (81%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java (91%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java (86%) rename spring-cli/src/main/java/org/springframework/{zero/cli/runner/SpringZeroRunner.java => cli/runner/SpringApplicationRunner.java} (89%) rename spring-cli/src/main/java/org/springframework/{zero/cli/runner/SpringZeroRunnerConfiguration.java => cli/runner/SpringApplicationRunnerConfiguration.java} (79%) rename spring-cli/src/main/java/org/springframework/{zero => }/cli/template/GroovyTemplate.java (97%) create mode 100644 spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory create mode 100644 spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration delete mode 100644 spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory delete mode 100644 spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration rename spring-cli/src/test/java/org/springframework/{zero => }/cli/SampleIntegrationTests.java (97%) rename spring-cli/src/test/java/org/springframework/{zero/cli/SpringZeroCliTests.java => cli/SpringCliTests.java} (86%) rename spring-cli/src/test/java/org/springframework/{zero => }/cli/command/ScriptCommandTests.java (96%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/JarLauncher.java (92%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/Launcher.java (98%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/MainMethodRunner.java (97%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/WarLauncher.java (92%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/data/RandomAccessData.java (96%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/data/RandomAccessDataFile.java (99%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/data/package-info.java (86%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/jar/JarEntryFilter.java (96%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/jar/RandomAccessDataZipEntry.java (91%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/jar/RandomAccessDataZipInputStream.java (96%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/jar/RandomAccessJarFile.java (98%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/jar/package-info.java (93%) rename spring-launcher/src/main/java/org/springframework/{zero => }/launcher/package-info.java (86%) rename spring-launcher/src/test/java/org/springframework/{zero => }/launcher/ByteArrayStartsWith.java (96%) rename spring-launcher/src/test/java/org/springframework/{zero => }/launcher/data/RandomAccessDataFileTest.java (97%) rename spring-launcher/src/test/java/org/springframework/{zero => }/launcher/jar/RandomAccessDataZipInputStreamTest.java (90%) rename spring-launcher/src/test/java/org/springframework/{zero => }/launcher/jar/RandomAccessJarFileTest.java (98%) rename spring-package-maven-plugin/src/main/java/org/springframework/{zero/maven => maven/packaging}/AbstractExecutableArchiveMojo.java (99%) rename spring-package-maven-plugin/src/main/java/org/springframework/{zero/maven => maven/packaging}/ExecutableJarMojo.java (94%) rename spring-package-maven-plugin/src/main/java/org/springframework/{zero/maven => maven/packaging}/ExecutableWarMojo.java (96%) rename spring-package-maven-plugin/src/main/java/org/springframework/{zero/maven => maven/packaging}/MainClassFinder.java (98%) rename spring-package-maven-plugin/src/main/java/org/springframework/{zero/maven => maven/packaging}/PropertiesMergingResourceTransformer.java (98%) rename spring-package-maven-plugin/src/test/java/org/springframework/{zero/maven => maven/packaging}/MainClassFinderTests.java (92%) rename spring-package-maven-plugin/src/test/java/org/springframework/{zero/maven => maven/packaging}/PropertiesMergingResourceTransformerTests.java (94%) rename spring-package-maven-plugin/src/test/java/org/springframework/{zero/maven => maven/packaging}/Verify.java (93%) rename spring-package-maven-plugin/src/test/java/org/springframework/{zero/maven => maven/packaging}/sample/ClassWithMainMethod.java (93%) rename spring-package-maven-plugin/src/test/java/org/springframework/{zero/maven => maven/packaging}/sample/ClassWithoutMainMethod.java (93%) diff --git a/spring-actuator/docs/Features.md b/spring-actuator/docs/Features.md index e2aa542a01..e84748eb8f 100644 --- a/spring-actuator/docs/Features.md +++ b/spring-actuator/docs/Features.md @@ -1,12 +1,12 @@ -# Spring Zero Actuator Feature Guide +# Spring Actuator Feature Guide -Here are some (most, hopefully all) the features of Spring Zero -Actuator with some commentary to help you start using them. We +Here are some (most, hopefully all) the features of Spring Actuator +with some commentary to help you start using them. We recommend you first build a project with the Actuator (e.g. the getting started project from the main README), and then try each feature in turn there. -TODO: some of these are features of Spring Zero (or +TODO: some of these are features of Spring Bootstrap (or `SpringApplication`) not the Actuator. TODO: group things together and break them out into separate files. @@ -33,7 +33,7 @@ The default value comes after the first colon (":"). ## Externalized Configuration -In addition to command line option arguments, Spring Zero will +In addition to command line option arguments, Spring Bootstrap will pick up a file called `application.properties` in the root of your classpath (if there is one) and add those properties to the Spring `Environment`. The search path for `application.properties` is @@ -49,7 +49,7 @@ previously defined values (e.g. from System properties), e.g. app.name: MyApp app.description: ${app.name} is a Cool New App -Spring Zero also binds the properties to any bean in your +Spring Bootstrap also binds the properties to any bean in your application context whose type is `@ConfigurationProperties`. The Actuator provides some of those beans out of the box, so you can easily customize server and management properties (ports etc.), @@ -63,7 +63,7 @@ configuration and make it only available in certain environments. Any `@Component` that is marked with `@Profile` will only be loaded in the profile specified by the latter annotation. -Spring Zero takes it a stage further. If you include in your +Spring Bootstap takes it a stage further. If you include in your `application.properties` a value for a property named `spring.active.profiles` then those profiles will be active by default. E.g. @@ -72,7 +72,7 @@ default. E.g. ## Profile-dependent configuration -Spring Zero loads additional properties files if there are active +Spring Bootstrap loads additional properties files if there are active profiles using a naming convention `application-{profile}.properties`. Property values from those files override trhe default ones. @@ -98,7 +98,7 @@ to one of your `@Configuration` (or `@Component`) classes. Then you can in any of your component classes to grab that configuration and use it. -Spring Zero uses some relaxed rules for binding `Environment` +Spring Bootstrap uses some relaxed rules for binding `Environment` properties to `@ConfigurationProperties` beans, so there doesn't need to be an exact match between the `Environment` property name and the bean property name. Common examples where this is useful include @@ -137,7 +137,7 @@ compiler or IDE. YAML is a superset of JSON, and as such is a very convenient format for specifying hierarchical configuration data, such as that supported -by Spring Zero Actuator. If you prefer to use +by Spring Actuator. If you prefer to use [YAML](http://yaml.org) instead of Properties files you just need to include a file called `application.yml` in the root of your classpath @@ -212,7 +212,7 @@ properties in the application properties (see * To enable the Tomcat access log valve (very common in production environments) More fine-grained control of the Tomcat container is available if you -need it. Instead of letting Spring Zero create the container for +need it. Instead of letting Spring Actuator create the container for you, just create a bean of type `TomcatEmbeddedServletContainerFactory` and override one of its methods, or inject some customizations, e.g. @@ -256,7 +256,7 @@ this. ## Customizing Logging -Spring Zero uses SLF4J for logging, but leaves the implementation +Spring Actuator uses SLF4J for logging, but leaves the implementation open. The Starter projects and the Actuator use JDK native logging by default, purely because it is always available. A default configuration file is provided for JDK logging, and also for log4j and @@ -286,11 +286,11 @@ from the Spring `Environment` to System properties: All the logging systems supported can consult System properties when parsing their configuration files. See the default configurations in -`spring-zero-core.jar` for examples. +`spring-bootstrap.jar` for examples. ## Application Context Initializers -To add additional application context initializers to the Zero +To add additional application context initializers to the bootstrap startup process, add a comma-delimited list of class names to the `Environment` property `context.initializer.classes` (can be specified via `application.properties`). diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java index 61561a753b..73b2654247 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEvent.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit; +package org.springframework.actuate.audit; import java.io.Serializable; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java index 6349f6ae7b..874fdbb7dd 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/AuditEventRepository.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/audit/AuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit; +package org.springframework.actuate.audit; import java.util.Date; import java.util.List; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java index 5a564094d6..399863364b 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepository.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/audit/InMemoryAuditEventRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit; +package org.springframework.actuate.audit; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java index a2034b8f60..2fe8910e3c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditApplicationEvent.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditApplicationEvent.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit.listener; +package org.springframework.actuate.audit.listener; import java.util.Date; import java.util.Map; +import org.springframework.actuate.audit.AuditEvent; import org.springframework.context.ApplicationEvent; import org.springframework.util.Assert; -import org.springframework.zero.actuate.audit.AuditEvent; /** * Spring {@link ApplicationEvent} to encapsulate {@link AuditEvent}s. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java b/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java similarity index 88% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java rename to spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java index 8f1707c86f..78c07fdad0 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/audit/listener/AuditListener.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/audit/listener/AuditListener.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit.listener; +package org.springframework.actuate.audit.listener; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.AuditEventRepository; import org.springframework.context.ApplicationListener; -import org.springframework.zero.actuate.audit.AuditEvent; -import org.springframework.zero.actuate.audit.AuditEventRepository; /** * {@link ApplicationListener} that listens for {@link AuditEvent}s and stores them in a diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java similarity index 73% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java index a502a954e8..22fd35ec0a 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/AuditAutoConfiguration.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.AuditEventRepository; +import org.springframework.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.actuate.audit.listener.AuditListener; +import org.springframework.actuate.security.AuthenticationAuditListener; +import org.springframework.actuate.security.AuthorizationAuditListener; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.audit.AuditEvent; -import org.springframework.zero.actuate.audit.AuditEventRepository; -import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository; -import org.springframework.zero.actuate.audit.listener.AuditListener; -import org.springframework.zero.actuate.security.AuthenticationAuditListener; -import org.springframework.zero.actuate.security.AuthorizationAuditListener; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link AuditEvent}s. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java similarity index 78% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java index daed4987a7..0c1c56404c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointAutoConfiguration.java @@ -14,40 +14,40 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import java.util.LinkedHashMap; import java.util.Map; import java.util.Properties; +import org.springframework.actuate.endpoint.BeansEndpoint; +import org.springframework.actuate.endpoint.DumpEndpoint; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.actuate.endpoint.EnvironmentEndpoint; +import org.springframework.actuate.endpoint.HealthEndpoint; +import org.springframework.actuate.endpoint.InfoEndpoint; +import org.springframework.actuate.endpoint.MetricsEndpoint; +import org.springframework.actuate.endpoint.PublicMetrics; +import org.springframework.actuate.endpoint.ShutdownEndpoint; +import org.springframework.actuate.endpoint.TraceEndpoint; +import org.springframework.actuate.endpoint.VanillaPublicMetrics; +import org.springframework.actuate.health.HealthIndicator; +import org.springframework.actuate.health.VanillaHealthIndicator; +import org.springframework.actuate.metrics.InMemoryMetricRepository; +import org.springframework.actuate.metrics.MetricRepository; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.TraceRepository; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.StandardEnvironment; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PropertiesLoaderUtils; -import org.springframework.zero.actuate.endpoint.BeansEndpoint; -import org.springframework.zero.actuate.endpoint.DumpEndpoint; -import org.springframework.zero.actuate.endpoint.Endpoint; -import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint; -import org.springframework.zero.actuate.endpoint.HealthEndpoint; -import org.springframework.zero.actuate.endpoint.InfoEndpoint; -import org.springframework.zero.actuate.endpoint.MetricsEndpoint; -import org.springframework.zero.actuate.endpoint.PublicMetrics; -import org.springframework.zero.actuate.endpoint.ShutdownEndpoint; -import org.springframework.zero.actuate.endpoint.TraceEndpoint; -import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics; -import org.springframework.zero.actuate.health.HealthIndicator; -import org.springframework.zero.actuate.health.VanillaHealthIndicator; -import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; -import org.springframework.zero.actuate.metrics.MetricRepository; -import org.springframework.zero.actuate.trace.InMemoryTraceRepository; -import org.springframework.zero.actuate.trace.TraceRepository; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.bind.PropertiesConfigurationFactory; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for common management diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java similarity index 84% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 7064f240c2..a2ce8775e2 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -14,14 +14,27 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import javax.servlet.Servlet; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.actuate.properties.ManagementServerProperties; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationListener; @@ -31,19 +44,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.web.servlet.DispatcherServlet; -import org.springframework.zero.actuate.endpoint.Endpoint; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.properties.ServerProperties; /** * {@link EnableAutoConfiguration Auto-configuration} to enable Spring MVC to handle diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java similarity index 82% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java index e5b4e23a7b..96d9948346 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/EndpointWebMvcChildContextConfiguration.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import javax.servlet.Filter; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.actuate.properties.ManagementServerProperties; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.HandlerMapping; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; /** * Configuration for triggered from {@link EndpointWebMvcAutoConfiguration} when a new diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java similarity index 69% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java index 6fc8c40d37..0f77f010a3 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ErrorMvcAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ErrorMvcAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import javax.servlet.Servlet; +import org.springframework.actuate.web.BasicErrorController; +import org.springframework.actuate.web.ErrorController; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.ErrorPage; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.DispatcherServlet; -import org.springframework.zero.actuate.web.BasicErrorController; -import org.springframework.zero.actuate.web.ErrorController; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.ErrorPage; /** * {@link EnableAutoConfiguration Auto-configuration} to render errors via a MVC error diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java similarity index 66% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java index a91a51e057..cda2d971b0 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; +import org.springframework.actuate.properties.ManagementServerProperties; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} for the @@ -36,7 +36,7 @@ import org.springframework.zero.context.properties.EnableConfigurationProperties @EnableConfigurationProperties public class ManagementServerPropertiesAutoConfiguration { - @Bean(name = "org.springframework.zero.actuate.properties.ManagementServerProperties") + @Bean(name = "org.springframework.actuate.properties.ManagementServerProperties") @ConditionalOnMissingBean public ManagementServerProperties serverProperties() { return new ManagementServerProperties(); diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java index 5c883c2ff8..1ff656bd44 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import java.io.IOException; @@ -27,7 +27,13 @@ import javax.servlet.ServletResponse; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.springframework.actuate.metrics.CounterService; +import org.springframework.actuate.metrics.GaugeService; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -35,12 +41,6 @@ import org.springframework.core.annotation.Order; import org.springframework.util.StopWatch; import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.util.UrlPathHelper; -import org.springframework.zero.actuate.metrics.CounterService; -import org.springframework.zero.actuate.metrics.GaugeService; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} that records Servlet interactions diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java similarity index 68% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java index ec3b14cc81..ae9132b168 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; +import org.springframework.actuate.metrics.CounterService; +import org.springframework.actuate.metrics.DefaultCounterService; +import org.springframework.actuate.metrics.DefaultGaugeService; +import org.springframework.actuate.metrics.GaugeService; +import org.springframework.actuate.metrics.InMemoryMetricRepository; +import org.springframework.actuate.metrics.MetricRepository; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.metrics.CounterService; -import org.springframework.zero.actuate.metrics.DefaultCounterService; -import org.springframework.zero.actuate.metrics.DefaultGaugeService; -import org.springframework.zero.actuate.metrics.GaugeService; -import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; -import org.springframework.zero.actuate.metrics.MetricRepository; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for metrics services. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java similarity index 91% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java index 27f7350fe6..9a3ad6b6bb 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/SecurityAutoConfiguration.java @@ -14,13 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping; +import org.springframework.actuate.properties.SecurityProperties; +import org.springframework.actuate.web.ErrorController; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -37,14 +45,6 @@ import org.springframework.security.config.annotation.web.configuration.EnableWe import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.authentication.www.BasicAuthenticationEntryPoint; -import org.springframework.zero.actuate.endpoint.Endpoint; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping; -import org.springframework.zero.actuate.properties.SecurityProperties; -import org.springframework.zero.actuate.web.ErrorController; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} for security of a web application or @@ -84,7 +84,7 @@ import org.springframework.zero.context.properties.EnableConfigurationProperties @EnableConfigurationProperties public class SecurityAutoConfiguration { - @Bean(name = "org.springframework.zero.actuate.properties.SecurityProperties") + @Bean(name = "org.springframework.actuate.properties.SecurityProperties") @ConditionalOnMissingBean public SecurityProperties securityProperties() { return new SecurityProperties(); diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java similarity index 75% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java index ecdc89e308..bedc829059 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfiguration.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.TraceRepository; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.trace.InMemoryTraceRepository; -import org.springframework.zero.actuate.trace.TraceRepository; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link TraceRepository tracing}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java similarity index 80% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java index 79a25fd5fc..81efc9ed0e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfiguration.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import javax.servlet.Servlet; +import org.springframework.actuate.trace.TraceRepository; +import org.springframework.actuate.trace.WebRequestTraceFilter; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.web.servlet.DispatcherServlet; -import org.springframework.zero.actuate.trace.TraceRepository; -import org.springframework.zero.actuate.trace.WebRequestTraceFilter; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link WebRequestTraceFilter diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java index 7294fbfade..86bb2d551d 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/AbstractEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/AbstractEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import javax.validation.constraints.NotNull; import javax.validation.constraints.Pattern; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java index 373e99fa40..2c7139de7b 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ActionEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ActionEndpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; /** * Tagging interface used to indicate that {@link Endpoint} that performs some action. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java index c23bd42cff..c71b513e0c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/BeansEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/BeansEndpoint.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import org.springframework.beans.BeansException; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.LiveBeansView; import org.springframework.core.env.Environment; import org.springframework.http.MediaType; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * Exposes JSON view of Spring beans. If the {@link Environment} contains a key setting diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java index d7a809513a..754c2078f3 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/DumpEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/DumpEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.lang.management.ManagementFactory; import java.lang.management.ThreadInfo; import java.util.Arrays; import java.util.List; -import org.springframework.zero.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose thread info. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java index fde590ffd4..a1770d2224 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/Endpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/Endpoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import org.springframework.http.MediaType; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java index 5dd0f88a71..42e09427a6 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/EnvironmentEndpoint.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.LinkedHashMap; import java.util.Map; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.context.EnvironmentAware; import org.springframework.core.env.ConfigurableEnvironment; import org.springframework.core.env.EnumerablePropertySource; import org.springframework.core.env.Environment; import org.springframework.core.env.PropertySource; import org.springframework.core.env.StandardEnvironment; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose {@link ConfigurableEnvironment environment} information. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java similarity index 87% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java index 17cb85ca32..0da4f1e6b3 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/HealthEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/HealthEndpoint.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; +import org.springframework.actuate.health.HealthIndicator; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; -import org.springframework.zero.actuate.health.HealthIndicator; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose application health. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java index 4545b89341..701dd82e35 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/InfoEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/InfoEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose arbitrary application information. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java index 799222f350..508fa69607 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/MetricsEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/MetricsEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.LinkedHashMap; import java.util.Map; +import org.springframework.actuate.metrics.Metric; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; -import org.springframework.zero.actuate.metrics.Metric; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose {@link PublicMetrics}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java similarity index 89% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java index fa6101321a..72836aef62 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/PublicMetrics.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/PublicMetrics.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collection; -import org.springframework.zero.actuate.metrics.Metric; +import org.springframework.actuate.metrics.Metric; /** * Interface to expose specific {@link Metric}s via a {@link MetricsEndpoint}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java similarity index 92% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java index ec9e8092bb..7a10b7684e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/ShutdownEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/ShutdownEndpoint.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collections; import java.util.Map; +import org.springframework.actuate.properties.ManagementServerProperties; import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link ActionEndpoint} to shutdown the {@link ApplicationContext}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java similarity index 84% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java index a471f2eb9c..3fdbc9acbb 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/TraceEndpoint.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/TraceEndpoint.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.List; +import org.springframework.actuate.trace.Trace; +import org.springframework.actuate.trace.TraceRepository; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.util.Assert; -import org.springframework.zero.actuate.trace.Trace; -import org.springframework.zero.actuate.trace.TraceRepository; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link Endpoint} to expose {@link Trace} information. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java index b2f3dab66e..44fcf1f071 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetrics.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/VanillaPublicMetrics.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collection; import java.util.LinkedHashSet; +import org.springframework.actuate.metrics.Metric; +import org.springframework.actuate.metrics.MetricRepository; import org.springframework.util.Assert; -import org.springframework.zero.actuate.metrics.Metric; -import org.springframework.zero.actuate.metrics.MetricRepository; /** * Default implementation of {@link PublicMetrics} that exposes all metrics from the diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java index 1691cf0686..c7984ae2b4 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapter.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint.mvc; +package org.springframework.actuate.endpoint.mvc; import java.util.ArrayList; import java.util.Arrays; @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.actuate.endpoint.Endpoint; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter; @@ -39,7 +40,6 @@ import org.springframework.web.servlet.HandlerAdapter; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import org.springframework.web.servlet.mvc.method.annotation.AbstractMessageConverterMethodProcessor; -import org.springframework.zero.actuate.endpoint.Endpoint; import com.fasterxml.jackson.databind.SerializationFeature; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java rename to spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java index ea2f38a1ad..b37634c994 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMapping.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMapping.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint.mvc; +package org.springframework.actuate.endpoint.mvc; import java.util.ArrayList; import java.util.Collection; @@ -23,6 +23,8 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; +import org.springframework.actuate.endpoint.ActionEndpoint; +import org.springframework.actuate.endpoint.Endpoint; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; @@ -32,8 +34,6 @@ import org.springframework.util.StringUtils; import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.handler.AbstractUrlHandlerMapping; -import org.springframework.zero.actuate.endpoint.ActionEndpoint; -import org.springframework.zero.actuate.endpoint.Endpoint; /** * {@link HandlerMapping} to map {@link Endpoint}s to URLs via {@link Endpoint#getPath()}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java b/spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java similarity index 83% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java rename to spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java index 777af6fe6f..bfcd5a159d 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/fixme/ManagementServerConfiguration.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/fixme/ManagementServerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.fixme; +package org.springframework.actuate.fixme; import java.io.IOException; @@ -24,10 +24,20 @@ import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +import org.springframework.actuate.properties.ManagementServerProperties; +import org.springframework.actuate.web.BasicErrorController; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.HierarchicalBeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ErrorPage; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -36,16 +46,6 @@ import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.web.filter.GenericFilterBean; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.actuate.web.BasicErrorController; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ErrorPage; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * Configuration for creating a new container (e.g. tomcat) for the management endpoints. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java b/spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java rename to spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java index ddfc96aea2..11e85dd672 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/HealthIndicator.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/health/HealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.health; +package org.springframework.actuate.health; /** * Strategy interface used to provide an indication of application health. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java b/spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java rename to spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java index 32369f8be0..968a6249a9 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/health/VanillaHealthIndicator.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/health/VanillaHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.health; +package org.springframework.actuate.health; /** * Default implementation of {@link HealthIndicator} that simply returns "ok". diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java index 59fc685be9..a42d001266 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/CounterService.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/CounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; /** * A service that can be used to increment, decrement and reset a {@link Metric}. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java index bdb9110aa9..973dd0b54f 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultCounterService.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultCounterService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java index 1b47d4d63a..39cb28733d 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/DefaultGaugeService.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/DefaultGaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java index ec22869dc3..c682a2c9a4 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/GaugeService.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/GaugeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; /** * A service that can be used to manage a {@link Metric} as a gauge. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java index 3c11311a4c..7480b47986 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepository.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/InMemoryMetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java similarity index 97% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java index 32e0327fa1..653707da9e 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Measurement.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/Measurement.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java index 9726fb07aa..2250a3f9a1 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/Metric.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/Metric.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java index afc746cb43..291cc13b29 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/metrics/MetricRepository.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/metrics/MetricRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import java.util.Collection; import java.util.Date; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java b/spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java similarity index 90% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java rename to spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java index cc0bd0e0f4..86429bbd01 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/ManagementServerProperties.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/properties/ManagementServerProperties.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.properties; +package org.springframework.actuate.properties; import java.net.InetAddress; import javax.validation.constraints.NotNull; -import org.springframework.zero.context.embedded.properties.ServerProperties; -import org.springframework.zero.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; /** * Properties for the management server (e.g. port and path settings). diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java b/spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java rename to spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java index d2ec43191d..ca866889a6 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/properties/SecurityProperties.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/properties/SecurityProperties.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.actuate.properties; +package org.springframework.actuate.properties; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.security.config.annotation.web.configurers.SessionCreationPolicy; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * Properties for the security aspects of an application. diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java b/spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java similarity index 94% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java rename to spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java index 57b45583cd..ecf10b7bd2 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthenticationAuditListener.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/security/AuthenticationAuditListener.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.zero.actuate.security; +package org.springframework.actuate.security; import java.util.HashMap; import java.util.Map; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; import org.springframework.security.authentication.event.AbstractAuthenticationEvent; import org.springframework.security.authentication.event.AbstractAuthenticationFailureEvent; import org.springframework.security.web.authentication.switchuser.AuthenticationSwitchUserEvent; -import org.springframework.zero.actuate.audit.AuditEvent; -import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent; /** * {@link ApplicationListener} expose Spring Security {@link AbstractAuthenticationEvent diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java b/spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java similarity index 93% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java rename to spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java index 5723a5e5df..f0df73c7bb 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/security/AuthorizationAuditListener.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/security/AuthorizationAuditListener.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.zero.actuate.security; +package org.springframework.actuate.security; import java.util.HashMap; import java.util.Map; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.listener.AuditApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.ApplicationListener; import org.springframework.security.access.event.AbstractAuthorizationEvent; import org.springframework.security.access.event.AuthenticationCredentialsNotFoundEvent; import org.springframework.security.access.event.AuthorizationFailureEvent; -import org.springframework.zero.actuate.audit.AuditEvent; -import org.springframework.zero.actuate.audit.listener.AuditApplicationEvent; /** * {@link ApplicationListener} expose Spring Security {@link AbstractAuthorizationEvent diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java index 01067ea38d..16b3aa61c5 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/InMemoryTraceRepository.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/trace/InMemoryTraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.trace; +package org.springframework.actuate.trace; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java index 090aa72983..bfa9951e9c 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/Trace.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/trace/Trace.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.trace; +package org.springframework.actuate.trace; import java.util.Date; import java.util.Map; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java index 3eac458ce9..eb93239c77 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/TraceRepository.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/trace/TraceRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.trace; +package org.springframework.actuate.trace; import java.util.List; import java.util.Map; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java b/spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java similarity index 98% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java rename to spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java index 19e87b8e6d..d3543cefa5 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/trace/WebRequestTraceFilter.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/trace/WebRequestTraceFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.trace; +package org.springframework.actuate.trace; import java.io.IOException; import java.util.Collections; diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java b/spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java similarity index 96% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java rename to spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java index a88d145daa..5929cae533 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/BasicErrorController.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/web/BasicErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.web; +package org.springframework.actuate.web; import java.io.PrintWriter; import java.io.StringWriter; @@ -28,12 +28,12 @@ import javax.servlet.http.HttpServletRequest; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.ModelAndView; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; /** * Basic global error {@link Controller}, rendering servlet container error codes and diff --git a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java b/spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java similarity index 95% rename from spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java rename to spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java index 372fc25ee9..f9952eb41a 100644 --- a/spring-actuator/src/main/java/org/springframework/zero/actuate/web/ErrorController.java +++ b/spring-actuator/src/main/java/org/springframework/actuate/web/ErrorController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.web; +package org.springframework.actuate.web; import org.springframework.stereotype.Controller; diff --git a/spring-actuator/src/main/resources/META-INF/spring.factories b/spring-actuator/src/main/resources/META-INF/spring.factories index 0448f3aa7b..0c8c1c617e 100644 --- a/spring-actuator/src/main/resources/META-INF/spring.factories +++ b/spring-actuator/src/main/resources/META-INF/spring.factories @@ -1,11 +1,11 @@ -org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ -org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ -org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration +org.springframework.autoconfigure.EnableAutoConfiguration=\ +org.springframework.actuate.autoconfigure.AuditAutoConfiguration,\ +org.springframework.actuate.autoconfigure.EndpointAutoConfiguration,\ +org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration,\ +org.springframework.actuate.autoconfigure.ErrorMvcAutoConfiguration,\ +org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration,\ +org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration,\ +org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration,\ +org.springframework.actuate.autoconfigure.SecurityAutoConfiguration,\ +org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration,\ +org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java b/spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java similarity index 93% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java index 3016173ed9..114adff90e 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/AuditEventTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/audit/AuditEventTests.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit; +package org.springframework.actuate.audit; import java.util.Collections; import org.junit.Test; -import org.springframework.zero.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.AuditEvent; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java index 9cbe0b8963..f35d85aee1 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/InMemoryAuditEventRepositoryTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/audit/InMemoryAuditEventRepositoryTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit; +package org.springframework.actuate.audit; import java.util.Date; import org.junit.Test; -import org.springframework.zero.actuate.audit.AuditEvent; -import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.InMemoryAuditEventRepository; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java index 8ea87c3337..5ffdba0650 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/audit/listener/AuditListenerTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/audit/listener/AuditListenerTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.actuate.audit.listener; +package org.springframework.actuate.audit.listener; import java.util.Collections; import org.junit.Test; -import org.springframework.zero.actuate.audit.AuditEvent; -import org.springframework.zero.actuate.audit.AuditEventRepository; +import org.springframework.actuate.audit.AuditEvent; +import org.springframework.actuate.audit.AuditEventRepository; +import org.springframework.actuate.audit.listener.AuditApplicationEvent; +import org.springframework.actuate.audit.listener.AuditListener; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java similarity index 83% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java index e5b3df9e67..9718dc805b 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/AuditAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/AuditAutoConfigurationTests.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Test; +import org.springframework.actuate.audit.AuditEventRepository; +import org.springframework.actuate.audit.InMemoryAuditEventRepository; +import org.springframework.actuate.autoconfigure.AuditAutoConfiguration; +import org.springframework.actuate.security.AuthenticationAuditListener; +import org.springframework.actuate.security.AuthorizationAuditListener; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.audit.AuditEventRepository; -import org.springframework.zero.actuate.audit.InMemoryAuditEventRepository; -import org.springframework.zero.actuate.autoconfigure.AuditAutoConfiguration; -import org.springframework.zero.actuate.security.AuthenticationAuditListener; -import org.springframework.zero.actuate.security.AuthorizationAuditListener; import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java index b78a7b9781..debfb531fc 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointAutoConfigurationTests.java @@ -14,20 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Before; import org.junit.Test; +import org.springframework.actuate.autoconfigure.EndpointAutoConfiguration; +import org.springframework.actuate.endpoint.BeansEndpoint; +import org.springframework.actuate.endpoint.DumpEndpoint; +import org.springframework.actuate.endpoint.EnvironmentEndpoint; +import org.springframework.actuate.endpoint.HealthEndpoint; +import org.springframework.actuate.endpoint.InfoEndpoint; +import org.springframework.actuate.endpoint.MetricsEndpoint; +import org.springframework.actuate.endpoint.ShutdownEndpoint; +import org.springframework.actuate.endpoint.TraceEndpoint; +import org.springframework.bootstrap.TestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.TestUtils; -import org.springframework.zero.actuate.endpoint.BeansEndpoint; -import org.springframework.zero.actuate.endpoint.DumpEndpoint; -import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint; -import org.springframework.zero.actuate.endpoint.HealthEndpoint; -import org.springframework.zero.actuate.endpoint.InfoEndpoint; -import org.springframework.zero.actuate.endpoint.MetricsEndpoint; -import org.springframework.zero.actuate.endpoint.ShutdownEndpoint; -import org.springframework.zero.actuate.endpoint.TraceEndpoint; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index 4085fe9479..66d3862a7f 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import java.io.FileNotFoundException; import java.net.SocketException; @@ -23,6 +23,17 @@ import java.nio.charset.Charset; import org.junit.After; import org.junit.Test; +import org.springframework.actuate.autoconfigure.EndpointWebMvcAutoConfiguration; +import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.actuate.endpoint.AbstractEndpoint; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.actuate.properties.ManagementServerProperties; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; @@ -33,15 +44,6 @@ import org.springframework.stereotype.Controller; import org.springframework.util.StreamUtils; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import org.springframework.zero.TestUtils; -import org.springframework.zero.actuate.endpoint.AbstractEndpoint; -import org.springframework.zero.actuate.endpoint.Endpoint; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration; -import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java similarity index 90% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java index ab5e6bb75d..65893ef8e9 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Test; +import org.springframework.actuate.autoconfigure.ManagementServerPropertiesAutoConfiguration; +import org.springframework.actuate.properties.ManagementServerProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.properties.ManagementServerProperties; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java similarity index 91% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java index e29e8cd340..cec7a2cd99 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricFilterAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import javax.servlet.Filter; import javax.servlet.FilterChain; @@ -22,14 +22,14 @@ import javax.servlet.FilterChain; import org.junit.Test; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; +import org.springframework.actuate.autoconfigure.MetricFilterAutoConfiguration; +import org.springframework.actuate.metrics.CounterService; +import org.springframework.actuate.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; -import org.springframework.zero.actuate.autoconfigure.MetricFilterAutoConfiguration; -import org.springframework.zero.actuate.metrics.CounterService; -import org.springframework.zero.actuate.metrics.GaugeService; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java similarity index 83% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java index b5c2cdb618..672d4a69e9 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/MetricRepositoryAutoConfigurationTests.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Test; +import org.springframework.actuate.autoconfigure.MetricRepositoryAutoConfiguration; +import org.springframework.actuate.metrics.CounterService; +import org.springframework.actuate.metrics.DefaultCounterService; +import org.springframework.actuate.metrics.DefaultGaugeService; +import org.springframework.actuate.metrics.GaugeService; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.autoconfigure.MetricRepositoryAutoConfiguration; -import org.springframework.zero.actuate.metrics.CounterService; -import org.springframework.zero.actuate.metrics.DefaultCounterService; -import org.springframework.zero.actuate.metrics.DefaultGaugeService; -import org.springframework.zero.actuate.metrics.GaugeService; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java similarity index 90% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java index 12ee2232a0..1a82a5d456 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/SecurityAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/SecurityAutoConfigurationTests.java @@ -14,9 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Test; +import org.springframework.actuate.autoconfigure.EndpointAutoConfiguration; +import org.springframework.actuate.autoconfigure.SecurityAutoConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; @@ -25,9 +28,6 @@ import org.springframework.security.authentication.TestingAuthenticationToken; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.zero.actuate.autoconfigure.EndpointAutoConfiguration; -import org.springframework.zero.actuate.autoconfigure.SecurityAutoConfiguration; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java index a35ae93c4c..fb4f41f027 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceRepositoryAutoConfigurationTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Test; +import org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.TraceRepository; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration; -import org.springframework.zero.actuate.trace.InMemoryTraceRepository; -import org.springframework.zero.actuate.trace.TraceRepository; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java similarity index 76% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java rename to spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java index 1272bf2302..6dca0c1a76 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/autoconfigure/TraceWebFilterAutoConfigurationTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.autoconfigure; +package org.springframework.actuate.autoconfigure; import org.junit.Test; +import org.springframework.actuate.autoconfigure.TraceRepositoryAutoConfiguration; +import org.springframework.actuate.autoconfigure.TraceWebFilterAutoConfiguration; +import org.springframework.actuate.trace.WebRequestTraceFilter; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.actuate.autoconfigure.TraceRepositoryAutoConfiguration; -import org.springframework.zero.actuate.autoconfigure.TraceWebFilterAutoConfiguration; -import org.springframework.zero.actuate.trace.WebRequestTraceFilter; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java similarity index 95% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java index 9c17c70e3e..080b176354 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/AbstractEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/AbstractEndpointTests.java @@ -14,17 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collections; import org.junit.Before; import org.junit.Test; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.bootstrap.TestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; import org.springframework.http.MediaType; -import org.springframework.zero.TestUtils; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java index e921cc3c0a..deda3e4afe 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/BeansEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/BeansEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import org.junit.Test; +import org.springframework.actuate.endpoint.BeansEndpoint; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.MediaType; -import org.springframework.zero.actuate.endpoint.BeansEndpoint; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.containsString; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java index a48fe34f97..481ab9fc7e 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/DumpEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/DumpEndpointTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.lang.management.ThreadInfo; import java.util.List; import org.junit.Test; +import org.springframework.actuate.endpoint.DumpEndpoint; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.DumpEndpoint; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java index bd88a88a86..f4cf456cbb 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/EnvironmentEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/EnvironmentEndpointTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import org.junit.Test; +import org.springframework.actuate.endpoint.EnvironmentEndpoint; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.EnvironmentEndpoint; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.greaterThan; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java similarity index 85% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java index cc7f70b7c2..42c9d655a6 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/HealthEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/HealthEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import org.junit.Test; +import org.springframework.actuate.endpoint.HealthEndpoint; +import org.springframework.actuate.health.HealthIndicator; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.HealthEndpoint; -import org.springframework.zero.actuate.health.HealthIndicator; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java index eb6a131933..955331a031 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/InfoEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/InfoEndpointTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collections; import org.junit.Test; +import org.springframework.actuate.endpoint.InfoEndpoint; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.InfoEndpoint; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java similarity index 84% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java index a9c5aa4f4c..aae788d734 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/MetricsEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/MetricsEndpointTests.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collection; import java.util.Collections; import org.junit.Test; +import org.springframework.actuate.endpoint.MetricsEndpoint; +import org.springframework.actuate.endpoint.PublicMetrics; +import org.springframework.actuate.metrics.Metric; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.MetricsEndpoint; -import org.springframework.zero.actuate.endpoint.PublicMetrics; -import org.springframework.zero.actuate.metrics.Metric; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java index e97d2285bd..babc5507cd 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/ShutdownEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/ShutdownEndpointTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import org.junit.Test; +import org.springframework.actuate.endpoint.ShutdownEndpoint; +import org.springframework.actuate.properties.ManagementServerProperties; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.ShutdownEndpoint; -import org.springframework.zero.actuate.properties.ManagementServerProperties; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.startsWith; import static org.junit.Assert.assertFalse; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java similarity index 80% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java index e8691659c2..092cbb5b1a 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/TraceEndpointTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/TraceEndpointTests.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Collections; import org.junit.Test; +import org.springframework.actuate.endpoint.TraceEndpoint; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.Trace; +import org.springframework.actuate.trace.TraceRepository; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.actuate.endpoint.TraceEndpoint; -import org.springframework.zero.actuate.trace.InMemoryTraceRepository; -import org.springframework.zero.actuate.trace.Trace; -import org.springframework.zero.actuate.trace.TraceRepository; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java similarity index 85% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java index 982b41d4a8..dcada6d2ca 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/VanillaPublicMetricsTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/VanillaPublicMetricsTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint; +package org.springframework.actuate.endpoint; import java.util.Date; import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.zero.actuate.endpoint.VanillaPublicMetrics; -import org.springframework.zero.actuate.metrics.InMemoryMetricRepository; -import org.springframework.zero.actuate.metrics.Metric; +import org.springframework.actuate.endpoint.VanillaPublicMetrics; +import org.springframework.actuate.metrics.InMemoryMetricRepository; +import org.springframework.actuate.metrics.Metric; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java similarity index 86% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java index 3b044d8c41..4d0e3d3736 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerAdapterTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint.mvc; +package org.springframework.actuate.endpoint.mvc; import org.junit.Test; -import org.springframework.zero.actuate.endpoint.Endpoint; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerAdapter; +import org.springframework.actuate.endpoint.Endpoint; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerAdapter; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java similarity index 93% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java index d587765a95..7f2012467e 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/endpoint/mvc/EndpointHandlerMappingTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/endpoint/mvc/EndpointHandlerMappingTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.actuate.endpoint.mvc; +package org.springframework.actuate.endpoint.mvc; import java.util.Arrays; import org.junit.Test; +import org.springframework.actuate.endpoint.AbstractEndpoint; +import org.springframework.actuate.endpoint.ActionEndpoint; +import org.springframework.actuate.endpoint.mvc.EndpointHandlerMapping; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.zero.actuate.endpoint.AbstractEndpoint; -import org.springframework.zero.actuate.endpoint.ActionEndpoint; -import org.springframework.zero.actuate.endpoint.mvc.EndpointHandlerMapping; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java b/spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java similarity index 96% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java index d0a182aaa0..069572ffae 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/fixme/ErrorConfigurationTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/fixme/ErrorConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.actuate.fixme; +package org.springframework.actuate.fixme; /** * @author Dave Syer diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java b/spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java index b1afb33079..bb02806104 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/health/VanillaHealthIndicatorTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/health/VanillaHealthIndicatorTests.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.actuate.health; +package org.springframework.actuate.health; import org.junit.Test; -import org.springframework.zero.actuate.health.VanillaHealthIndicator; +import org.springframework.actuate.health.VanillaHealthIndicator; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java b/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java index 19bfaffca0..096cd82772 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultCounterServiceTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultCounterServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.zero.actuate.metrics.DefaultCounterService; +import org.springframework.actuate.metrics.DefaultCounterService; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java b/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java index 35d09982e6..11a83466ba 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/DefaultGaugeServiceTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/metrics/DefaultGaugeServiceTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import org.junit.Ignore; import org.junit.Test; -import org.springframework.zero.actuate.metrics.DefaultGaugeService; +import org.springframework.actuate.metrics.DefaultGaugeService; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java index 89cd71d344..bea311bea4 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/metrics/InMemoryMetricRepositoryTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/metrics/InMemoryMetricRepositoryTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.metrics; +package org.springframework.actuate.metrics; import org.junit.Ignore; import org.junit.Test; +import org.springframework.actuate.metrics.InMemoryMetricRepository; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java b/spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java similarity index 91% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java index 083b4464fd..8f4bd1ba5f 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/properties/SecurityPropertiesTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/properties/SecurityPropertiesTests.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.actuate.properties; +package org.springframework.actuate.properties; import java.util.Collections; import org.junit.Test; +import org.springframework.actuate.properties.SecurityProperties; import org.springframework.beans.MutablePropertyValues; +import org.springframework.bootstrap.bind.RelaxedDataBinder; import org.springframework.core.convert.support.DefaultConversionService; -import org.springframework.zero.actuate.properties.SecurityProperties; -import org.springframework.zero.bind.RelaxedDataBinder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java index 01828be482..cf453a1383 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthenticationAuditListenerTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/security/AuthenticationAuditListenerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.security; +package org.springframework.actuate.security; import org.junit.Ignore; import org.junit.Test; -import org.springframework.zero.actuate.security.AuthenticationAuditListener; +import org.springframework.actuate.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java b/spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java similarity index 87% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java index 227d183221..5de62f12e5 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/security/AuthorizationAuditListenerTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/security/AuthorizationAuditListenerTests.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.actuate.security; +package org.springframework.actuate.security; import org.junit.Ignore; import org.junit.Test; -import org.springframework.zero.actuate.security.AuthenticationAuditListener; +import org.springframework.actuate.security.AuthenticationAuditListener; import static org.junit.Assert.fail; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java b/spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java similarity index 89% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java index 67cf674a34..1b134e17fa 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/InMemoryTraceRepositoryTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/trace/InMemoryTraceRepositoryTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.trace; +package org.springframework.actuate.trace; import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.zero.actuate.trace.InMemoryTraceRepository; -import org.springframework.zero.actuate.trace.Trace; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.Trace; import static org.junit.Assert.assertEquals; diff --git a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java b/spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java similarity index 88% rename from spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java rename to spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java index 644c354c2c..94abd500f8 100644 --- a/spring-actuator/src/test/java/org/springframework/zero/actuate/trace/WebRequestTraceFilterTests.java +++ b/spring-actuator/src/test/java/org/springframework/actuate/trace/WebRequestTraceFilterTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.actuate.trace; +package org.springframework.actuate.trace; import java.util.Map; import org.junit.Test; +import org.springframework.actuate.trace.InMemoryTraceRepository; +import org.springframework.actuate.trace.WebRequestTraceFilter; import org.springframework.mock.web.MockHttpServletRequest; -import org.springframework.zero.actuate.trace.InMemoryTraceRepository; -import org.springframework.zero.actuate.trace.WebRequestTraceFilter; import static org.junit.Assert.assertEquals; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java similarity index 99% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java index 6655d71525..6bb5e6c25b 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationSorter.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationSorter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java index d3cc9d2464..703237db73 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigurationUtils.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigurationUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java similarity index 95% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java index bbb3737002..41262f74bc 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/AutoConfigureAfter.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/AutoConfigureAfter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java similarity index 99% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java index 5dcbe71f22..6f4ce56f6b 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/ComponentScanDetector.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/ComponentScanDetector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java similarity index 85% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java index 7c98ac9016..ed0713e0d7 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -22,15 +22,15 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Conditional; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.core.io.support.SpringFactoriesLoader; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * Enable auto-configuration of the Spring Application Context, attempting to guess and diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java similarity index 98% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java index 19ba4860ab..2c8965038d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/EnableAutoConfigurationImportSelector.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/EnableAutoConfigurationImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.io.IOException; import java.util.ArrayList; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java index 5752c7f528..0861495519 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/MessageSourceAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.MessageSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.ResourceBundleMessageSource; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link MessageSource}. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java index ba8f356fca..130ea02201 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/PropertyPlaceholderAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/PropertyPlaceholderAutoConfiguration.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java similarity index 77% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java index 23e4c7a9b8..caf7921571 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchAutoConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.batch.core.launch.JobLauncher; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.ExitCodeGenerator; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.ExitCodeGenerator; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Batch. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java index 0f0fb24a48..2f1a89247c 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/BatchDatabaseInitializer.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/BatchDatabaseInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import javax.annotation.PostConstruct; import javax.sql.DataSource; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java similarity index 95% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java index c7bb4468c2..45de40a432 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionEvent.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import org.springframework.batch.core.JobExecution; import org.springframework.context.ApplicationEvent; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java similarity index 93% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java index cdab3f50ef..a34c38524e 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGenerator.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGenerator.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import java.util.ArrayList; import java.util.List; import org.springframework.batch.core.JobExecution; +import org.springframework.bootstrap.ExitCodeGenerator; import org.springframework.context.ApplicationListener; -import org.springframework.zero.ExitCodeGenerator; /** * {@link ExitCodeGenerator} for {@link JobExecutionEvent}s. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java index d022441bcf..6ebdaa48b5 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/batch/JobLauncherCommandLineRunner.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/batch/JobLauncherCommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import java.util.Arrays; import java.util.Collection; @@ -30,11 +30,11 @@ import org.springframework.batch.core.converter.DefaultJobParametersConverter; import org.springframework.batch.core.converter.JobParametersConverter; import org.springframework.batch.core.launch.JobLauncher; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.CommandLineRunner; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; -import org.springframework.zero.CommandLineRunner; /** * {@link CommandLineRunner} to {@link JobLauncher launch} Spring Batch jobs. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java similarity index 83% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java index 6993c5c6a1..38bcd8698a 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for Spring Data's JPA Repositories. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java index ab10117d9f..5645016437 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigureRegistrar.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; import java.util.Collection; import java.util.List; +import org.springframework.autoconfigure.AutoConfigurationUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; @@ -38,7 +39,6 @@ import org.springframework.data.repository.config.RepositoryBeanNameGenerator; import org.springframework.data.repository.config.RepositoryConfiguration; import org.springframework.data.repository.config.RepositoryConfigurationExtension; import org.springframework.util.Assert; -import org.springframework.zero.autoconfigure.AutoConfigurationUtils; /** * {@link ImportBeanDefinitionRegistrar} used to auto-configure Spring Data JPA diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java similarity index 98% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java index 2753027317..bbe06ebb05 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/AbstractDataSourceConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/AbstractDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Value; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java similarity index 97% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java index f43b25fbc9..c2f3f480f2 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.sql.SQLException; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java index bfb97f2ac5..0d6955af0d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.util.ArrayList; import java.util.Arrays; @@ -25,9 +25,13 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionLogUtils; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Condition; @@ -46,10 +50,6 @@ import org.springframework.jdbc.datasource.init.DatabasePopulatorUtils; import org.springframework.jdbc.datasource.init.ResourceDatabasePopulator; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionLogUtils; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link DataSource}. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java similarity index 83% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java index ef0c1b2045..3d45dad44d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.datasource.DataSourceTransactionManager; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java index 1882c7eb36..6087ebc181 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.util.LinkedHashMap; import java.util.Map; @@ -22,13 +22,13 @@ import java.util.Map; import javax.annotation.PreDestroy; import javax.sql.DataSource; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.util.ClassUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; /** * {@link EnableAutoConfiguration Auto-configuration} for embedded databases. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java similarity index 96% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java index dc58696595..f666315dfe 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.annotation.PreDestroy; import javax.sql.DataSource; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/main/Spring.java similarity index 94% rename from spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/main/Spring.java index c43563b796..554e7a985c 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/main/Spring.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/main/Spring.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.main; +package org.springframework.autoconfigure.main; import java.util.ArrayList; import java.util.List; import org.apache.commons.logging.LogFactory; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.SpringVersion; import org.springframework.util.ClassUtils; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; /** * Very simple main class that can be used to launch an application from sources (class, diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java similarity index 94% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java index 6bbce4d877..f01a4d105f 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfiguration.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa; +package org.springframework.autoconfigure.orm.jpa; import java.util.LinkedHashMap; import java.util.Map; import org.hibernate.ejb.HibernateEntityManager; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; @@ -30,8 +32,6 @@ import org.springframework.orm.jpa.vendor.Database; import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.util.StringUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; /** * {@link EnableAutoConfiguration Auto-configuration} for Hibernate JPA. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaAutoConfiguration.java similarity index 90% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaAutoConfiguration.java index e52feac6b9..c11f9b3994 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/orm/jpa/JpaAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/orm/jpa/JpaAutoConfiguration.java @@ -14,19 +14,24 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa; +package org.springframework.autoconfigure.orm.jpa; import java.util.List; import javax.persistence.EntityManager; import javax.sql.DataSource; +import org.springframework.autoconfigure.AutoConfigurationUtils; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; import org.springframework.context.annotation.Bean; import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaVendorAdapter; @@ -34,11 +39,6 @@ import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.util.Assert; -import org.springframework.zero.autoconfigure.AutoConfigurationUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; /** * Base {@link EnableAutoConfiguration Auto-configuration} for JPA. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java similarity index 90% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java index f5d3c71b70..1b083d6106 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.thymeleaf; +package org.springframework.autoconfigure.thymeleaf; import java.io.IOException; import java.io.InputStream; @@ -25,18 +25,18 @@ import javax.servlet.Servlet; import nz.net.ultraq.web.thymeleaf.LayoutDialect; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingClass; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.condition.ConditionalOnMissingClass; import org.thymeleaf.TemplateProcessingParameters; import org.thymeleaf.resourceresolver.IResourceResolver; import org.thymeleaf.spring3.SpringTemplateEngine; diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java similarity index 78% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java index f392c99eb0..119adecd57 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfiguration.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.Servlet; import org.apache.catalina.startup.Tomcat; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.util.Loader; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.web.servlet.DispatcherServlet; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ServletContextInitializer; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * {@link EnableAutoConfiguration Auto-configuration} for an embedded servlet containers. diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java similarity index 81% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java index 618ce17e10..20d66acca0 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/MultipartAutoConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.MultipartConfigElement; import javax.servlet.Servlet; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.multipart.support.StandardServletMultipartResolver; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.embedded.EmbeddedWebApplicationContext; /** * {@link EnableAutoConfiguration Auto-configuration} for multi-part uploads. Adds a diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java similarity index 76% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java index cbdc3f4d92..8d24953d2d 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfiguration.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.BeansException; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.util.Assert; import org.springframework.util.StringUtils; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.properties.ServerProperties; -import org.springframework.zero.context.properties.EnableConfigurationProperties; /** * {@link EnableAutoConfiguration Auto-configuration} that configures the @@ -44,7 +44,7 @@ public class ServerPropertiesAutoConfiguration implements ApplicationContextAwar private ApplicationContext applicationContext; - @Bean(name = "org.springframework.zero.properties.ServerProperties") + @Bean(name = "org.springframework.bootstrap.context.embedded.properties.ServerProperties") @ConditionalOnMissingBean public ServerProperties serverProperties() { return new ServerProperties(); diff --git a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java similarity index 92% rename from spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java rename to spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java index 7ab425327d..bb36634411 100644 --- a/spring-autoconfigure/src/main/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfiguration.java +++ b/spring-autoconfigure/src/main/java/org/springframework/autoconfigure/web/WebMvcAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import java.util.Arrays; import java.util.Collection; @@ -22,9 +22,14 @@ import java.util.Collections; import javax.servlet.Servlet; +import org.springframework.autoconfigure.AutoConfigureAfter; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.condition.ConditionalOnBean; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.Ordered; @@ -48,11 +53,6 @@ import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping; import org.springframework.web.servlet.resource.ResourceHttpRequestHandler; import org.springframework.web.servlet.view.BeanNameViewResolver; import org.springframework.web.servlet.view.ContentNegotiatingViewResolver; -import org.springframework.zero.autoconfigure.AutoConfigureAfter; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link EnableWebMvc Web MVC}. @@ -121,7 +121,7 @@ public class WebMvcAutoConfiguration { @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { // FIXME exposing the root classpath is a security risk - // eg http://localhost:8080/org/springframework/zero/Banner.class + // eg http://localhost:8080/org/springframework/bootstrap/Banner.class registry.addResourceHandler("/resources/**").addResourceLocations("/") .addResourceLocations("classpath:/META-INF/resources/") .addResourceLocations("classpath:/resources/") diff --git a/spring-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-autoconfigure/src/main/resources/META-INF/spring.factories index 5e294a113e..8c5efd0348 100644 --- a/spring-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,14 +1,14 @@ # Auto Configure -org.springframework.zero.autoconfigure.EnableAutoConfiguration=\ -org.springframework.zero.autoconfigure.MessageSourceAutoConfiguration,\ -org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration,\ -org.springframework.zero.autoconfigure.batch.BatchAutoConfiguration,\ -org.springframework.zero.autoconfigure.data.JpaRepositoriesAutoConfiguration,\ -org.springframework.zero.autoconfigure.jdbc.DataSourceAutoConfiguration,\ -org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\ -org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\ -org.springframework.zero.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.ServerPropertiesAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.MultipartAutoConfiguration,\ -org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration +org.springframework.autoconfigure.EnableAutoConfiguration=\ +org.springframework.autoconfigure.MessageSourceAutoConfiguration,\ +org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration,\ +org.springframework.autoconfigure.batch.BatchAutoConfiguration,\ +org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration,\ +org.springframework.autoconfigure.jdbc.DataSourceAutoConfiguration,\ +org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration,\ +org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\ +org.springframework.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\ +org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\ +org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration,\ +org.springframework.autoconfigure.web.MultipartAutoConfiguration,\ +org.springframework.autoconfigure.web.WebMvcAutoConfiguration diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java similarity index 82% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java index a0bf3f333f..5b91abf472 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AdhocTestSuite.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AdhocTestSuite.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import org.junit.Ignore; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; -import org.springframework.zero.main.SimpleMainTests; +import org.springframework.autoconfigure.main.SimpleMainTests; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactoryTests; /** * A test suite for probing weird ordering problems in the tests. diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java index 2af5c7e884..515e64ccde 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/AutoConfigurationSorterTest.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/AutoConfigurationSorterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.util.Arrays; import java.util.List; @@ -23,6 +23,8 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.autoconfigure.AutoConfigurationSorter; +import org.springframework.autoconfigure.AutoConfigureAfter; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; import org.springframework.core.io.DefaultResourceLoader; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java similarity index 88% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java index d906288817..d9080225e6 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/ComponentScanDetectorConfiguration.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/ComponentScanDetectorConfiguration.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; +import org.springframework.autoconfigure.ComponentScanDetector; import org.springframework.context.annotation.Import; -import org.springframework.zero.autoconfigure.ComponentScanDetector; /** * Simple configuration to import {@link ComponentScanDetector} for tests. diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java index a3518be1cd..954cf8a8c4 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/MessageSourceAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/MessageSourceAutoConfigurationTests.java @@ -14,13 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import java.util.HashMap; import java.util.Locale; import java.util.Map; import org.junit.Test; +import org.springframework.autoconfigure.MessageSourceAutoConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java similarity index 85% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java index dc99ba8a6c..f634acb614 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/SpringJUnitTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/SpringJUnitTests.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure; +package org.springframework.autoconfigure; import org.junit.Test; import org.junit.runner.RunWith; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.SpringJUnitTests.TestConfiguration; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import org.springframework.zero.autoconfigure.SpringJUnitTests.TestConfiguration; -import org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java index e1e2d2e9e0..a05424ba4f 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/BatchAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/BatchAutoConfigurationTests.java @@ -14,12 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import java.util.Collection; import java.util.Collections; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.batch.BatchAutoConfiguration; +import org.springframework.autoconfigure.batch.JobLauncherCommandLineRunner; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.Job; import org.springframework.batch.core.JobExecution; @@ -33,8 +37,6 @@ import org.springframework.batch.core.repository.JobRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java index c30dea1025..1433f03cde 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/batch/JobExecutionExitCodeGeneratorTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.batch; +package org.springframework.autoconfigure.batch; import org.junit.Test; +import org.springframework.autoconfigure.batch.JobExecutionEvent; +import org.springframework.autoconfigure.batch.JobExecutionExitCodeGenerator; import org.springframework.batch.core.BatchStatus; import org.springframework.batch.core.JobExecution; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java similarity index 77% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java index 6b8a996259..3aa7f88c50 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaRepositoriesAutoConfigurationTests.java @@ -14,21 +14,22 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; import javax.persistence.EntityManagerFactory; import org.junit.Test; +import org.springframework.autoconfigure.ComponentScanDetectorConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration; +import org.springframework.autoconfigure.data.test.City; +import org.springframework.autoconfigure.data.test.CityRepository; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.transaction.PlatformTransactionManager; -import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.data.test.City; -import org.springframework.zero.autoconfigure.data.test.CityRepository; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java similarity index 80% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java index 5678f3d1dd..58656ee336 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/JpaWebAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/JpaWebAutoConfigurationTests.java @@ -14,20 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data; +package org.springframework.autoconfigure.data; import org.junit.Ignore; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.data.JpaRepositoriesAutoConfiguration; +import org.springframework.autoconfigure.data.test.City; +import org.springframework.autoconfigure.data.test.CityRepository; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.data.repository.support.DomainClassConverter; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.data.test.City; -import org.springframework.zero.autoconfigure.data.test.CityRepository; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java similarity index 96% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java index 9ce6daa1e0..1bab8dd0a3 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/City.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data.test; +package org.springframework.autoconfigure.data.test; import java.io.Serializable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java index 7b7ff2d61a..7879b2c96f 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/data/test/CityRepository.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/data/test/CityRepository.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.data.test; +package org.springframework.autoconfigure.data.test; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java index 77fe2c1af2..4e25fefb33 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/BasicDataSourceConfigurationTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.jdbc.BasicDataSourceConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java similarity index 95% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java index 95fedfcec4..0625fd40e9 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.util.HashMap; import java.util.Map; @@ -23,6 +23,8 @@ import javax.sql.DataSource; import org.apache.commons.dbcp.BasicDataSource; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.jdbc.DataSourceAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -31,7 +33,6 @@ import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations; import org.springframework.util.ClassUtils; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java similarity index 89% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java index 7565bbc2a1..59628667be 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/DataSourceTransactionManagerAutoConfigurationTests.java @@ -14,11 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.jdbc.datasource.DataSourceTransactionManager; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java index b64dd093b8..d407542eeb 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/EmbeddedDatabaseConfigurationTests.java @@ -14,11 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java similarity index 90% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java index 95a3863fa9..604f14a029 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/jdbc/TomcatDataSourceConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.jdbc; +package org.springframework.autoconfigure.jdbc; import java.lang.reflect.Field; import java.util.HashMap; @@ -24,10 +24,12 @@ import javax.sql.DataSource; import org.junit.After; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.jdbc.TomcatDataSourceConfiguration; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.util.ReflectionUtils; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/main/SimpleMainTests.java similarity index 91% rename from spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/main/SimpleMainTests.java index 3f6e03ed5e..2d0adf6225 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/main/SimpleMainTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/main/SimpleMainTests.java @@ -14,10 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.main; +package org.springframework.autoconfigure.main; import org.junit.After; import org.junit.Test; +import org.springframework.autoconfigure.main.Spring; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.util.ClassUtils; @@ -57,7 +58,7 @@ public class SimpleMainTests { @Test public void xmlContext() throws Exception { Spring.main(new String[] { Spring.class.getName(), - "org/springframework/zero/sample-beans.xml" }); + "org/springframework/bootstrap/sample-beans.xml" }); this.context = Spring.getApplicationContext(); assertNotNull(this.context); } diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java similarity index 81% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java index a27213ff48..f3a0ac4b72 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/HibernateJpaAutoConfigurationTests.java @@ -14,19 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa; +package org.springframework.autoconfigure.orm.jpa; import javax.sql.DataSource; import org.junit.Test; +import org.springframework.autoconfigure.ComponentScanDetectorConfiguration; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; +import org.springframework.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; +import org.springframework.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration; +import org.springframework.autoconfigure.orm.jpa.test.City; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.orm.jpa.JpaTransactionManager; -import org.springframework.zero.autoconfigure.ComponentScanDetectorConfiguration; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration; -import org.springframework.zero.autoconfigure.jdbc.EmbeddedDatabaseConfiguration; -import org.springframework.zero.autoconfigure.orm.jpa.test.City; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java similarity index 96% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java index c630aff548..0b81211501 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/orm/jpa/test/City.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/orm/jpa/test/City.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.orm.jpa.test; +package org.springframework.autoconfigure.orm.jpa.test; import java.io.Serializable; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java similarity index 94% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java index a5f9d355bd..5998be72c9 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/thymeleaf/ThymeleafAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.thymeleaf; +package org.springframework.autoconfigure.thymeleaf; import java.util.Collections; import java.util.HashMap; @@ -22,6 +22,8 @@ import java.util.Locale; import java.util.Map; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.thymeleaf.ThymeleafAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.mock.web.MockHttpServletRequest; @@ -29,7 +31,6 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; import org.springframework.web.servlet.support.RequestContext; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; import org.thymeleaf.TemplateEngine; import org.thymeleaf.context.Context; import org.thymeleaf.spring3.view.ThymeleafView; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java similarity index 84% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java index 61a8208c62..f1f31df840 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/EmbeddedServletContainerAutoConfigurationTests.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.Servlet; import org.junit.Test; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.bootstrap.context.condition.ConditionalOnExpression; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Component; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.context.condition.ConditionalOnExpression; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.MockEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java similarity index 92% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java index 624f1f78a2..d36e25cee6 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/MultipartAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/MultipartAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import javax.servlet.MultipartConfigElement; @@ -22,6 +22,11 @@ import org.junit.After; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.autoconfigure.web.MultipartAutoConfiguration; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.stereotype.Controller; @@ -32,11 +37,6 @@ import org.springframework.web.multipart.MultipartResolver; import org.springframework.web.multipart.support.StandardServletMultipartResolver; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.autoconfigure.web.MultipartAutoConfiguration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java similarity index 82% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java index d543131c2c..2ad73a28d1 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/ServerPropertiesAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import java.io.File; @@ -24,17 +24,18 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mockito; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.web.ServerPropertiesAutoConfiguration; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.TestUtils; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.properties.ServerProperties; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java similarity index 87% rename from spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java rename to spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java index 6031ab0d18..be2d0017d1 100644 --- a/spring-autoconfigure/src/test/java/org/springframework/zero/autoconfigure/web/WebMvcAutoConfigurationTests.java +++ b/spring-autoconfigure/src/test/java/org/springframework/autoconfigure/web/WebMvcAutoConfigurationTests.java @@ -14,9 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.autoconfigure.web; +package org.springframework.autoconfigure.web; import org.junit.Ignore; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; /** * Tests for {@link WebMvcAutoConfiguration}. diff --git a/spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql b/spring-autoconfigure/src/test/resources/org/springframework/autoconfigure/jdbc/schema.sql similarity index 100% rename from spring-autoconfigure/src/test/resources/org/springframework/zero/autoconfigure/jdbc/schema.sql rename to spring-autoconfigure/src/test/resources/org/springframework/autoconfigure/jdbc/schema.sql diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/Banner.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java similarity index 66% rename from spring-bootstrap/src/main/java/org/springframework/zero/Banner.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java index 6da3a48309..19318d4e5c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/Banner.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/Banner.java @@ -14,24 +14,23 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.io.PrintStream; /** - * Writes the 'Spring Zero' banner. + * Writes the 'Spring' banner. * * @author Phillip Webb */ abstract class Banner { - private static final String[] BANNER = { - " . ____ _ _____ __ _", - " /\\\\ / ___'_ __ _ _(_)_ __ __ _ |__ /___ _ __ ___\\ \\ \\", - "( ( )\\___ | '_ | '_| | '_ \\/ _` | / // _ \\ '__/ _ \\\\ \\ \\", - " \\\\/ ___)| |_)| | | | | || (_| | / /| __/ | | (/) |} } }", - " ' |____| .__|_| |_|_| |_\\__, |'_____\\___|_| \\___// / /", - " =========|_|==============|___/====================/_/_/" }; + private static final String[] BANNER = { " . ____ _ __ _ _", + " /\\\\ / ___'_ __ _ _(_)_ __ __ _ \\ \\ \\ \\", + "( ( )\\___ | '_ | '_| | '_ \\/ _` | \\ \\ \\ \\", + " \\\\/ ___)| |_)| | | | | || (_| | ) ) ) )", + " ' |____| .__|_| |_|_| |_\\__, | / / / /", + " =========|_|==============|___/=/_/_/_/" }; /** * Write the banner to the specified print stream. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java index 50ad915775..0853caac9b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/BeanDefinitionLoader.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/BeanDefinitionLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.HashSet; import java.util.Set; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java index 457fd28ba6..0911a00991 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/CommandLineRunner.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/CommandLineRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import org.springframework.core.Ordered; import org.springframework.core.annotation.Order; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java index 8b3d5933ea..565cab2774 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/ExitCodeGenerator.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/ExitCodeGenerator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; /** * Interface used to generate an 'exit code' from a running command line diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java index da07a747a7..fb931c1402 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/SpringApplication.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/SpringApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.ArrayList; import java.util.Arrays; @@ -123,8 +123,8 @@ public class SpringApplication { private static final String DEFAULT_CONTEXT_CLASS = "org.springframework.context." + "annotation.AnnotationConfigApplicationContext"; - public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework.zero." - + "context.embedded.AnnotationConfigEmbeddedWebApplicationContext"; + public static final String DEFAULT_WEB_CONTEXT_CLASS = "org.springframework." + + "bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext"; private static final String[] WEB_ENVIRONMENT_CLASSES = { "javax.servlet.Servlet", "org.springframework.web.context.ConfigurableWebApplicationContext" }; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java index d2d5428087..6e36810642 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/CustomPropertyConstructor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/CustomPropertyConstructor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.beans.IntrospectionException; import java.util.HashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java index 7866ffe471..e6cadd2f97 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/InetAddressEditor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/InetAddressEditor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.beans.PropertyEditor; import java.beans.PropertyEditorSupport; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java index cd9806d12e..f477cc6312 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertiesConfigurationFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Locale; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java index 671af9ce01..f5e2e347e2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/PropertySourcesPropertyValues.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValues.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Collection; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java index 8d7ca09621..c253767b31 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/RelaxedDataBinder.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/RelaxedDataBinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.net.InetAddress; import java.util.LinkedHashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java index 4bb49bfec4..8a356e82dc 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/bind/YamlConfigurationFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/bind/YamlConfigurationFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.nio.charset.Charset; import java.util.Collections; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java index df64c81d49..3239e34602 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/JacksonJsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JacksonJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java index 8433276390..fe34265272 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java index cf92a8aec2..8409bcc1a9 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/JsonParserFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/JsonParserFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import org.springframework.util.ClassUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java index 742d82b3f0..e609cccfd5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/SimpleJsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/SimpleJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.ArrayList; import java.util.HashMap; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java index 6eb723d4d7..8c0463923e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlJsonParser.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlJsonParser.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java index fa87770770..f071278354 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlMapFactoryBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlMapFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java index de1fc092b1..059fa3964c 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.io.IOException; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java index 42fc4d9eaa..a0abb26e47 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/config/YamlPropertiesFactoryBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.Map; import java.util.Properties; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java index cb16ac442b..aeac65a736 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/AbstractOnBeanCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/AbstractOnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java index d896c24631..7ab5c39718 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionLogUtils.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionLogUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.springframework.core.type.AnnotatedTypeMetadata; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java index ab10b3d6e6..c9a795c12f 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java index c8e50cce82..6721801fbe 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnClass.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java index 5646716191..2f38e4f29a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnExpression.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnExpression.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java index d77074b636..c15194f57b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java index e1014526a1..5e0bfa45ef 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnMissingClass.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnMissingClass.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java index fef457de67..f98289d9fd 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnNotWebApplication.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnNotWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java index aae6b17f79..4123513d08 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnResource.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnResource.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java index a13ae08b9a..cbe6256ba8 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/ConditionalOnWebApplication.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/ConditionalOnWebApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java index 7da41e8f6a..70f378c617 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnBeanCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.springframework.context.annotation.Condition; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java index c3b16c0228..8b051929ed 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnClassCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java index 03f1f28886..b21a3db2dd 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnExpressionCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnExpressionCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java index 51480c35f6..e13ca077fb 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingBeanCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingBeanCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java index f5e4062f68..a9d53bcdc0 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnMissingClassCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnMissingClassCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java index 92d9cb8472..1aa96c1034 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnNotWebApplicationCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java index 81124c8002..60898e4635 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnResourceCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnResourceCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java index 5b7f738b18..4aea37fbca 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/condition/OnWebApplicationCondition.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/condition/OnWebApplicationCondition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java index 5a068f4ac5..434e7a2834 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.File; import java.io.IOException; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java index 81bb275455..3bf7739b1b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java index 293e332849..6be6ba538a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ConfigurableEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ConfigurableEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.File; import java.net.InetAddress; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java index bb733ab364..8688703bb3 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; /** * Simple interface that represents a fully configured embedded servlet container (for diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java index bcc8658cf1..c8f554d03d 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; /** * Strategy interface for customizing auto-configured embedded servlet containers. Any diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java index dfaa91df2e..32f876678a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerCustomizerBeanPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java index ef18666be4..23bc99c8cb 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerException.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; /** * Exceptions thrown by an embedded servlet container. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java similarity index 85% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java index e9f59aa9bd..cf78c4a1e5 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerFactory.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; /** * Factory interface that can be used to create {@link EmbeddedServletContainer}s. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java index 7267d37ce5..cad231892b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContext.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.ArrayList; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java index d639ee94e1..b2fce25bb2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ErrorPage.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ErrorPage.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import org.springframework.http.HttpStatus; import org.springframework.util.ObjectUtils; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java similarity index 99% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java index bbe3af8745..9cbca04c68 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/FilterRegistrationBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java index bbda2bf022..c3c732a8f4 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/RegistrationBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/RegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.LinkedHashMap; import java.util.Map; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java index eb30ca2c2a..d771e042e3 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.ServletContext; import javax.servlet.ServletException; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java index 312dcf45b8..7f0a3cbf11 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/ServletRegistrationBean.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collection; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java index b634a56129..9eaa7b726a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/WebApplicationContextServletContextAwareProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/WebApplicationContextServletContextAwareProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.ServletConfig; import javax.servlet.ServletContext; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java index 60a3b0c0c9..bec9658850 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContext.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContext.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import org.springframework.beans.BeansException; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java similarity index 89% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java index 052c7e27d2..9d2c4c5720 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainer.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import org.eclipse.jetty.server.Server; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerException; /** * {@link EmbeddedServletContainer} that can be used to control an embedded Jetty server. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java index 50ebb61aed..512b2ba766 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import java.io.File; import java.net.InetSocketAddress; @@ -32,16 +32,16 @@ import org.eclipse.jetty.util.resource.Resource; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ErrorPage; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ErrorPage; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * {@link EmbeddedServletContainerFactory} that can be used to create diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java index 1a9d8f43de..2f5c1218e7 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/ServletContextInitializerConfiguration.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/ServletContextInitializerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import javax.servlet.ServletContext; @@ -23,8 +23,8 @@ import org.eclipse.jetty.util.component.AbstractLifeCycle; import org.eclipse.jetty.webapp.AbstractConfiguration; import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * Jetty {@link Configuration} that calls {@link ServletContextInitializer}s. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java similarity index 76% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java index 62d603c541..532ff9779f 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/jetty/package-info.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/jetty/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Jetty {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Jetty {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java similarity index 74% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java index 5cbac790bb..de3401d227 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/package-info.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/package-info.java @@ -16,8 +16,8 @@ /** * Support for embedded servlet containers. - * @see org.springframework.zero.context.embedded.EmbeddedServletContainerFactory - * @see org.springframework.zero.context.embedded.EmbeddedWebApplicationContext + * @see org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory + * @see org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java similarity index 86% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java index 4d65c39c4d..578862435b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/properties/ServerProperties.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/properties/ServerProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.properties; +package org.springframework.bootstrap.context.embedded.properties; import java.io.File; import java.net.InetAddress; @@ -23,13 +23,13 @@ import javax.validation.constraints.NotNull; import org.apache.catalina.valves.AccessLogValve; import org.apache.catalina.valves.RemoteIpValve; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.util.StringUtils; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerCustomizerBeanPostProcessor; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; -import org.springframework.zero.context.properties.ConfigurationProperties; /** * {@link ConfigurationProperties properties} for a web server (e.g. port and path diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java similarity index 93% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java index d5f4a869a3..94452e4f9b 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/ServletContextInitializerLifecycleListener.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import javax.servlet.ServletException; @@ -22,8 +22,8 @@ import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.apache.catalina.core.StandardContext; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * Tomcat {@link LifecycleListener} that calls {@link ServletContextInitializer}s. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java similarity index 91% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java index f9a45d0893..3d1d6d54f2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainer.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import org.apache.catalina.LifecycleException; import org.apache.catalina.startup.Tomcat; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; import org.springframework.util.Assert; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerException; /** * {@link EmbeddedServletContainer} that can be used to control an embedded Tomcat server. diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java similarity index 95% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java index 7ecf598340..66983895be 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import java.io.File; import java.io.IOException; @@ -38,16 +38,16 @@ import org.apache.catalina.loader.WebappLoader; import org.apache.catalina.startup.Tomcat; import org.apache.catalina.startup.Tomcat.FixContextListener; import org.apache.coyote.AbstractProtocol; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerException; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ErrorPage; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import org.springframework.context.ResourceLoaderAware; import org.springframework.core.io.ResourceLoader; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerException; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ErrorPage; -import org.springframework.zero.context.embedded.ServletContextInitializer; /** * {@link EmbeddedServletContainerFactory} that can be used to create diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java index 56a4eb2259..6b81c3fd13 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedWebappClassLoader.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import java.net.URL; import java.net.URLClassLoader; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java similarity index 76% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java index 6899819b5c..802345a1f9 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/embedded/tomcat/package-info.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/embedded/tomcat/package-info.java @@ -15,7 +15,7 @@ */ /** - * Support for Tomcat {@link org.springframework.zero.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. + * Support for Tomcat {@link org.springframework.bootstrap.context.embedded.EmbeddedServletContainer EmbeddedServletContainers}. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java index 8db25ecb8d..5133c086fe 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.io.IOException; import java.util.ArrayList; @@ -23,6 +23,10 @@ import java.util.List; import java.util.Properties; import java.util.Set; +import org.springframework.bootstrap.config.YamlPropertiesFactoryBean; +import org.springframework.bootstrap.config.YamlProcessor.ArrayDocumentMatcher; +import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; +import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.PropertySource; @@ -33,10 +37,6 @@ import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.util.StringUtils; -import org.springframework.zero.config.YamlProcessor.ArrayDocumentMatcher; -import org.springframework.zero.config.YamlProcessor.DocumentMatcher; -import org.springframework.zero.config.YamlProcessor.MatchStatus; -import org.springframework.zero.config.YamlPropertiesFactoryBean; /** * {@link ApplicationContextInitializer} that configures the context environment by diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java index 454d939bc7..c2c1f1b23a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java index 839af13ad1..8f765bb0c7 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java index 868d92644e..f40e90c849 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/LoggingApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/LoggingApplicationContextInitializer.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.lang.management.ManagementFactory; import java.util.HashMap; import java.util.Map; +import org.springframework.bootstrap.logging.JavaLoggerConfigurer; +import org.springframework.bootstrap.logging.LogbackConfigurer; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -29,8 +31,6 @@ import org.springframework.core.env.Environment; import org.springframework.core.io.ClassPathResource; import org.springframework.util.ClassUtils; import org.springframework.util.Log4jConfigurer; -import org.springframework.zero.logging.JavaLoggerConfigurer; -import org.springframework.zero.logging.LogbackConfigurer; /** * An {@link ApplicationContextInitializer} that configures a logging framework depending diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java index a981cb6a6e..b147016291 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.Collection; import java.util.Collections; @@ -23,6 +23,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Properties; +import org.springframework.bootstrap.config.JsonParser; +import org.springframework.bootstrap.config.JsonParserFactory; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.Ordered; @@ -32,8 +34,6 @@ import org.springframework.core.env.Environment; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.util.StringUtils; -import org.springframework.zero.config.JsonParser; -import org.springframework.zero.config.JsonParserFactory; /** * An {@link ApplicationContextInitializer} that knows where to find VCAP (a.k.a. Cloud diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java index e1e4fa2c96..936a79b91e 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationProperties.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java index b47f15c2d1..1d5fb675c9 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingConfiguration.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingConfiguration.java @@ -14,10 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.bootstrap.context.condition.ConditionalOnClass; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -30,8 +32,6 @@ import org.springframework.core.env.PropertySource; import org.springframework.core.env.PropertySources; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.springframework.zero.context.condition.ConditionalOnClass; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * Configuration for binding externalized application properties to diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java index 1ef09fbb79..6494d83424 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesBindingPostProcessor.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesBindingPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanCreationException; @@ -22,6 +22,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.BeanPostProcessor; +import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; @@ -29,7 +30,6 @@ import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.env.PropertySources; import org.springframework.util.StringUtils; import org.springframework.validation.Validator; -import org.springframework.zero.bind.PropertiesConfigurationFactory; /** * {@link BeanPostProcessor} to bind {@link PropertySources} to beans annotated with diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java index 8ee28ecfb0..2e6f9bdc00 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/ConfigurationPropertiesHolder.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/ConfigurationPropertiesHolder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; /** * Properties holder registered by {@link EnableConfigurationPropertiesImportSelector} to diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java similarity index 96% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java index d7c8402592..90880b6f55 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationProperties.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java similarity index 98% rename from spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java index 097f21fa95..95c170621f 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesImportSelector.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesImportSelector.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.util.ArrayList; import java.util.List; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java index f4ae67c05f..e94394fba2 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/logging/JavaLoggerConfigurer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/JavaLoggerConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.FileNotFoundException; import java.util.logging.LogManager; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java similarity index 97% rename from spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java index f5ae1b5ce1..143e0cf836 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/logging/LogbackConfigurer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/logging/LogbackConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.FileNotFoundException; import java.net.URL; diff --git a/spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java b/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java similarity index 94% rename from spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java rename to spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java index 5bafb1216f..a21f490b1a 100644 --- a/spring-bootstrap/src/main/java/org/springframework/zero/web/SpringServletInitializer.java +++ b/spring-bootstrap/src/main/java/org/springframework/bootstrap/web/SpringServletInitializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.web; +package org.springframework.bootstrap.web; import javax.servlet.ServletContext; import javax.servlet.ServletContextEvent; @@ -22,12 +22,12 @@ import javax.servlet.ServletException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; import org.springframework.context.ApplicationContext; import org.springframework.web.WebApplicationInitializer; import org.springframework.web.context.ContextLoaderListener; import org.springframework.web.context.WebApplicationContext; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; /** * A handy opinionated {@link WebApplicationInitializer} for applications that only have diff --git a/spring-bootstrap/src/main/resources/META-INF/spring.factories b/spring-bootstrap/src/main/resources/META-INF/spring.factories index 33e29d5260..03db1ac821 100644 --- a/spring-bootstrap/src/main/resources/META-INF/spring.factories +++ b/spring-bootstrap/src/main/resources/META-INF/spring.factories @@ -1,7 +1,7 @@ # Application Context Initializers org.springframework.context.ApplicationContextInitializer=\ -org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer,\ -org.springframework.zero.context.initializer.ContextIdApplicationContextInitializer,\ -org.springframework.zero.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ -org.springframework.zero.context.initializer.LoggingApplicationContextInitializer,\ -org.springframework.zero.context.initializer.VcapApplicationContextInitializer +org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer,\ +org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer diff --git a/spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties b/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/zero/logging/log4j.properties rename to spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/log4j.properties diff --git a/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml b/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/zero/logging/logback.xml rename to spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logback.xml diff --git a/spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties b/spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties similarity index 100% rename from spring-bootstrap/src/main/resources/org/springframework/zero/logging/logging.properties rename to spring-bootstrap/src/main/resources/org/springframework/bootstrap/logging/logging.properties diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java index f6dc540871..9e56f5a71c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/BeanDefinitionLoaderTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/BeanDefinitionLoaderTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.sampleconfig.MyComponent; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.io.ClassPathResource; -import org.springframework.zero.sampleconfig.MyComponent; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -82,7 +82,7 @@ public class BeanDefinitionLoaderTests { @Test public void loadResourceName() throws Exception { BeanDefinitionLoader loader = new BeanDefinitionLoader(this.registry, - "classpath:org/springframework/zero/sample-beans.xml"); + "classpath:org/springframework/bootstrap/sample-beans.xml"); int loaded = loader.load(); assertThat(loaded, equalTo(1)); assertTrue(this.registry.containsBean("myXmlComponent")); diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java index 44ba0a90a4..4c37f56bee 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/SpringApplicationTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.concurrent.atomic.AtomicReference; @@ -26,6 +26,12 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.support.BeanDefinitionRegistry; import org.springframework.beans.factory.support.BeanNameGenerator; import org.springframework.beans.factory.support.DefaultBeanNameGenerator; +import org.springframework.bootstrap.BeanDefinitionLoader; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.ExitCodeGenerator; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextInitializer; @@ -45,12 +51,6 @@ import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.ResourceLoader; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.StaticWebApplicationContext; -import org.springframework.zero.BeanDefinitionLoader; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.ExitCodeGenerator; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.instanceOf; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java index f9f35eaede..e58267b9e2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/TestUtils.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/TestUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero; +package org.springframework.bootstrap; import java.util.HashMap; import java.util.Map; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java index ac5b966220..a19f4583d1 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertiesConfigurationFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertiesConfigurationFactoryTests.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import javax.validation.Validation; import javax.validation.constraints.NotNull; import org.junit.Test; import org.springframework.beans.NotWritablePropertyException; +import org.springframework.bootstrap.bind.PropertiesConfigurationFactory; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; import org.springframework.validation.BindException; import org.springframework.validation.Validator; import org.springframework.validation.beanvalidation.SpringValidatorAdapter; -import org.springframework.zero.bind.PropertiesConfigurationFactory; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java index 9ad499fd80..ceec5e2d66 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/PropertySourcesPropertyValuesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/PropertySourcesPropertyValuesTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Collections; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.bind.PropertySourcesPropertyValues; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.MutablePropertySources; import org.springframework.core.env.PropertySource; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java similarity index 99% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java index 8f5881f3a4..9beeedc9f8 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/RelaxedDataBinderTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/RelaxedDataBinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -36,6 +36,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.beans.MutablePropertyValues; +import org.springframework.bootstrap.bind.RelaxedDataBinder; import org.springframework.context.support.StaticMessageSource; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; @@ -45,7 +46,6 @@ import org.springframework.validation.BindingResult; import org.springframework.validation.DataBinder; import org.springframework.validation.FieldError; import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; -import org.springframework.zero.bind.RelaxedDataBinder; import static java.lang.annotation.RetentionPolicy.RUNTIME; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java index 20e5a9aea8..b95dc38725 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/bind/YamlConfigurationFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/bind/YamlConfigurationFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.bind; +package org.springframework.bootstrap.bind; import java.util.Collections; import java.util.HashMap; @@ -24,6 +24,7 @@ import javax.validation.Validation; import javax.validation.constraints.NotNull; import org.junit.Test; +import org.springframework.bootstrap.bind.YamlConfigurationFactory; import org.springframework.context.support.StaticMessageSource; import org.springframework.validation.BindException; import org.springframework.validation.Validator; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java similarity index 83% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java index 271de278ae..5f06d06d24 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/JacksonParserTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/JacksonParserTests.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; + +import org.springframework.bootstrap.config.JacksonJsonParser; +import org.springframework.bootstrap.config.JsonParser; /** diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java index 5beea86618..fc8cc9e2f2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/SimpleJsonParserTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/SimpleJsonParserTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.List; import java.util.Map; import org.junit.Test; +import org.springframework.bootstrap.config.JsonParser; +import org.springframework.bootstrap.config.SimpleJsonParser; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java similarity index 83% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java index 1cda3586e5..b00fe8b127 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlJsonParserTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlJsonParserTests.java @@ -14,7 +14,10 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; + +import org.springframework.bootstrap.config.JsonParser; +import org.springframework.bootstrap.config.YamlJsonParser; /** diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java index ea7afe8dc1..101e434f1a 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlMapFactoryBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlMapFactoryBeanTests.java @@ -14,18 +14,19 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.io.IOException; import java.io.InputStream; import java.util.Map; import org.junit.Test; +import org.springframework.bootstrap.config.YamlMapFactoryBean; +import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.AbstractResource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.Resource; -import org.springframework.zero.config.YamlProcessor.ResolutionMethod; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java index 8b31b02748..6b6815037a 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/config/YamlPropertiesFactoryBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/config/YamlPropertiesFactoryBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.config; +package org.springframework.bootstrap.config; import java.util.Arrays; import java.util.Map; @@ -22,12 +22,13 @@ import java.util.Properties; import org.junit.Ignore; import org.junit.Test; +import org.springframework.bootstrap.config.YamlPropertiesFactoryBean; +import org.springframework.bootstrap.config.YamlProcessor.DocumentMatcher; +import org.springframework.bootstrap.config.YamlProcessor.MatchStatus; +import org.springframework.bootstrap.config.YamlProcessor.ResolutionMethod; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.zero.config.YamlProcessor.DocumentMatcher; -import org.springframework.zero.config.YamlProcessor.MatchStatus; -import org.springframework.zero.config.YamlProcessor.ResolutionMethod; import org.yaml.snakeyaml.Yaml; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java index b3ee08e0fd..59eaa7c781 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBean.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -23,9 +23,9 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; import org.springframework.beans.factory.BeanFactory; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Conditional; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; /** * {@link Conditional} that only matches when the specified bean classes and/or names are diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java index 2286809315..cd3af4903b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/AssertMissingBeanCondition.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/AssertMissingBeanCondition.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import java.util.List; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.bootstrap.context.condition.OnMissingBeanCondition; import org.springframework.context.annotation.Condition; import org.springframework.context.annotation.ConditionContext; import org.springframework.core.type.AnnotatedTypeMetadata; -import org.springframework.zero.context.condition.OnMissingBeanCondition; /** * {@link Condition} that checks that specific beans are missing. diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java index 724e396666..9ce448c7c2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnBeanConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnBeanConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Ignore; import org.junit.Test; @@ -23,7 +23,6 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; import org.springframework.context.annotation.ImportResource; -import org.springframework.zero.context.condition.ConditionalOnBean; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -103,13 +102,13 @@ public class OnBeanConditionTests { } @Configuration - @ImportResource("org/springframework/zero/context/annotation/foo.xml") + @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(OnBeanNameConfiguration.class) - @ImportResource("org/springframework/zero/context/annotation/foo.xml") + @ImportResource("org/springframework/bootstrap/context/annotation/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java index cfffc9d6db..f0d542e098 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnClassConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -95,13 +95,13 @@ public class OnClassConditionTests { } @Configuration - @ImportResource("org/springframework/zero/context/foo.xml") + @ImportResource("org/springframework/bootstrap/context/foo.xml") protected static class XmlConfiguration { } @Configuration @Import(BasicConfiguration.class) - @ImportResource("org/springframework/zero/context/foo.xml") + @ImportResource("org/springframework/bootstrap/context/foo.xml") protected static class CombinedXmlConfiguration { } } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java similarity index 89% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java index fb4f208f37..40e187c69b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnExpressionConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnExpressionConditionTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnExpression; +import org.springframework.bootstrap.context.condition.OnExpressionCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java index ce88856359..4a7b8a2fb0 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingBeanConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingBeanConditionTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; +import org.springframework.bootstrap.context.condition.OnMissingBeanCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; -import org.springframework.zero.context.condition.OnMissingBeanCondition; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java similarity index 92% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java index b2696b7b07..2ab8b1c44c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnMissingClassConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnMissingClassConditionTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; @@ -51,7 +51,7 @@ public class OnMissingClassConditionTests { } @Configuration - @ConditionalOnMissingClass("org.springframework.zero.context.condition.OnMissingClassConditionTests") + @ConditionalOnMissingClass("org.springframework.bootstrap.context.condition.OnMissingClassConditionTests") protected static class BasicConfiguration { @Bean public String bar() { diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java similarity index 85% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java index dce5631907..19fb587c10 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnNotWebApplicationConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnNotWebApplicationConditionTests.java @@ -14,14 +14,15 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnNotWebApplication; +import org.springframework.bootstrap.context.condition.ConditionalOnWebApplication; +import org.springframework.bootstrap.context.condition.OnNotWebApplicationCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.context.condition.ConditionalOnNotWebApplication; -import org.springframework.zero.context.condition.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java similarity index 90% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java index 493c23d681..8e304820be 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnResourceConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnResourceConditionTests.java @@ -14,9 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnResource; +import org.springframework.bootstrap.context.condition.OnResourceCondition; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java similarity index 87% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java index ad729822b2..95171af537 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/condition/OnWebApplicationConditionTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/condition/OnWebApplicationConditionTests.java @@ -14,15 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.context.condition; +package org.springframework.bootstrap.context.condition; import org.junit.Test; +import org.springframework.bootstrap.context.condition.ConditionalOnNotWebApplication; +import org.springframework.bootstrap.context.condition.ConditionalOnWebApplication; +import org.springframework.bootstrap.context.condition.OnWebApplicationCondition; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.mock.web.MockServletContext; import org.springframework.web.context.support.AnnotationConfigWebApplicationContext; -import org.springframework.zero.context.condition.ConditionalOnNotWebApplication; -import org.springframework.zero.context.condition.ConditionalOnWebApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java index d1e8485929..5278e5b0a9 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AbstractEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.FileWriter; import java.io.IOException; @@ -38,18 +38,18 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; import org.mockito.InOrder; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ConfigurableEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.FilterRegistrationBean; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.util.FileCopyUtils; import org.springframework.util.StreamUtils; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ConfigurableEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.FilterRegistrationBean; -import org.springframework.zero.context.embedded.ServletContextInitializer; -import org.springframework.zero.context.embedded.ServletRegistrationBean; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.notNullValue; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java index fbf60f98a8..573c0c0dfe 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/AnnotationConfigEmbeddedWebApplicationContextTests.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.Servlet; import javax.servlet.ServletContext; import org.junit.Test; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.context.ServletContextAware; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContext; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.config.ExampleEmbeddedWebApplicationConfiguration; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java index dc50a6248b..5c83bdd31b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedServletContainerMvcIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.net.URI; import java.nio.charset.Charset; @@ -22,6 +22,8 @@ import java.nio.charset.Charset; import org.junit.After; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; @@ -36,8 +38,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.servlet.DispatcherServlet; import org.springframework.web.servlet.config.annotation.EnableWebMvc; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -117,7 +117,7 @@ public class EmbeddedServletContainerMvcIntegrationTests { @Configuration @EnableWebMvc - @PropertySource("classpath:/org/springframework/zero/context/embedded/conf.properties") + @PropertySource("classpath:/org/springframework/bootstrap/context/embedded/conf.properties") public static class AdvancedConfig { @Autowired diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java index adc48e3a4e..5a693962e2 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/EmbeddedWebApplicationContextTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/EmbeddedWebApplicationContextTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.lang.reflect.Field; import java.util.Properties; @@ -33,6 +33,10 @@ import org.springframework.beans.MutablePropertyValues; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.ConstructorArgumentValues; import org.springframework.beans.factory.support.RootBeanDefinition; +import org.springframework.bootstrap.context.embedded.EmbeddedWebApplicationContext; +import org.springframework.bootstrap.context.embedded.FilterRegistrationBean; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import org.springframework.context.ApplicationContextException; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.PropertySourcesPlaceholderConfigurer; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java index add605cbbb..ec9a287638 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleFilter.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java index 1976d636b0..be9ec5fe82 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ExampleServlet.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ExampleServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java index b4bbca6156..39dd0c2937 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/FilterRegistrationBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/FilterRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collections; @@ -32,8 +32,8 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.zero.context.embedded.FilterRegistrationBean; -import org.springframework.zero.context.embedded.ServletRegistrationBean; +import org.springframework.bootstrap.context.embedded.FilterRegistrationBean; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.*; import static org.mockito.Matchers.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java index e14ac2228e..f9b891b923 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockEmbeddedServletContainerFactory.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockEmbeddedServletContainerFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.ArrayList; import java.util.Enumeration; @@ -31,10 +31,10 @@ import javax.servlet.ServletRegistration; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.EmbeddedServletContainer; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.ServletContextInitializer; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.ServletContextInitializer; import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyObject; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java index 50002ee20a..4cc0521697 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockFilter.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java index 9920000ab1..b40ff18c6d 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/MockServlet.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/MockServlet.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.io.IOException; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java index cfaa3a374c..00a74a952d 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/ServletRegistrationBeanTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/ServletRegistrationBeanTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import java.util.Arrays; import java.util.Collections; @@ -34,6 +34,7 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; +import org.springframework.bootstrap.context.embedded.ServletRegistrationBean; import static org.mockito.BDDMockito.given; import static org.mockito.Matchers.anyObject; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java index 05ca433ab9..94834f0050 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/XmlEmbeddedWebApplicationContextTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/XmlEmbeddedWebApplicationContextTests.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded; +package org.springframework.bootstrap.context.embedded; import javax.servlet.Servlet; import org.junit.Test; +import org.springframework.bootstrap.context.embedded.XmlEmbeddedWebApplicationContext; import org.springframework.core.io.ClassPathResource; -import org.springframework.zero.context.embedded.XmlEmbeddedWebApplicationContext; import static org.mockito.Mockito.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java similarity index 73% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java index 0364878643..5b0a0a9b3b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/config/ExampleEmbeddedWebApplicationConfiguration.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.config; +package org.springframework.bootstrap.context.embedded.config; import javax.servlet.Servlet; +import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests; +import org.springframework.bootstrap.context.embedded.EmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.MockServlet; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.context.embedded.AnnotationConfigEmbeddedWebApplicationContextTests; -import org.springframework.zero.context.embedded.EmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.MockEmbeddedServletContainerFactory; -import org.springframework.zero.context.embedded.MockServlet; /** * Example {@code @Configuration} for use with diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java similarity index 84% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java index 4b6b2c3043..8b4526e90e 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/jetty/JettyEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.jetty; +package org.springframework.bootstrap.context.embedded.jetty; import java.util.Arrays; @@ -22,9 +22,9 @@ import org.eclipse.jetty.webapp.Configuration; import org.eclipse.jetty.webapp.WebAppContext; import org.junit.Test; import org.mockito.InOrder; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainer; -import org.springframework.zero.context.embedded.jetty.JettyEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java similarity index 91% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java index f73888b433..304947cbcc 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/properties/ServerPropertiesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/properties/ServerPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.properties; +package org.springframework.bootstrap.context.embedded.properties; import java.net.InetAddress; import java.util.Collections; @@ -23,8 +23,8 @@ import java.util.Map; import org.junit.Test; import org.springframework.beans.MutablePropertyValues; -import org.springframework.zero.bind.RelaxedDataBinder; -import org.springframework.zero.context.embedded.properties.ServerProperties; +import org.springframework.bootstrap.bind.RelaxedDataBinder; +import org.springframework.bootstrap.context.embedded.properties.ServerProperties; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java similarity index 84% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java index 7181f58ea3..19e83e134a 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/embedded/tomcat/TomcatEmbeddedServletContainerFactoryTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.embedded.tomcat; +package org.springframework.bootstrap.context.embedded.tomcat; import java.util.Arrays; @@ -22,9 +22,9 @@ import org.apache.catalina.LifecycleEvent; import org.apache.catalina.LifecycleListener; import org.junit.Test; import org.mockito.InOrder; -import org.springframework.zero.context.embedded.AbstractEmbeddedServletContainerFactoryTests; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainer; -import org.springframework.zero.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; +import org.springframework.bootstrap.context.embedded.AbstractEmbeddedServletContainerFactoryTests; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainer; +import org.springframework.bootstrap.context.embedded.tomcat.TomcatEmbeddedServletContainerFactory; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.inOrder; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java index dbeae1005b..c80d70bec5 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ConfigFileApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ConfigFileApplicationContextInitializerTests.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.HashMap; import java.util.Map; import org.junit.Test; +import org.springframework.bootstrap.context.initializer.ConfigFileApplicationContextInitializer; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.SimpleCommandLinePropertySource; -import org.springframework.zero.context.initializer.ConfigFileApplicationContextInitializer; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java index 3c80529520..a62762a0bd 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/ContextIdApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/ContextIdApplicationContextInitializerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import org.junit.Test; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.initializer.ContextIdApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.TestUtils; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java index dc38df730d..838cdce9b3 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/EnvironmentDelegateApplicationContextInitializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import java.util.HashMap; import java.util.Map; @@ -22,6 +22,7 @@ import java.util.Map; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.springframework.bootstrap.context.initializer.EnvironmentDelegateApplicationContextInitializer; import org.springframework.context.ApplicationContextException; import org.springframework.context.ApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; @@ -31,7 +32,6 @@ import org.springframework.core.annotation.Order; import org.springframework.core.env.MapPropertySource; import org.springframework.core.env.PropertySource; import org.springframework.web.context.ConfigurableWebApplicationContext; -import org.springframework.zero.context.initializer.EnvironmentDelegateApplicationContextInitializer; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java index 0d57fcc636..046d2e2d3d 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/initializer/VcapApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/initializer/VcapApplicationContextInitializerTests.java @@ -14,12 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.context.initializer; +package org.springframework.bootstrap.context.initializer; import org.junit.Test; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.initializer.VcapApplicationContextInitializer; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.zero.TestUtils; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java index f4bb2e2379..738f3f9ab0 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/properties/EnableConfigurationPropertiesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/properties/EnableConfigurationPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.context.properties; +package org.springframework.bootstrap.context.properties; import java.util.Arrays; @@ -23,14 +23,14 @@ import javax.annotation.PostConstruct; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.TestUtils; +import org.springframework.bootstrap.context.condition.AssertMissingBean; +import org.springframework.bootstrap.context.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.stereotype.Component; -import org.springframework.zero.TestUtils; -import org.springframework.zero.context.condition.AssertMissingBean; -import org.springframework.zero.context.condition.ConditionalOnMissingBean; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -155,7 +155,7 @@ public class EnableConfigurationPropertiesTests { @EnableConfigurationProperties protected static class TestBeanConfiguration { @ConditionalOnMissingBean(TestProperties.class) - @Bean(name = "org.springframework.zero.context.annotation.EnableConfigurationPropertiesTests$TestProperties") + @Bean(name = "org.springframework.bootstrap.context.annotation.EnableConfigurationPropertiesTests$TestProperties") public TestProperties testProperties() { return new TestProperties(); } @@ -173,7 +173,7 @@ public class EnableConfigurationPropertiesTests { } @Configuration - @ImportResource("org/springframework/zero/context/properties/testProperties.xml") + @ImportResource("org/springframework/bootstrap/context/properties/testProperties.xml") protected static class DefaultXmlConfiguration { } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java similarity index 94% rename from spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java index 52232c9307..d62388d12c 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/context/test/EnableConfigurationPropertiesTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/context/test/EnableConfigurationPropertiesTests.java @@ -14,21 +14,21 @@ * limitations under the License. */ -package org.springframework.zero.context.test; +package org.springframework.bootstrap.context.test; import java.util.Properties; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.core.env.PropertiesPropertySource; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.support.PropertiesLoaderUtils; -import org.springframework.zero.context.properties.ConfigurationProperties; -import org.springframework.zero.context.properties.EnableConfigurationProperties; import static org.junit.Assert.assertEquals; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java index 0d0048cb32..19899e230b 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/JavaLoggerConfigurerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/JavaLoggerConfigurerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -25,6 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.logging.JavaLoggerConfigurer; import static org.junit.Assert.assertTrue; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java similarity index 97% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java index 8accbccc7c..503cefaa39 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LogbackConfigurerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LogbackConfigurerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.ByteArrayOutputStream; import java.io.FileNotFoundException; @@ -64,7 +64,7 @@ public class LogbackConfigurerTests { logger.info("Hello world"); String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.contains("Hello world")); - assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/springzero.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/spring.log")); } @Test(expected = FileNotFoundException.class) diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java similarity index 96% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java index 200f49c1c7..34bb2128b7 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/LoggingApplicationContextInitializerTests.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/LoggingApplicationContextInitializerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -24,9 +24,9 @@ import org.apache.commons.logging.LogFactory; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.bootstrap.context.initializer.LoggingApplicationContextInitializer; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.env.PropertySource; -import org.springframework.zero.context.initializer.LoggingApplicationContextInitializer; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @@ -94,7 +94,7 @@ public class LoggingApplicationContextInitializerTests { String output = getOutput().trim(); assertTrue("Wrong output:\n" + output, output.contains("Hello world")); assertFalse("Wrong output:\n" + output, output.contains("???")); - assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/springzero.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("/tmp/spring.log")); } @Test @@ -140,7 +140,7 @@ public class LoggingApplicationContextInitializerTests { Log logger = LogFactory.getLog(LoggingApplicationContextInitializerTests.class); logger.info("Hello world"); String output = getOutput().trim(); - assertTrue("Wrong output:\n" + output, output.startsWith("foo/springzero.log")); + assertTrue("Wrong output:\n" + output, output.startsWith("foo/spring.log")); } } diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java similarity index 95% rename from spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java index 5ab6d99b48..91278029f6 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/logging/TestFormatter.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/logging/TestFormatter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.logging; +package org.springframework.bootstrap.logging; import java.util.logging.Formatter; import java.util.logging.LogRecord; diff --git a/spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java b/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java similarity index 93% rename from spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java rename to spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java index 6fe2d4e459..1e43159bb8 100644 --- a/spring-bootstrap/src/test/java/org/springframework/zero/sampleconfig/MyComponent.java +++ b/spring-bootstrap/src/test/java/org/springframework/bootstrap/sampleconfig/MyComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.sampleconfig; +package org.springframework.bootstrap.sampleconfig; import org.springframework.stereotype.Component; diff --git a/spring-bootstrap/src/test/resources/logback-nondefault.xml b/spring-bootstrap/src/test/resources/logback-nondefault.xml index 2b19b3a54f..4752a677e9 100644 --- a/spring-bootstrap/src/test/resources/logback-nondefault.xml +++ b/spring-bootstrap/src/test/resources/logback-nondefault.xml @@ -1,6 +1,6 @@ - + ${LOG_FILE} [%t] ${PID:-????} %c{1}: %m%n diff --git a/spring-bootstrap/src/test/resources/logback-test.xml b/spring-bootstrap/src/test/resources/logback-test.xml index 359b71e547..9cc6069b88 100644 --- a/spring-bootstrap/src/test/resources/logback-test.xml +++ b/spring-bootstrap/src/test/resources/logback-test.xml @@ -1,14 +1,14 @@ - + ${LOG_PATTERN} - - + + diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/conf.properties rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/conf.properties diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml similarity index 63% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml index d734da7227..c4a4d1737a 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/zero/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml +++ b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/embedded/exampleEmbeddedWebApplicationConfiguration.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + class="org.springframework.bootstrap.context.embedded.MockEmbeddedServletContainerFactory" /> - + diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/foo.xml similarity index 100% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/foo.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/foo.xml diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml similarity index 61% rename from spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml index 6784fc206b..24a4b905ec 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/zero/context/properties/testProperties.xml +++ b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/context/properties/testProperties.xml @@ -4,8 +4,8 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> + id="org.springframework.bootstrap.context.properties.EnableConfigurationPropertiesTests$TestProperties" + class="org.springframework.bootstrap.context.properties.EnableConfigurationPropertiesTests$TestProperties"> diff --git a/spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml similarity index 83% rename from spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml rename to spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml index 369bd05ecb..3658eb1274 100644 --- a/spring-bootstrap/src/test/resources/org/springframework/zero/sample-beans.xml +++ b/spring-bootstrap/src/test/resources/org/springframework/bootstrap/sample-beans.xml @@ -5,5 +5,5 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + diff --git a/spring-cli/pom.xml b/spring-cli/pom.xml index 79421c5c0f..e156314342 100644 --- a/spring-cli/pom.xml +++ b/spring-cli/pom.xml @@ -11,7 +11,7 @@ jar ${basedir}/.. - org.springframework.zero.cli.SpringZeroCli + org.springframework.cli.SpringCli diff --git a/spring-cli/samples/actuator.groovy b/spring-cli/samples/actuator.groovy index 56d341d611..cfeb37e84c 100644 --- a/spring-cli/samples/actuator.groovy +++ b/spring-cli/samples/actuator.groovy @@ -1,6 +1,6 @@ package org.test -@Grab("org.springframework.zero:spring-zero-actuator:0.5.0.BUILD-SNAPSHOT") +@Grab("org.springframework.zero:spring-actuator:0.5.0.BUILD-SNAPSHOT") @Controller class SampleController { diff --git a/spring-cli/samples/template.groovy b/spring-cli/samples/template.groovy index 719311dd26..28bd7e0b58 100644 --- a/spring-cli/samples/template.groovy +++ b/spring-cli/samples/template.groovy @@ -1,6 +1,6 @@ package org.test -import static org.springframework.zero.cli.template.GroovyTemplate.template; +import static org.springframework.cli.template.GroovyTemplate.template; @Component class Example implements CommandLineRunner { diff --git a/spring-cli/src/main/assembly/descriptor.xml b/spring-cli/src/main/assembly/descriptor.xml index 2f25a1f0ed..7ed0d63ecd 100644 --- a/spring-cli/src/main/assembly/descriptor.xml +++ b/spring-cli/src/main/assembly/descriptor.xml @@ -23,7 +23,7 @@ - org.springframework.zero:spring-zero-cli:jar:* + org.springframework.zero:spring-cli:jar:* lib diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/Command.java b/spring-cli/src/main/java/org/springframework/cli/Command.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/zero/cli/Command.java rename to spring-cli/src/main/java/org/springframework/cli/Command.java index 7e668f3254..61bd9da595 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/Command.java +++ b/spring-cli/src/main/java/org/springframework/cli/Command.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; /** * A single command that can be run from the CLI. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java b/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java rename to spring-cli/src/main/java/org/springframework/cli/CommandFactory.java index 4274b24b47..96f57bc262 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/CommandFactory.java +++ b/spring-cli/src/main/java/org/springframework/cli/CommandFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.Collection; import java.util.ServiceLoader; diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/Log.java b/spring-cli/src/main/java/org/springframework/cli/Log.java similarity index 96% rename from spring-cli/src/main/java/org/springframework/zero/cli/Log.java rename to spring-cli/src/main/java/org/springframework/cli/Log.java index b13e0428a0..c1d48d5194 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/Log.java +++ b/spring-cli/src/main/java/org/springframework/cli/Log.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; /** * Simple logger used by the CLI. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java b/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java similarity index 86% rename from spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java rename to spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java index ea8b0e2ac4..dde2e75a52 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/NoSuchCommandException.java +++ b/spring-cli/src/main/java/org/springframework/cli/NoSuchCommandException.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; /** * Exception thrown when an unknown command is specified. * * @author Phillip Webb */ -class NoSuchCommandException extends SpringZeroCliException { +class NoSuchCommandException extends SpringCliException { private static final long serialVersionUID = 1L; public NoSuchCommandException(String name) { super(String.format("%1$s: '%2$s' is not a valid command. See '%1$s --help'.", - SpringZeroCli.CLI_APP, name)); + SpringCli.CLI_APP, name)); } } diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java b/spring-cli/src/main/java/org/springframework/cli/SpringCli.java similarity index 83% rename from spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java rename to spring-cli/src/main/java/org/springframework/cli/SpringCli.java index 2cc2161275..bd14a0b6d8 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/SpringZeroCli.java +++ b/spring-cli/src/main/java/org/springframework/cli/SpringCli.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.ArrayList; import java.util.Arrays; @@ -24,9 +24,9 @@ import java.util.ServiceLoader; import java.util.Set; /** - * Spring Zero Command Line Interface. This is the main entry-point for the Spring Zero - * command line application. This class will parse input arguments and delegate to a - * suitable {@link Command} implementation based on the first argument. + * Spring Command Line Interface. This is the main entry-point for the Spring command line + * application. This class will parse input arguments and delegate to a suitable + * {@link Command} implementation based on the first argument. * *

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

          *
        • {@link CompilerAutoConfiguration} strategies will be read from - * META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration + * META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration * (per the standard java {@link ServiceLoader} contract) and applied during compilation
          • * *
        • Multiple classes can be returned if the Groovy source defines more than one Class
          • diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java similarity index 95% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java index 213e566b21..8a1376db0f 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/GroovyCompilerConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/GroovyCompilerConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler; +package org.springframework.cli.compiler; /** * Configuration for the {@link GroovyCompiler}. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java similarity index 91% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java index c318b606c1..b1a631008e 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringBatchCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.AstUtils; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.AstUtils; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Batch. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java similarity index 81% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java index 31864a9ef2..bbba80a368 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringZeroCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import groovy.lang.GroovyClassLoader; @@ -24,23 +24,24 @@ import org.codehaus.groovy.classgen.GeneratorContext; import org.codehaus.groovy.control.CompilationFailedException; import org.codehaus.groovy.control.SourceUnit; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; -import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.GroovyCompilerConfiguration; /** - * {@link CompilerAutoConfiguration} for Spring Zero. + * {@link CompilerAutoConfiguration} for Spring. * * @author Dave Syer * @author Phillip Webb */ -public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfiguration { +public class SpringCompilerAutoConfiguration extends CompilerAutoConfiguration { @Override public void applyDependencies(DependencyCustomizer dependencies) { - dependencies.ifAnyMissingClasses("org.springframework.zero.SpringApplication") - .add("org.springframework.zero", "spring-zero-autoconfigure", - "0.5.0.BUILD-SNAPSHOT"); + dependencies.ifAnyMissingClasses( + "org.springframework.bootstrap.SpringApplication").add( + "org.springframework.zero", "spring-autoconfigure", + "0.5.0.BUILD-SNAPSHOT"); dependencies.ifAnyResourcesPresent("logback.xml").add("ch.qos.logback", "logback-classic", "1.0.7"); dependencies.ifNotAdded("cg.qos.logback", "logback-classic") @@ -75,8 +76,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati "org.springframework.context.MessageSource", "org.springframework.core.annotation.Order", "org.springframework.core.io.ResourceLoader", - "org.springframework.zero.CommandLineRunner", - "org.springframework.zero.context.annotation.EnableAutoConfiguration"); + "org.springframework.bootstrap.CommandLineRunner", + "org.springframework.autoconfigure.EnableAutoConfiguration"); imports.addStarImports("org.springframework.stereotype"); } @@ -92,10 +93,8 @@ public class SpringZeroCompilerAutoConfiguration extends CompilerAutoConfigurati ClassNode classNode) { if (!hasEnableAutoConfigureAnnotation(classNode)) { try { - Class annotationClass = source - .getClassLoader() - .loadClass( - "org.springframework.zero.context.annotation.EnableAutoConfiguration"); + Class annotationClass = source.getClassLoader().loadClass( + "org.springframework.autoconfigure.EnableAutoConfiguration"); AnnotationNode annotationNode = new AnnotationNode(new ClassNode( annotationClass)); classNode.addAnnotation(annotationNode); diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java similarity index 91% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java index 398bc2ad6f..d621989e66 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringIntegrationCompilerAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -24,9 +24,9 @@ import java.lang.annotation.Target; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.AstUtils; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.AstUtils; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring Integration. diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java similarity index 86% rename from spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java index 6355e058fc..63dfb9e583 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/compiler/autoconfigure/SpringMvcCompilerAutoConfiguration.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package org.springframework.zero.cli.compiler.autoconfigure; +package org.springframework.cli.compiler.autoconfigure; import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.control.customizers.ImportCustomizer; -import org.springframework.zero.cli.compiler.AstUtils; -import org.springframework.zero.cli.compiler.CompilerAutoConfiguration; -import org.springframework.zero.cli.compiler.DependencyCustomizer; +import org.springframework.cli.compiler.AstUtils; +import org.springframework.cli.compiler.CompilerAutoConfiguration; +import org.springframework.cli.compiler.DependencyCustomizer; /** * {@link CompilerAutoConfiguration} for Spring MVC. @@ -58,7 +58,7 @@ public class SpringMvcCompilerAutoConfiguration extends CompilerAutoConfiguratio imports.addStarImports("org.springframework.web.bind.annotation", "org.springframework.web.servlet.config.annotation", "org.springframework.http"); - imports.addStaticImport("org.springframework.zero.cli.template.GroovyTemplate", + imports.addStaticImport("org.springframework.cli.template.GroovyTemplate", "template"); } diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java similarity index 89% rename from spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java rename to spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java index 1330089e05..ade7d11b96 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunner.java +++ b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunner.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.cli.runner; +package org.springframework.cli.runner; import java.io.File; import java.lang.reflect.Method; import java.util.concurrent.TimeUnit; import java.util.logging.Level; -import org.springframework.zero.cli.compiler.GroovyCompiler; +import org.springframework.cli.compiler.GroovyCompiler; /** * Compiles Groovy code running the resulting classes using a {@code SpringApplication}. @@ -31,11 +31,11 @@ import org.springframework.zero.cli.compiler.GroovyCompiler; * @author Phillip Webb * @author Dave Syer */ -public class SpringZeroRunner { +public class SpringApplicationRunner { // FIXME logging - private SpringZeroRunnerConfiguration configuration; + private SpringApplicationRunnerConfiguration configuration; private final File[] files; @@ -48,13 +48,14 @@ public class SpringZeroRunner { private FileWatchThread fileWatchThread; /** - * Create a new {@link SpringZeroRunner} instance. + * Create a new {@link SpringApplicationRunner} instance. * @param configuration the configuration * @param files the files to compile/watch * @param args input arguments */ - public SpringZeroRunner(final SpringZeroRunnerConfiguration configuration, - File[] files, String... args) { + public SpringApplicationRunner( + final SpringApplicationRunnerConfiguration configuration, File[] files, + String... args) { this.configuration = configuration; this.files = files.clone(); this.args = args.clone(); @@ -129,11 +130,11 @@ public class SpringZeroRunner { try { // User reflection to load and call Spring Class application = getContextClassLoader().loadClass( - "org.springframework.zero.SpringApplication"); + "org.springframework.bootstrap.SpringApplication"); Method method = application.getMethod("run", Object[].class, String[].class); this.applicationContext = method.invoke(null, this.sources, - SpringZeroRunner.this.args); + SpringApplicationRunner.this.args); } catch (Exception ex) { ex.printStackTrace(); @@ -171,7 +172,7 @@ public class SpringZeroRunner { public FileWatchThread() { this.previous = 0; - for (File file : SpringZeroRunner.this.files) { + for (File file : SpringApplicationRunner.this.files) { long current = file.lastModified(); if (current > this.previous) { this.previous = current; @@ -185,7 +186,7 @@ public class SpringZeroRunner { while (true) { try { Thread.sleep(TimeUnit.SECONDS.toMillis(1)); - for (File file : SpringZeroRunner.this.files) { + for (File file : SpringApplicationRunner.this.files) { long current = file.lastModified(); if (this.previous < current) { this.previous = current; diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java similarity index 79% rename from spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java rename to spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java index b985cc526f..1dbdafa1e6 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/runner/SpringZeroRunnerConfiguration.java +++ b/spring-cli/src/main/java/org/springframework/cli/runner/SpringApplicationRunnerConfiguration.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package org.springframework.zero.cli.runner; +package org.springframework.cli.runner; import java.util.logging.Level; -import org.springframework.zero.cli.compiler.GroovyCompilerConfiguration; +import org.springframework.cli.compiler.GroovyCompilerConfiguration; /** - * Configuration for the {@link SpringZeroRunner}. + * Configuration for the {@link SpringApplicationRunner}. * * @author Phillip Webb */ -public interface SpringZeroRunnerConfiguration extends GroovyCompilerConfiguration { +public interface SpringApplicationRunnerConfiguration extends GroovyCompilerConfiguration { /** * Returns {@code true} if the source file should be monitored for changes and diff --git a/spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java b/spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java similarity index 97% rename from spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java rename to spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java index 610a5e867b..2eeb6d1856 100644 --- a/spring-cli/src/main/java/org/springframework/zero/cli/template/GroovyTemplate.java +++ b/spring-cli/src/main/java/org/springframework/cli/template/GroovyTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli.template; +package org.springframework.cli.template; import groovy.text.GStringTemplateEngine; import groovy.text.Template; diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory new file mode 100644 index 0000000000..4c3ba9e9ff --- /dev/null +++ b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.CommandFactory @@ -0,0 +1 @@ +org.springframework.cli.command.DefaultCommandFactory diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration new file mode 100644 index 0000000000..d38b20b129 --- /dev/null +++ b/spring-cli/src/main/resources/META-INF/services/org.springframework.cli.compiler.CompilerAutoConfiguration @@ -0,0 +1,5 @@ +org.springframework.cli.compiler.autoconfigure.SpringCompilerAutoConfiguration +org.springframework.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration +org.springframework.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration +org.springframework.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration + diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory deleted file mode 100644 index 174a6b5c0b..0000000000 --- a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.CommandFactory +++ /dev/null @@ -1 +0,0 @@ -org.springframework.zero.cli.command.DefaultCommandFactory diff --git a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration b/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration deleted file mode 100644 index 72c8ac4b8a..0000000000 --- a/spring-cli/src/main/resources/META-INF/services/org.springframework.zero.cli.compiler.CompilerAutoConfiguration +++ /dev/null @@ -1,5 +0,0 @@ -org.springframework.zero.cli.compiler.autoconfigure.SpringZeroCompilerAutoConfiguration -org.springframework.zero.cli.compiler.autoconfigure.SpringMvcCompilerAutoConfiguration -org.springframework.zero.cli.compiler.autoconfigure.SpringBatchCompilerAutoConfiguration -org.springframework.zero.cli.compiler.autoconfigure.SpringIntegrationCompilerAutoConfiguration - diff --git a/spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java b/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java similarity index 97% rename from spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java rename to spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java index 4460ac75b7..100b91873f 100644 --- a/spring-cli/src/test/java/org/springframework/zero/cli/SampleIntegrationTests.java +++ b/spring-cli/src/test/java/org/springframework/cli/SampleIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.cli; +package org.springframework.cli; import java.io.ByteArrayOutputStream; import java.io.PrintStream; @@ -30,7 +30,7 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; -import org.springframework.zero.cli.command.RunCommand; +import org.springframework.cli.command.RunCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -85,7 +85,7 @@ public class SampleIntegrationTests { @BeforeClass public static void clean() { - // SpringZeroCli.main("clean"); + // SpringCli.main("clean"); // System.setProperty("ivy.message.logger.level", "3"); } diff --git a/spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java b/spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java similarity index 86% rename from spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java rename to spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java index 2b2f72728b..ede14dd987 100644 --- a/spring-cli/src/test/java/org/springframework/zero/cli/SpringZeroCliTests.java +++ b/spring-cli/src/test/java/org/springframework/cli/SpringCliTests.java @@ -1,4 +1,4 @@ -package org.springframework.zero.cli; +package org.springframework.cli; import java.util.Arrays; import java.util.EnumSet; @@ -10,11 +10,11 @@ import org.junit.Test; import org.junit.rules.ExpectedException; import org.mockito.Mock; import org.mockito.MockitoAnnotations; -import org.springframework.zero.cli.Command; -import org.springframework.zero.cli.NoSuchCommandException; -import org.springframework.zero.cli.SpringZeroCli; -import org.springframework.zero.cli.SpringZeroCli.NoArgumentsException; -import org.springframework.zero.cli.SpringZeroCli.NoHelpCommandArgumentsException; +import org.springframework.cli.Command; +import org.springframework.cli.NoSuchCommandException; +import org.springframework.cli.SpringCli; +import org.springframework.cli.SpringCli.NoArgumentsException; +import org.springframework.cli.SpringCli.NoHelpCommandArgumentsException; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -23,17 +23,17 @@ import static org.mockito.BDDMockito.willThrow; import static org.mockito.Mockito.verify; /** - * Tests for {@link SpringZeroCli}. + * Tests for {@link SpringCli}. * * @author Phillip Webb * @author Dave Syer */ -public class SpringZeroCliTests { +public class SpringCliTests { @Rule public ExpectedException thrown = ExpectedException.none(); - private SpringZeroCli cli; + private SpringCli cli; @Mock private Command regularCommand; @@ -43,23 +43,23 @@ public class SpringZeroCliTests { @Before public void setup() { MockitoAnnotations.initMocks(this); - this.cli = new SpringZeroCli() { + this.cli = new SpringCli() { @Override protected void showUsage() { - SpringZeroCliTests.this.calls.add(Call.SHOW_USAGE); + SpringCliTests.this.calls.add(Call.SHOW_USAGE); super.showUsage(); }; @Override protected void errorMessage(String message) { - SpringZeroCliTests.this.calls.add(Call.ERROR_MESSAGE); + SpringCliTests.this.calls.add(Call.ERROR_MESSAGE); super.errorMessage(message); } @Override protected void printStackTrace(Exception ex) { - SpringZeroCliTests.this.calls.add(Call.PRINT_STACK_TRACE); + SpringCliTests.this.calls.add(Call.PRINT_STACK_TRACE); super.printStackTrace(ex); } }; diff --git a/spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java b/spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java similarity index 96% rename from spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java rename to spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java index 743bebf540..638c071cce 100644 --- a/spring-cli/src/test/java/org/springframework/zero/cli/command/ScriptCommandTests.java +++ b/spring-cli/src/test/java/org/springframework/cli/command/ScriptCommandTests.java @@ -14,12 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.cli.command; +package org.springframework.cli.command; import groovy.lang.GroovyObjectSupport; import groovy.lang.Script; import org.junit.Test; +import org.springframework.cli.command.OptionHandler; +import org.springframework.cli.command.ScriptCommand; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotSame; diff --git a/spring-cli/src/test/resources/commands/closure.groovy b/spring-cli/src/test/resources/commands/closure.groovy index 80836fd3a3..a88fcea696 100644 --- a/spring-cli/src/test/resources/commands/closure.groovy +++ b/spring-cli/src/test/resources/commands/closure.groovy @@ -1,5 +1,5 @@ def run = { msg -> - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } diff --git a/spring-cli/src/test/resources/commands/command.groovy b/spring-cli/src/test/resources/commands/command.groovy index ee7d7f9767..0563cbc34e 100644 --- a/spring-cli/src/test/resources/commands/command.groovy +++ b/spring-cli/src/test/resources/commands/command.groovy @@ -11,7 +11,7 @@ class TestCommand implements Command { String usageHelp = "Not very useful" void run(String... args) { - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${args[0]}" } diff --git a/spring-cli/src/test/resources/commands/handler.groovy b/spring-cli/src/test/resources/commands/handler.groovy index 7d00e5aad3..c26942aa6e 100644 --- a/spring-cli/src/test/resources/commands/handler.groovy +++ b/spring-cli/src/test/resources/commands/handler.groovy @@ -12,7 +12,7 @@ class TestCommand extends OptionHandler { void run(OptionSet options) { // Demonstrate use of Grape.grab to load dependencies before running println "Clean : " + Git.open(".." as File).status().call().isClean() - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" } diff --git a/spring-cli/src/test/resources/commands/mixin.groovy b/spring-cli/src/test/resources/commands/mixin.groovy index ebed4704d2..1f0577030a 100644 --- a/spring-cli/src/test/resources/commands/mixin.groovy +++ b/spring-cli/src/test/resources/commands/mixin.groovy @@ -2,5 +2,5 @@ void options() { option "foo", "Foo set" } -org.springframework.zero.cli.command.ScriptCommandTests.executed = true +org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')}" diff --git a/spring-cli/src/test/resources/commands/runnable.groovy b/spring-cli/src/test/resources/commands/runnable.groovy index ad1f7eafe3..f181bab888 100644 --- a/spring-cli/src/test/resources/commands/runnable.groovy +++ b/spring-cli/src/test/resources/commands/runnable.groovy @@ -4,7 +4,7 @@ class TestCommand implements Runnable { this.msg = msg } void run() { - org.springframework.zero.cli.command.ScriptCommandTests.executed = true + org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${msg}" } } diff --git a/spring-cli/src/test/resources/commands/test.groovy b/spring-cli/src/test/resources/commands/test.groovy index 72f6176b92..102275ccf0 100644 --- a/spring-cli/src/test/resources/commands/test.groovy +++ b/spring-cli/src/test/resources/commands/test.groovy @@ -3,5 +3,5 @@ options { option "bar", "Bar has an argument of type int" withOptionalArg() ofType Integer } -org.springframework.zero.cli.command.ScriptCommandTests.executed = true +org.springframework.cli.command.ScriptCommandTests.executed = true println "Hello ${options.nonOptionArguments()}: ${options.has('foo')} ${options.valueOf('bar')}" diff --git a/spring-cli/src/test/resources/log4j.properties b/spring-cli/src/test/resources/log4j.properties index dfd3b60fd3..0591897a1b 100644 --- a/spring-cli/src/test/resources/log4j.properties +++ b/spring-cli/src/test/resources/log4j.properties @@ -4,6 +4,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - <%m>%n -log4j.category.org.springframework.zero=DEBUG +log4j.category.org.springframework.autoconfigure=DEBUG +log4j.category.org.springframework.bootstrap=DEBUG #log4j.category.org.springframework.integration.dsl=DEBUG #log4j.category.org.springframework.amqp=DEBUG diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java b/spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java similarity index 92% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java rename to spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java index dfe54239fa..db3732a254 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/JarLauncher.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/JarLauncher.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.util.List; import java.util.jar.JarEntry; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * {@link Launcher} for JAR based archives. This launcher assumes that dependency jars are diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java b/spring-launcher/src/main/java/org/springframework/launcher/Launcher.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java rename to spring-launcher/src/main/java/org/springframework/launcher/Launcher.java index 70df2f2808..84072d7aab 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/Launcher.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/Launcher.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.io.File; import java.lang.reflect.Constructor; @@ -28,7 +28,7 @@ import java.util.List; import java.util.jar.JarEntry; import java.util.logging.Logger; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * Base class for launchers that can start an application with a fully configured diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java b/spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java similarity index 97% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java rename to spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java index 61f1a7029c..6fe050bcc2 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/MainMethodRunner.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/MainMethodRunner.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.lang.reflect.Method; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java b/spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java similarity index 92% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java rename to spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java index 9d43172a8e..e152424af3 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/WarLauncher.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/WarLauncher.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import java.io.IOException; import java.util.List; import java.util.jar.JarEntry; -import org.springframework.zero.launcher.jar.JarEntryFilter; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.jar.JarEntryFilter; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * {@link Launcher} for WAR based archives. This launcher for standard WAR archives. diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java rename to spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java index 4c60cc23f5..a549b247d4 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessData.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; import java.io.InputStream; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java similarity index 99% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java rename to spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java index b9df11001e..687e5c9230 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/RandomAccessDataFile.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/data/RandomAccessDataFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; import java.io.File; import java.io.IOException; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java b/spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java similarity index 86% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java rename to spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java index b6a24e0a97..06f1bdc350 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/data/package-info.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/data/package-info.java @@ -17,7 +17,7 @@ /** * Classes and interfaces to allows random access to a block of data. * - * @see org.springframework.zero.launcher.data.RandomAccessData + * @see org.springframework.launcher.data.RandomAccessData */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java index cba4486286..d368d4586b 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/JarEntryFilter.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/JarEntryFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.util.jar.JarEntry; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java similarity index 91% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java index 8d71cbf231..98f641e360 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipEntry.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipEntry.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.util.zip.ZipEntry; -import org.springframework.zero.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessData; /** * A {@link ZipEntry} returned from a {@link RandomAccessDataZipInputStream}. diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java similarity index 96% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java index 3796bcc467..8f0c6d1340 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStream.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessDataZipInputStream.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.io.FilterInputStream; import java.io.IOException; @@ -23,7 +23,7 @@ import java.io.PushbackInputStream; import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; -import org.springframework.zero.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessData; /** * A {@link ZipInputStream} backed by {@link RandomAccessData}. Parsed entries provide diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java similarity index 98% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java index 9d4f2f8401..ac8b46b34c 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/RandomAccessJarFile.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/RandomAccessJarFile.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import java.io.BufferedInputStream; import java.io.EOFException; @@ -39,8 +39,8 @@ import java.util.zip.Inflater; import java.util.zip.InflaterInputStream; import java.util.zip.ZipEntry; -import org.springframework.zero.launcher.data.RandomAccessData; -import org.springframework.zero.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessDataFile; /** * A Jar file that can loaded from a {@link RandomAccessDataFile}. This class extends and diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java b/spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java similarity index 93% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java rename to spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java index e94526e6e8..4a44ebcdb7 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/jar/package-info.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/jar/package-info.java @@ -17,5 +17,5 @@ /** * Support for loading and manipulating JAR/WAR files. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; diff --git a/spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java b/spring-launcher/src/main/java/org/springframework/launcher/package-info.java similarity index 86% rename from spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java rename to spring-launcher/src/main/java/org/springframework/launcher/package-info.java index 416917b4ac..a878456639 100644 --- a/spring-launcher/src/main/java/org/springframework/zero/launcher/package-info.java +++ b/spring-launcher/src/main/java/org/springframework/launcher/package-info.java @@ -20,8 +20,8 @@ * not need to create shade style jars) and are executed without unpacking. The only * constraint is that nested JARs must be stored in the archive uncompressed. * - * @see org.springframework.zero.launcher.JarLauncher - * @see org.springframework.zero.launcher.WarLauncher + * @see org.springframework.launcher.JarLauncher + * @see org.springframework.launcher.WarLauncher */ -package org.springframework.zero.launcher; +package org.springframework.launcher; diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java b/spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java similarity index 96% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java rename to spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java index 73adea6973..b586f9fb40 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/ByteArrayStartsWith.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/ByteArrayStartsWith.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher; +package org.springframework.launcher; import org.hamcrest.Description; import org.hamcrest.TypeSafeMatcher; diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java b/spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTest.java similarity index 97% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java rename to spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTest.java index c084af67fa..959508c65c 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/data/RandomAccessDataFileTest.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/data/RandomAccessDataFileTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.data; +package org.springframework.launcher.data; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; @@ -39,9 +39,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.launcher.ByteArrayStartsWith; -import org.springframework.zero.launcher.data.RandomAccessData; -import org.springframework.zero.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.ByteArrayStartsWith; +import org.springframework.launcher.data.RandomAccessData; +import org.springframework.launcher.data.RandomAccessDataFile; /** * Tests for {@link RandomAccessDataFile}. diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTest.java similarity index 90% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java rename to spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTest.java index 596f8e9dbd..b6e7a9fc58 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessDataZipInputStreamTest.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessDataZipInputStreamTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.nullValue; @@ -31,9 +31,9 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.launcher.data.RandomAccessDataFile; -import org.springframework.zero.launcher.jar.RandomAccessDataZipEntry; -import org.springframework.zero.launcher.jar.RandomAccessDataZipInputStream; +import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.jar.RandomAccessDataZipEntry; +import org.springframework.launcher.jar.RandomAccessDataZipInputStream; /** * Tests for {@link RandomAccessDataZipInputStream}. diff --git a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTest.java similarity index 98% rename from spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java rename to spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTest.java index 2ad071c4d9..b50ddd5a43 100644 --- a/spring-launcher/src/test/java/org/springframework/zero/launcher/jar/RandomAccessJarFileTest.java +++ b/spring-launcher/src/test/java/org/springframework/launcher/jar/RandomAccessJarFileTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.launcher.jar; +package org.springframework.launcher.jar; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.greaterThan; @@ -48,9 +48,9 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.launcher.data.RandomAccessDataFile; -import org.springframework.zero.launcher.jar.JarEntryFilter; -import org.springframework.zero.launcher.jar.RandomAccessJarFile; +import org.springframework.launcher.data.RandomAccessDataFile; +import org.springframework.launcher.jar.JarEntryFilter; +import org.springframework.launcher.jar.RandomAccessJarFile; /** * Tests for {@link RandomAccessJarFile}. diff --git a/spring-package-maven-plugin/src/it/executable-jar/verify.groovy b/spring-package-maven-plugin/src/it/executable-jar/verify.groovy index f5e1f208b6..a52a963b71 100644 --- a/spring-package-maven-plugin/src/it/executable-jar/verify.groovy +++ b/spring-package-maven-plugin/src/it/executable-jar/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.zero.maven.*; +import org.springframework.maven.packaging.*; Verify.verifyJar( new File( basedir, "target/executable-jar-0.0.1.BUILD-SNAPSHOT.jar" ) diff --git a/spring-package-maven-plugin/src/it/executable-war/verify.groovy b/spring-package-maven-plugin/src/it/executable-war/verify.groovy index b0d90d5aae..79ba3a8fb7 100644 --- a/spring-package-maven-plugin/src/it/executable-war/verify.groovy +++ b/spring-package-maven-plugin/src/it/executable-war/verify.groovy @@ -1,5 +1,5 @@ import java.io.*; -import org.springframework.zero.maven.*; +import org.springframework.maven.packaging.*; Verify.verifyWar( new File( basedir, "target/executable-war-0.0.1.BUILD-SNAPSHOT.war" ) diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java similarity index 99% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java index 3d8d4f449b..98f26f365c 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/AbstractExecutableArchiveMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/AbstractExecutableArchiveMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.io.IOException; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarMojo.java similarity index 94% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarMojo.java index 6f50902d0f..dc3766af1c 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableJarMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableJarMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.util.Arrays; import java.util.HashSet; @@ -56,6 +56,6 @@ public class ExecutableJarMojo extends AbstractExecutableArchiveMojo { @Override protected String getLauncherClass() { - return "org.springframework.zero.launcher.JarLauncher"; + return "org.springframework.launcher.JarLauncher"; } } diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java similarity index 96% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java index 3b0ea5d4e0..ae60ddb9e5 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/ExecutableWarMojo.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/ExecutableWarMojo.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.util.Collections; @@ -85,6 +85,6 @@ public class ExecutableWarMojo extends AbstractExecutableArchiveMojo { @Override protected String getLauncherClass() { - return "org.springframework.zero.launcher.WarLauncher"; + return "org.springframework.launcher.WarLauncher"; } } diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java index c93c6d60b8..71d518aac8 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/MainClassFinder.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/MainClassFinder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.BufferedInputStream; import java.io.File; diff --git a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java similarity index 98% rename from spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java rename to spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java index b3013e596f..92c2dedfcb 100644 --- a/spring-package-maven-plugin/src/main/java/org/springframework/zero/maven/PropertiesMergingResourceTransformer.java +++ b/spring-package-maven-plugin/src/main/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.IOException; import java.io.InputStream; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java similarity index 92% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java index 796d1f2029..63a7ad8ebb 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/MainClassFinderTests.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/MainClassFinderTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.io.FileOutputStream; @@ -26,8 +26,9 @@ import org.codehaus.plexus.util.IOUtil; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; -import org.springframework.zero.maven.sample.ClassWithMainMethod; -import org.springframework.zero.maven.sample.ClassWithoutMainMethod; +import org.springframework.maven.packaging.MainClassFinder; +import org.springframework.maven.packaging.sample.ClassWithMainMethod; +import org.springframework.maven.packaging.sample.ClassWithoutMainMethod; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java similarity index 94% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java index 79a035f3c7..b39089248e 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/PropertiesMergingResourceTransformerTests.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/PropertiesMergingResourceTransformerTests.java @@ -14,13 +14,14 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.util.jar.JarOutputStream; import org.junit.Test; +import org.springframework.maven.packaging.PropertiesMergingResourceTransformer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java index cdcd171673..1caa3714ba 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/Verify.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/Verify.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven; +package org.springframework.maven.packaging; import java.io.File; import java.util.Enumeration; @@ -102,14 +102,14 @@ public class Verify { assertHasEntryNameStartingWith(entries, "lib/spring-core"); assertHasEntryNameStartingWith(entries, "lib/javax.servlet-api-3.0.1.jar"); assertTrue("Unpacked launcher classes", entries.containsKey("org/" - + "springframework/zero/launcher/JarLauncher.class")); + + "springframework/launcher/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("org/" + "test/SampleApplication.class")); } @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.zero.launcher.JarLauncher", manifest + assertEquals("org.springframework.launcher.JarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals("org.test.SampleApplication", manifest.getMainAttributes() .getValue("Start-Class")); @@ -131,7 +131,7 @@ public class Verify { assertHasEntryNameStartingWith(entries, "WEB-INF/lib-provided/javax.servlet-api-3.0.1.jar"); assertTrue("Unpacked launcher classes", entries.containsKey("org/" - + "springframework/zero/launcher/JarLauncher.class")); + + "springframework/launcher/JarLauncher.class")); assertTrue("Own classes", entries.containsKey("WEB-INF/classes/org/" + "test/SampleApplication.class")); assertTrue("Web content", entries.containsKey("index.html")); @@ -139,7 +139,7 @@ public class Verify { @Override protected void verifyManifest(Manifest manifest) throws Exception { - assertEquals("org.springframework.zero.launcher.WarLauncher", manifest + assertEquals("org.springframework.launcher.WarLauncher", manifest .getMainAttributes().getValue("Main-Class")); assertEquals("org.test.SampleApplication", manifest.getMainAttributes() .getValue("Start-Class")); diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java index b5626436e6..47957be074 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithMainMethod.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven.sample; +package org.springframework.maven.packaging.sample; /** * Sample class with a main method. diff --git a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java similarity index 93% rename from spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java rename to spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java index 6560f33e2e..58d3a2d66f 100644 --- a/spring-package-maven-plugin/src/test/java/org/springframework/zero/maven/sample/ClassWithoutMainMethod.java +++ b/spring-package-maven-plugin/src/test/java/org/springframework/maven/packaging/sample/ClassWithoutMainMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.zero.maven.sample; +package org.springframework.maven.packaging.sample; /** * Sample class without a main method. diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java index e60a2bfd41..6bbf74c6b5 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/main/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplication.java @@ -19,13 +19,13 @@ package org.springframework.zero.sample.actuator.ui; import java.util.Date; import java.util.Map; +import org.springframework.actuate.properties.SecurityProperties; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.actuate.properties.SecurityProperties; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @EnableAutoConfiguration @ComponentScan diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java index 42f5cc4aab..f99624eb67 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationPortTests.java @@ -27,13 +27,13 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java index f30e81befd..5f83df2487 100644 --- a/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator-ui/src/test/java/org/springframework/zero/sample/actuator/ui/SampleActuatorUiApplicationTests.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; @@ -37,7 +38,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java index 53d75618c9..19584b207c 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/SampleActuatorApplication.java @@ -16,11 +16,11 @@ package org.springframework.zero.sample.actuator; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java index 7c2c18b292..0c2ed16d20 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/main/java/org/springframework/zero/sample/actuator/ServiceProperties.java @@ -16,8 +16,8 @@ package org.springframework.zero.sample.actuator; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; import org.springframework.stereotype.Component; -import org.springframework.zero.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) @Component diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java index 4084397b14..0b0df3421e 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/EndpointsPropertiesSampleActuatorApplicationTests.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import org.junit.After; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -39,7 +40,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java index 0c98e44e43..cedcef257a 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementAddressSampleActuatorApplicationTests.java @@ -29,6 +29,7 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -41,7 +42,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java index 6d4aa16301..9965eb5f10 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ManagementSampleActuatorApplicationTests.java @@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java index d6dd397904..8bf53c6d2b 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/NoManagementSampleActuatorApplicationTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -41,7 +42,6 @@ import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.ResourceAccessException; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java index 9888c6cc08..b055a7e3c8 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/SampleActuatorApplicationTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -40,7 +41,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java index a4e92246ee..d16e6b9250 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/ShutdownSampleActuatorApplicationTests.java @@ -28,6 +28,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpRequest; import org.springframework.http.HttpStatus; @@ -40,7 +41,6 @@ import org.springframework.http.client.SimpleClientHttpRequestFactory; import org.springframework.security.crypto.codec.Base64; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java index 1a3d5e4540..46eff5ffa6 100644 --- a/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-actuator/src/test/java/org/springframework/zero/sample/actuator/UnsecureSampleActuatorApplicationTests.java @@ -26,13 +26,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java index 5c6113c7c8..a6f9e1ca28 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/main/java/org/springframework/zero/sample/batch/SampleBatchApplication.java @@ -16,6 +16,7 @@ package org.springframework.zero.sample.batch; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.batch.core.Job; import org.springframework.batch.core.Step; import org.springframework.batch.core.StepContribution; @@ -26,11 +27,10 @@ import org.springframework.batch.core.scope.context.ChunkContext; import org.springframework.batch.core.step.tasklet.Tasklet; import org.springframework.batch.repeat.RepeatStatus; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java index 46ef39e090..873fbfbf67 100644 --- a/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-batch/src/test/java/org/springframework/zero/sample/batch/SampleBatchApplicationTests.java @@ -22,7 +22,7 @@ import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.zero.SpringApplication; +import org.springframework.bootstrap.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java index 595a5d56c6..fc6ab26443 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/main/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.data.jpa; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @ComponentScan diff --git a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java index 187d2a3f16..eaac3109e8 100644 --- a/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-data-jpa/src/test/java/org/springframework/zero/sample/data/jpa/SampleDataJpaApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java index b1fab4e9eb..7d26d2e54d 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/SampleIntegrationApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.integration; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; +import org.springframework.bootstrap.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; -import org.springframework.zero.context.properties.EnableConfigurationProperties; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java index 570d15d2dc..8c9792e1cb 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/main/java/org/springframework/zero/sample/integration/ServiceProperties.java @@ -16,7 +16,7 @@ package org.springframework.zero.sample.integration; -import org.springframework.zero.context.properties.ConfigurationProperties; +import org.springframework.bootstrap.context.properties.ConfigurationProperties; @ConfigurationProperties(name = "service", ignoreUnknownFields = false) public class ServiceProperties { diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java index 2728be0718..02e50a5bef 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/consumer/SampleIntegrationApplicationTests.java @@ -24,12 +24,12 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.core.io.DefaultResourceLoader; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternUtils; import org.springframework.util.StreamUtils; -import org.springframework.zero.SpringApplication; import org.springframework.zero.sample.integration.SampleIntegrationApplication; import org.springframework.zero.sample.integration.producer.ProducerApplication; diff --git a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java index 4eda4280f8..915b13bfb0 100644 --- a/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java +++ b/spring-zero-samples/spring-zero-sample-integration/src/test/java/org/springframework/zero/sample/integration/producer/ProducerApplication.java @@ -19,9 +19,9 @@ package org.springframework.zero.sample.integration.producer; import java.io.File; import java.io.FileOutputStream; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; @Configuration public class ProducerApplication implements CommandLineRunner { diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java index 2921133652..b0a3dabde9 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/main/java/org/springframework/zero/sample/jetty/SampleJettyApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.jetty; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java index 3b8e138aa0..0fde9232e1 100644 --- a/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-jetty/src/test/java/org/springframework/zero/sample/jetty/SampleJettyApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java index 9846ac5f64..3fd108e448 100644 --- a/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java +++ b/spring-zero-samples/spring-zero-sample-profile/src/main/java/org/springframework/zero/sample/profile/SampleProfileApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.profile; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.sample.profile.service.MessageService; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java index 0119ea60cb..f9f60dea65 100644 --- a/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java +++ b/spring-zero-samples/spring-zero-sample-simple/src/main/java/org/springframework/zero/sample/simple/SampleSimpleApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.simple; +import org.springframework.autoconfigure.EnableAutoConfiguration; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; import org.springframework.zero.sample.simple.service.HelloWorldService; @Configuration diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java index 66abcd2445..e66d71400e 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/main/java/org/springframework/zero/sample/tomcat/SampleTomcatApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.tomcat; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java index 196c712f01..75b940f53a 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/NonAutoConfigurationSampleTomcatApplicationTests.java @@ -25,6 +25,10 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.autoconfigure.PropertyPlaceholderAutoConfiguration; +import org.springframework.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; +import org.springframework.autoconfigure.web.WebMvcAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; @@ -34,10 +38,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.PropertyPlaceholderAutoConfiguration; -import org.springframework.zero.autoconfigure.web.EmbeddedServletContainerAutoConfiguration; -import org.springframework.zero.autoconfigure.web.WebMvcAutoConfiguration; import org.springframework.zero.sample.tomcat.service.HelloWorldService; import org.springframework.zero.sample.tomcat.web.SampleController; diff --git a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java index 41b969527b..3f318fe78e 100644 --- a/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-tomcat/src/test/java/org/springframework/zero/sample/tomcat/SampleTomcatApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java index a36d7c6bee..80f18d2858 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/main/java/org/springframework/zero/sample/traditional/SampleTraditionalApplication.java @@ -16,10 +16,10 @@ package org.springframework.zero.sample.traditional; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java index b8a7b960bf..165ce412f1 100644 --- a/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-traditional/src/test/java/org/springframework/zero/sample/traditional/SampleTraditionalApplicationTests.java @@ -25,13 +25,13 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpResponse; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java index 18c9bd4f2e..987d109cd5 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/main/java/org/springframework/zero/sample/web/ui/SampleWebUiApplication.java @@ -16,12 +16,12 @@ package org.springframework.zero.sample.web.ui; +import org.springframework.autoconfigure.EnableAutoConfiguration; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.core.convert.converter.Converter; -import org.springframework.zero.SpringApplication; -import org.springframework.zero.autoconfigure.EnableAutoConfiguration; @Configuration @EnableAutoConfiguration diff --git a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java index e9fc358faf..5bc3fbc01b 100644 --- a/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java +++ b/spring-zero-samples/spring-zero-sample-web-ui/src/test/java/org/springframework/zero/sample/web/ui/SampleWebUiApplicationTests.java @@ -10,6 +10,7 @@ import java.util.concurrent.TimeUnit; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; +import org.springframework.bootstrap.SpringApplication; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -18,7 +19,6 @@ import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; import org.springframework.web.client.DefaultResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import org.springframework.zero.SpringApplication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java index 07ab3af1e6..d503e9ad64 100644 --- a/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java +++ b/spring-zero-samples/spring-zero-sample-xml/src/main/java/org/springframework/zero/sample/xml/SampleSpringXmlApplication.java @@ -17,8 +17,8 @@ package org.springframework.zero.sample.xml; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.zero.CommandLineRunner; -import org.springframework.zero.SpringApplication; +import org.springframework.bootstrap.CommandLineRunner; +import org.springframework.bootstrap.SpringApplication; import org.springframework.zero.sample.xml.service.HelloWorldService; public class SampleSpringXmlApplication implements CommandLineRunner {